Merge pull request #900 from g-oikonomou/cc253x-pan-id

Change the CC2530 and CC2538 default PAN ID to 0xABCD
This commit is contained in:
Adam Dunkels 2014-12-09 10:48:09 +01:00
commit ed1ae2eba4
2 changed files with 4 additions and 2 deletions

View File

@ -193,7 +193,9 @@
#define NETSTACK_CONF_RADIO cc2530_rf_driver #define NETSTACK_CONF_RADIO cc2530_rf_driver
/* RF Config */ /* RF Config */
#define IEEE802154_CONF_PANID 0x5449 /* TI */ #ifndef IEEE802154_CONF_PANID
#define IEEE802154_CONF_PANID 0xABCD
#endif
#ifndef CC2530_RF_CONF_CHANNEL #ifndef CC2530_RF_CONF_CHANNEL
#define CC2530_RF_CONF_CHANNEL 25 #define CC2530_RF_CONF_CHANNEL 25

View File

@ -390,7 +390,7 @@ typedef uint32_t rtimer_clock_t;
*/ */
/* RF Config */ /* RF Config */
#ifndef IEEE802154_CONF_PANID #ifndef IEEE802154_CONF_PANID
#define IEEE802154_CONF_PANID 0x5449 /**< Default PAN ID: TI */ #define IEEE802154_CONF_PANID 0xABCD
#endif #endif
#ifndef CC2538_RF_CONF_CHANNEL #ifndef CC2538_RF_CONF_CHANNEL