diff --git a/examples/osd/er-rest-example-merkurboard/project-conf.h b/examples/osd/er-rest-example-merkurboard/project-conf.h index d98699d4c..2187b48c7 100644 --- a/examples/osd/er-rest-example-merkurboard/project-conf.h +++ b/examples/osd/er-rest-example-merkurboard/project-conf.h @@ -38,7 +38,8 @@ #define PLATFORM_HAS_BATTERY 1 /* Some platforms have weird includes. */ -#undef IEEE802154_CONF_PANID +// #undef IEEE802154_CONF_PANID +// #define IEEE802154_CONF_PANID 0xAAAA /* Disabling RDC for demo purposes. Core updates often require more memory. */ /* For projects, optimize memory and enable RDC again. */ diff --git a/platform/osd-merkur/params.h b/platform/osd-merkur/params.h index 9bf2f433e..7666e8230 100644 --- a/platform/osd-merkur/params.h +++ b/platform/osd-merkur/params.h @@ -14,7 +14,8 @@ */ // default settings #define CHANNEL_802_15_4 26 // default frequency (11-26) -#define IEEE802154_PANID 0xABCD // default panid +#define IEEE802154_CONF_PANID 0xABCD // default panid + // end default settings #define CONTIKI_CONF_RANDOM_MAC 0 //adds 78 bytes