Merge pull request #1827 from alignan/pull/rf-channel
Harmonize RF_CHANNEL definition
This commit is contained in:
commit
58243bc14a
|
@ -186,6 +186,10 @@
|
||||||
#define IEEE802154_CONF_PANID 0xABCD
|
#define IEEE802154_CONF_PANID 0xABCD
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef RF_CHANNEL
|
||||||
|
#define CC2530_RF_CONF_CHANNEL RF_CHANNEL
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef CC2530_RF_CONF_CHANNEL
|
#ifndef CC2530_RF_CONF_CHANNEL
|
||||||
#define CC2530_RF_CONF_CHANNEL 25
|
#define CC2530_RF_CONF_CHANNEL 25
|
||||||
#endif /* CC2530_RF_CONF_CHANNEL */
|
#endif /* CC2530_RF_CONF_CHANNEL */
|
||||||
|
|
|
@ -364,6 +364,10 @@ typedef uint32_t rtimer_clock_t;
|
||||||
#define IEEE802154_CONF_PANID 0xABCD
|
#define IEEE802154_CONF_PANID 0xABCD
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef RF_CHANNEL
|
||||||
|
#define CC2538_RF_CONF_CHANNEL RF_CHANNEL
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef CC2538_RF_CONF_CHANNEL
|
#ifndef CC2538_RF_CONF_CHANNEL
|
||||||
#define CC2538_RF_CONF_CHANNEL 25
|
#define CC2538_RF_CONF_CHANNEL 25
|
||||||
#endif /* CC2538_RF_CONF_CHANNEL */
|
#endif /* CC2538_RF_CONF_CHANNEL */
|
||||||
|
|
|
@ -53,6 +53,10 @@
|
||||||
#define MIRCOMAC_CONF_BUF_NUM 2
|
#define MIRCOMAC_CONF_BUF_NUM 2
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef RF_CHANNEL
|
||||||
|
#define MICROMAC_CONF_CHANNEL RF_CHANNEL
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef MICROMAC_CONF_CHANNEL
|
#ifndef MICROMAC_CONF_CHANNEL
|
||||||
#define MICROMAC_CONF_CHANNEL 26
|
#define MICROMAC_CONF_CHANNEL 26
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -416,6 +416,10 @@ typedef uint32_t rtimer_clock_t;
|
||||||
#define IEEE802154_CONF_PANID 0xABCD
|
#define IEEE802154_CONF_PANID 0xABCD
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef RF_CHANNEL
|
||||||
|
#define CC2538_RF_CONF_CHANNEL RF_CHANNEL
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef CC2538_RF_CONF_CHANNEL
|
#ifndef CC2538_RF_CONF_CHANNEL
|
||||||
#define CC2538_RF_CONF_CHANNEL 26
|
#define CC2538_RF_CONF_CHANNEL 26
|
||||||
#endif /* CC2538_RF_CONF_CHANNEL */
|
#endif /* CC2538_RF_CONF_CHANNEL */
|
||||||
|
|
|
@ -121,6 +121,10 @@
|
||||||
#else
|
#else
|
||||||
#define NETSTACK_CONF_RADIO ieee_mode_driver
|
#define NETSTACK_CONF_RADIO ieee_mode_driver
|
||||||
|
|
||||||
|
#ifdef RF_CHANNEL
|
||||||
|
#define RF_CORE_CONF_CHANNEL RF_CHANNEL
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef RF_CORE_CONF_CHANNEL
|
#ifndef RF_CORE_CONF_CHANNEL
|
||||||
#define RF_CORE_CONF_CHANNEL 25
|
#define RF_CORE_CONF_CHANNEL 25
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -433,6 +433,10 @@ typedef uint32_t rtimer_clock_t;
|
||||||
#define IEEE802154_CONF_PANID 0xABCD
|
#define IEEE802154_CONF_PANID 0xABCD
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef RF_CHANNEL
|
||||||
|
#define CC2538_RF_CONF_CHANNEL RF_CHANNEL
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef CC2538_RF_CONF_CHANNEL
|
#ifndef CC2538_RF_CONF_CHANNEL
|
||||||
#define CC2538_RF_CONF_CHANNEL 26
|
#define CC2538_RF_CONF_CHANNEL 26
|
||||||
#endif /* CC2538_RF_CONF_CHANNEL */
|
#endif /* CC2538_RF_CONF_CHANNEL */
|
||||||
|
|
Loading…
Reference in a new issue