Merge pull request #1827 from alignan/pull/rf-channel

Harmonize RF_CHANNEL definition
This commit is contained in:
Antonio Lignan 2016-11-25 21:11:20 +01:00 committed by GitHub
commit 58243bc14a
6 changed files with 24 additions and 0 deletions

View file

@ -186,6 +186,10 @@
#define IEEE802154_CONF_PANID 0xABCD
#endif
#ifdef RF_CHANNEL
#define CC2530_RF_CONF_CHANNEL RF_CHANNEL
#endif
#ifndef CC2530_RF_CONF_CHANNEL
#define CC2530_RF_CONF_CHANNEL 25
#endif /* CC2530_RF_CONF_CHANNEL */

View file

@ -364,6 +364,10 @@ typedef uint32_t rtimer_clock_t;
#define IEEE802154_CONF_PANID 0xABCD
#endif
#ifdef RF_CHANNEL
#define CC2538_RF_CONF_CHANNEL RF_CHANNEL
#endif
#ifndef CC2538_RF_CONF_CHANNEL
#define CC2538_RF_CONF_CHANNEL 25
#endif /* CC2538_RF_CONF_CHANNEL */

View file

@ -53,6 +53,10 @@
#define MIRCOMAC_CONF_BUF_NUM 2
#endif
#ifdef RF_CHANNEL
#define MICROMAC_CONF_CHANNEL RF_CHANNEL
#endif
#ifndef MICROMAC_CONF_CHANNEL
#define MICROMAC_CONF_CHANNEL 26
#endif

View file

@ -416,6 +416,10 @@ typedef uint32_t rtimer_clock_t;
#define IEEE802154_CONF_PANID 0xABCD
#endif
#ifdef RF_CHANNEL
#define CC2538_RF_CONF_CHANNEL RF_CHANNEL
#endif
#ifndef CC2538_RF_CONF_CHANNEL
#define CC2538_RF_CONF_CHANNEL 26
#endif /* CC2538_RF_CONF_CHANNEL */

View file

@ -121,6 +121,10 @@
#else
#define NETSTACK_CONF_RADIO ieee_mode_driver
#ifdef RF_CHANNEL
#define RF_CORE_CONF_CHANNEL RF_CHANNEL
#endif
#ifndef RF_CORE_CONF_CHANNEL
#define RF_CORE_CONF_CHANNEL 25
#endif

View file

@ -433,6 +433,10 @@ typedef uint32_t rtimer_clock_t;
#define IEEE802154_CONF_PANID 0xABCD
#endif
#ifdef RF_CHANNEL
#define CC2538_RF_CONF_CHANNEL RF_CHANNEL
#endif
#ifndef CC2538_RF_CONF_CHANNEL
#define CC2538_RF_CONF_CHANNEL 26
#endif /* CC2538_RF_CONF_CHANNEL */