From 2a63d0a972af9e19f5bf4338af1e28f2207f2622 Mon Sep 17 00:00:00 2001 From: harald Date: Thu, 15 May 2014 15:34:05 +0200 Subject: [PATCH] bugfix define panid --- platform/osd-merkur/contiki-conf.h | 2 ++ platform/osd-merkur/params.h | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/platform/osd-merkur/contiki-conf.h b/platform/osd-merkur/contiki-conf.h index 3df622367..d01424b8f 100644 --- a/platform/osd-merkur/contiki-conf.h +++ b/platform/osd-merkur/contiki-conf.h @@ -50,6 +50,8 @@ #include +#define IEEE802154_CONF_PANID 0xAAAA // default panid + /* The AVR tick interrupt usually is done with an 8 bit counter around 128 Hz. * 125 Hz needs slightly more overhead during the interrupt, as does a 32 bit * clock_time_t. diff --git a/platform/osd-merkur/params.h b/platform/osd-merkur/params.h index d06f3ff14..a8fa7637e 100644 --- a/platform/osd-merkur/params.h +++ b/platform/osd-merkur/params.h @@ -13,8 +13,7 @@ * Note the parameters in this file can be changed without forcing a complete rebuild. */ // default settings -#define CHANNEL_802_15_4 26 // default frequency (11-26) -#define IEEE802154_CONF_PANID 0xABCD // default panid +#define CHANNEL_802_15_4 26 // default frequency (11-26) // end default settings