From 3a105f214124cb0dd4ded81d7d2565b45feb53e5 Mon Sep 17 00:00:00 2001 From: George Oikonomou Date: Sun, 26 Jun 2016 13:48:27 +0100 Subject: [PATCH] Disable CC2650_FAST_RADIO_STARTUP by default `CC2650_FAST_RADIO_STARTUP` is required for TSCH, but it currently breaks ContikiMAC. We set the default value to the one that will work with the default choice of RDC. Fixes #1744 --- platform/srf06-cc26xx/contiki-conf.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/platform/srf06-cc26xx/contiki-conf.h b/platform/srf06-cc26xx/contiki-conf.h index 62e807524..c1546f6a8 100644 --- a/platform/srf06-cc26xx/contiki-conf.h +++ b/platform/srf06-cc26xx/contiki-conf.h @@ -65,6 +65,14 @@ #define NETSTACK_CONF_RDC contikimac_driver #endif +/* + * Disable turning off HF oscillator when the radio is off: + * You need to set this in order to use TSCH, disable to save more energy. + */ +#ifndef CC2650_FAST_RADIO_STARTUP +#define CC2650_FAST_RADIO_STARTUP 0 +#endif + /* Configure NullRDC for when it's selected */ #define NULLRDC_CONF_802154_AUTOACK 1 @@ -359,12 +367,6 @@ typedef uint32_t rtimer_clock_t; /* Disable TSCH frame filtering */ #define TSCH_CONF_HW_FRAME_FILTERING 0 -/* Disable turning off HF oscillator when radio is off; - enable this for TSCH, disable to save more energy. */ -#ifndef CC2650_FAST_RADIO_STARTUP -#define CC2650_FAST_RADIO_STARTUP 1 -#endif - /* Use hardware timestamps */ #ifndef TSCH_CONF_RESYNC_WITH_SFD_TIMESTAMPS #define TSCH_CONF_RESYNC_WITH_SFD_TIMESTAMPS 1