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

jn516x: use IEEE802154_DEFAULT_CHANNEL

Browse Source
This commit is contained in:
Simon Duquennoy 2018-04-13 02:31:28 -07:00
parent 8bc3a7388e
commit 2359cdb7c0
4 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/platform/jn516x/contiki-conf.h
View File

@ -40,14 +40,6 @@
#include "jn516x-def.h" #include "jn516x-def.h"
#ifdef RF_CHANNEL
#define MICROMAC_CONF_CHANNEL RF_CHANNEL
#endif
#ifndef MICROMAC_CONF_CHANNEL
#define MICROMAC_CONF_CHANNEL 26
#endif
/* Configure radio driver */ /* Configure radio driver */
#ifndef NETSTACK_CONF_RADIO #ifndef NETSTACK_CONF_RADIO
#define NETSTACK_CONF_RADIO micromac_radio_driver #define NETSTACK_CONF_RADIO micromac_radio_driver

7
arch/platform/jn516x/dev/micromac-radio.c
View File

@ -100,11 +100,6 @@
#define MIRCOMAC_CONF_BUF_NUM 2 #define MIRCOMAC_CONF_BUF_NUM 2
#endif /* MIRCOMAC_CONF_BUF_NUM */ #endif /* MIRCOMAC_CONF_BUF_NUM */
/* Init radio channel */
#ifndef MICROMAC_CONF_CHANNEL
#define MICROMAC_CONF_CHANNEL 26
#endif
/* Default energy level threshold for clear channel detection */ /* Default energy level threshold for clear channel detection */
#ifndef MICROMAC_CONF_CCA_THR #ifndef MICROMAC_CONF_CCA_THR
#define MICROMAC_CONF_CCA_THR 39 /* approximately -85 dBm */ #define MICROMAC_CONF_CCA_THR 39 /* approximately -85 dBm */
@ -159,7 +154,7 @@ static uint8_t autoack_enabled = MICROMAC_CONF_AUTOACK;
static uint8_t send_on_cca = 0; static uint8_t send_on_cca = 0;
/* Current radio channel */ /* Current radio channel */
static int current_channel = MICROMAC_CONF_CHANNEL; static int current_channel = IEEE802154_DEFAULT_CHANNEL;
/* Current set point tx power /* Current set point tx power
Actual tx power may be different. Use get_txpower() for actual power */ Actual tx power may be different. Use get_txpower() for actual power */

2
examples/platform-specific/jn516x/rpl/common-conf.h
View File

@ -72,8 +72,6 @@
#define IEEE802154_CONF_PANID 0xabcd #define IEEE802154_CONF_PANID 0xabcd
#define MICROMAC_CONF_CHANNEL 26
/* UART Configuration */ /* UART Configuration */
#define UART_HW_FLOW_CTRL 0 #define UART_HW_FLOW_CTRL 0

2
examples/platform-specific/jn516x/tsch/common-conf.h
View File

@ -104,8 +104,6 @@
#if MAC_CONF_WITH_CSMA /* Configure Csma with ACK (default MAC) */ #if MAC_CONF_WITH_CSMA /* Configure Csma with ACK (default MAC) */
#define MICROMAC_CONF_CHANNEL 26
#define MICROMAC_CONF_AUTOACK 1 #define MICROMAC_CONF_AUTOACK 1
/* increase internal radio buffering */ /* increase internal radio buffering */