Merge pull request #1895 from alignan/pull/fix-cc2538-cca

cpu/cc2538: CCA threshold was fixed
This commit is contained in:
Benoît Thébaudeau 2016-10-28 23:42:18 +02:00 committed by GitHub
commit 6cdba10b1d
2 changed files with 2 additions and 2 deletions

View file

@ -482,7 +482,7 @@ init(void)
REG(SYS_CTRL_SCGCRFC) = 1; REG(SYS_CTRL_SCGCRFC) = 1;
REG(SYS_CTRL_DCGCRFC) = 1; REG(SYS_CTRL_DCGCRFC) = 1;
REG(RFCORE_XREG_CCACTRL0) = CC2538_RF_CCA_THRES_USER_GUIDE; REG(RFCORE_XREG_CCACTRL0) = CC2538_RF_CCA_THRES;
/* /*
* Changes from default values * Changes from default values

View file

@ -71,7 +71,7 @@
#ifdef CC2538_RF_CONF_CCA_THRES #ifdef CC2538_RF_CONF_CCA_THRES
#define CC2538_RF_CCA_THRES CC2538_RF_CONF_CCA_THRES #define CC2538_RF_CCA_THRES CC2538_RF_CONF_CCA_THRES
#else #else
#define CC2538_RF_CCA_THRES CCA_THRES_USER_GUIDE /** User guide recommendation */ #define CC2538_RF_CCA_THRES CC2538_RF_CCA_THRES_USER_GUIDE
#endif /* CC2538_RF_CONF_CCA_THRES */ #endif /* CC2538_RF_CONF_CCA_THRES */
#ifdef CC2538_RF_CONF_CHANNEL #ifdef CC2538_RF_CONF_CHANNEL