diff --git a/examples/osd/er-rest-example-merkurboard/er-example-client.c b/examples/osd/er-rest-example-merkurboard/er-example-client.c index 20cc507b8..b5abe9f05 100644 --- a/examples/osd/er-rest-example-merkurboard/er-example-client.c +++ b/examples/osd/er-rest-example-merkurboard/er-example-client.c @@ -74,7 +74,7 @@ #endif /* TODO: This server address is hard-coded for Cooja. */ -#define SERVER_NODE(ipaddr) uip_ip6addr(ipaddr, 0xfe80, 0, 0, 0, 0x0221, 0x2eff, 0xff00, 0x26D0) /* cooja2 */ +#define SERVER_NODE(ipaddr) uip_ip6addr(ipaddr, 0xfe80, 0, 0, 0, 0x0221, 0x2eff, 0xff00, 0x270d) /* cooja2 */ #define LOCAL_PORT UIP_HTONS(COAP_DEFAULT_PORT+1) #define REMOTE_PORT UIP_HTONS(COAP_DEFAULT_PORT) @@ -127,7 +127,7 @@ PROCESS_THREAD(coap_client_example, ev, data) /* send a request to notify the end of the process */ PRINTF("--Toggle --\n"); - //leds_toggle(LEDS_RED); + leds_toggle(LEDS_RED); /* prepare request, TID is set by COAP_BLOCKING_REQUEST() */ coap_init_message(request, COAP_TYPE_CON, COAP_POST, 0 ); diff --git a/examples/osd/er-rest-example-merkurboard/er-example-client.osd-merkur.eep b/examples/osd/er-rest-example-merkurboard/er-example-client.osd-merkur.eep index bd9f1b15e..16392b886 100644 --- a/examples/osd/er-rest-example-merkurboard/er-example-client.osd-merkur.eep +++ b/examples/osd/er-rest-example-merkurboard/er-example-client.osd-merkur.eep @@ -1,4 +1,4 @@ -:1000000000212EFFFF001EF941544D45474131327A +:1000000000212EFFFF001EFB41544D454741313278 :100010003872666131006C6F63616C686F73740075 :0900200000001AE5CDAB00000060 :00000001FF diff --git a/examples/osd/er-rest-example-merkurboard/er-example-server.osd-merkur b/examples/osd/er-rest-example-merkurboard/er-example-server.osd-merkur index c736773f5..6d2e9f30f 100755 Binary files a/examples/osd/er-rest-example-merkurboard/er-example-server.osd-merkur and b/examples/osd/er-rest-example-merkurboard/er-example-server.osd-merkur differ diff --git a/examples/osd/er-rest-example-merkurboard/er-example-server.osd-merkur.eep b/examples/osd/er-rest-example-merkurboard/er-example-server.osd-merkur.eep index 1996e8fde..916219dda 100644 --- a/examples/osd/er-rest-example-merkurboard/er-example-server.osd-merkur.eep +++ b/examples/osd/er-rest-example-merkurboard/er-example-server.osd-merkur.eep @@ -1 +1,4 @@ +:1000000000212EFFFF00270D41544D45474131325D +:100010003872666131006C6F63616C686F73740075 +:0900200000001AE5CDAB00000060 :00000001FF diff --git a/platform/osd-merkur/params.h b/platform/osd-merkur/params.h index 100f57586..807cb89d1 100644 --- a/platform/osd-merkur/params.h +++ b/platform/osd-merkur/params.h @@ -20,8 +20,8 @@ //#define PARAMETER_STORAGE 2 #define PARAMETER_STORAGE 2 #else -//#define PARAMETER_STORAGE 1 -#define PARAMETER_STORAGE 0 +#define PARAMETER_STORAGE 1 +//#define PARAMETER_STORAGE 0 // get mac form boolaoder, need bootlaoder bonsai, PARAMETER_STORAGE 0 #endif /* Include settings.h, then dummy out the write routines */ @@ -75,7 +75,7 @@ extern uint8_t eemem_domain_name[30]; #if UIP_CONF_LL_802154 //#define PARAMS_EUI64ADDR {0x02, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN} //#define PARAMS_EUI64ADDR {0x02, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x01} -#define PARAMS_EUI64ADDR {0x00, 0x21, 0x2e, 0xff, 0xff, 0x00, 0x26, 0xd0} +#define PARAMS_EUI64ADDR {0x00, 0x21, 0x2e, 0xff, 0xff, 0x00, 0x27, 0x0d} //#define PARAMS_EUI64ADDR {0x00, 0x21, 0x2e, 0xff, 0xff, 0x00, 0x1E, 0xFB} #else //#define PARAMS_EUI64ADDR {0x02, 0xNN, 0xNN, 0xff, 0xfe, 0xNN, 0xNN, 0xNN}