From 73a133373a42f74fa5822cbb9b8e9024c6b828b8 Mon Sep 17 00:00:00 2001 From: George Oikonomou Date: Mon, 8 Dec 2014 22:30:07 +0000 Subject: [PATCH 1/2] Change CC2530DK default PAN ID to 0xABCD and make it configurable by project-conf.h --- platform/cc2530dk/contiki-conf.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/cc2530dk/contiki-conf.h b/platform/cc2530dk/contiki-conf.h index 8a11ca816..ef933dc1c 100644 --- a/platform/cc2530dk/contiki-conf.h +++ b/platform/cc2530dk/contiki-conf.h @@ -193,7 +193,9 @@ #define NETSTACK_CONF_RADIO cc2530_rf_driver /* RF Config */ -#define IEEE802154_CONF_PANID 0x5449 /* TI */ +#ifndef IEEE802154_CONF_PANID +#define IEEE802154_CONF_PANID 0xABCD +#endif #ifndef CC2530_RF_CONF_CHANNEL #define CC2530_RF_CONF_CHANNEL 25 From 8fe5456588a69b5b70d8b8fb1b8902ebbab6d29a Mon Sep 17 00:00:00 2001 From: George Oikonomou Date: Mon, 8 Dec 2014 22:32:55 +0000 Subject: [PATCH 2/2] Change default PAN ID for the CC2538DK platform to 0xABCD --- platform/cc2538dk/contiki-conf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/cc2538dk/contiki-conf.h b/platform/cc2538dk/contiki-conf.h index 20cee3614..84d78d9a1 100644 --- a/platform/cc2538dk/contiki-conf.h +++ b/platform/cc2538dk/contiki-conf.h @@ -390,7 +390,7 @@ typedef uint32_t rtimer_clock_t; */ /* RF Config */ #ifndef IEEE802154_CONF_PANID -#define IEEE802154_CONF_PANID 0x5449 /**< Default PAN ID: TI */ +#define IEEE802154_CONF_PANID 0xABCD #endif #ifndef CC2538_RF_CONF_CHANNEL