deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1952 from arurke/fix_rf_channel_cc13xx

Browse source 
Move RF_CHANNEL check in cc13xx/cc26xx such that it applies for cc13xx prop mode
This commit is contained in:
Antonio Lignan 2016-11-28 09:37:00 +01:00 committed by GitHub
commit 1abc95a08e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
platform/srf06-cc26xx/contiki-conf.h
View file

@ -89,6 +89,10 @@
#define NETSTACK_CONF_FRAMER framer_802154
#endif
#ifdef RF_CHANNEL
#define RF_CORE_CONF_CHANNEL RF_CHANNEL
#endif
/*
* Auto-configure Prop-mode radio if we are running on CC13xx, unless the
* project has specified otherwise. Depending on the final mode, determine a
@ -121,10 +125,6 @@
#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