giomba
/
nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cc2420: use IEEE802154_DEFAULT_CHANNEL

This commit is contained in:
Simon Duquennoy 2018-04-13 02:33:02 -07:00
parent 2359cdb7c0
commit d128898420
4 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/dev/cc2420/cc2420.c
View File

@ -641,7 +641,7 @@ cc2420_init(void)
init_security();
cc2420_set_pan_addr(0xffff, 0x0000, NULL);
cc2420_set_channel(CC2420_CONF_CHANNEL);
cc2420_set_channel(IEEE802154_DEFAULT_CHANNEL);
cc2420_set_cca_threshold(CC2420_CONF_CCA_THRESH);
flushrx();

4
arch/dev/cc2420/cc2420.h
View File

@ -50,10 +50,6 @@
#define WITH_SEND_CCA 1
#ifndef CC2420_CONF_CHANNEL
#define CC2420_CONF_CHANNEL 26
#endif /* CC2420_CONF_CHANNEL */
#ifndef CC2420_CONF_CCA_THRESH
#define CC2420_CONF_CCA_THRESH -45
#endif /* CC2420_CONF_CCA_THRESH */

4
arch/platform/sky/contiki-conf.h
View File

@ -11,10 +11,6 @@
#include "sky-def.h"
#include "msp430-def.h"
/*---------------------------------------------------------------------------*/
/* Map RF_CHANNEL to cc2420 default channel */
#ifdef RF_CHANNEL
#define CC2420_CONF_CHANNEL RF_CHANNEL
#endif /* RF_CHANNEL */
/* Configure radio driver */
#ifndef NETSTACK_CONF_RADIO

4
arch/platform/sky/platform.c
View File

@ -207,11 +207,11 @@ platform_init_stage_three(void)
#if NETSTACK_CONF_WITH_IPV6
LOG_INFO("%s, rf channel %u, CCA threshold %i\n",
NETSTACK_MAC.name,
CC2420_CONF_CHANNEL,
IEEE802154_DEFAULT_CHANNEL,
CC2420_CONF_CCA_THRESH);
#else /* NETSTACK_CONF_WITH_IPV6 */
LOG_INFO("%s, rf channel %u\n",
NETSTACK_MAC.name, CC2420_CONF_CHANNEL);
NETSTACK_MAC.name, IEEE802154_DEFAULT_CHANNEL);
#endif /* NETSTACK_CONF_WITH_IPV6 */
#if !NETSTACK_CONF_WITH_IPV6