From ba241db9684baf2c331e898f8ed9444c876eea35 Mon Sep 17 00:00:00 2001 From: Antonis Makrogiannakis Date: Tue, 6 Dec 2016 13:34:26 +0200 Subject: [PATCH 1/2] Added NullRDC and ContikiMAC timings for Zolertia RE-Mote. CC1200 SubGHz 50 Kbps mode. --- platform/zoul/contiki-conf.h | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/platform/zoul/contiki-conf.h b/platform/zoul/contiki-conf.h index dd11aea7c..9b64554cb 100644 --- a/platform/zoul/contiki-conf.h +++ b/platform/zoul/contiki-conf.h @@ -322,8 +322,8 @@ typedef uint32_t rtimer_clock_t; #endif /* Configure NullRDC for when it's selected */ -#define NULLRDC_802154_AUTOACK 1 -#define NULLRDC_802154_AUTOACK_HW 1 +#define NULLRDC_CONF_802154_AUTOACK 1 +#define NULLRDC_CONF_802154_AUTOACK_HW 1 /* Configure ContikiMAC for when it's selected */ #define CONTIKIMAC_CONF_WITH_PHASE_OPTIMIZATION 0 @@ -341,6 +341,26 @@ typedef uint32_t rtimer_clock_t; #endif /* NETSTACK_CONF_WITH_IPV6 */ #endif /* NETSTACK_CONF_FRAMER */ +#if CC1200_CONF_SUBGHZ_50KBPS_MODE +#define NETSTACK_CONF_RADIO cc1200_driver +#define CC1200_CONF_RF_CFG cc1200_802154g_863_870_fsk_50kbps +#define ANTENNA_SW_SELECT_DEF_CONF ANTENNA_SW_SELECT_SUBGHZ +#define CC1200_CONF_USE_GPIO2 0 +#define CC1200_CONF_USE_RX_WATCHDOG 0 + +#define NULLRDC_CONF_ACK_WAIT_TIME (RTIMER_SECOND / 200) +#define NULLRDC_CONF_AFTER_ACK_DETECTED_WAIT_TIME (RTIMER_SECOND / 1500) +#define NULLRDC_CONF_802154_AUTOACK 1 +#define NULLRDC_CONF_802154_AUTOACK_HW 1 +#define NULLRDC_CONF_SEND_802154_ACK 0 + +#define CONTIKIMAC_CONF_CCA_CHECK_TIME (RTIMER_ARCH_SECOND / 800) +#define CONTIKIMAC_CONF_CCA_SLEEP_TIME (RTIMER_ARCH_SECOND / 120) +#define CONTIKIMAC_CONF_LISTEN_TIME_AFTER_PACKET_DETECTED (RTIMER_ARCH_SECOND / 8) +#define CONTIKIMAC_CONF_AFTER_ACK_DETECTED_WAIT_TIME (RTIMER_SECOND / 300) +#define CONTIKIMAC_CONF_INTER_PACKET_INTERVAL (RTIMER_SECOND / 200) +#endif + /* This can be overriden to use the cc1200_driver instead */ #ifndef NETSTACK_CONF_RADIO #define NETSTACK_CONF_RADIO cc2538_rf_driver From 7927af021e556bbbe597a58e8a099458382d75eb Mon Sep 17 00:00:00 2001 From: Antonio Lignan Date: Fri, 16 Dec 2016 15:47:13 +0100 Subject: [PATCH 2/2] Minor cosmetic change --- platform/zoul/contiki-conf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/zoul/contiki-conf.h b/platform/zoul/contiki-conf.h index 9b64554cb..229598b6d 100644 --- a/platform/zoul/contiki-conf.h +++ b/platform/zoul/contiki-conf.h @@ -323,7 +323,7 @@ typedef uint32_t rtimer_clock_t; /* Configure NullRDC for when it's selected */ #define NULLRDC_CONF_802154_AUTOACK 1 -#define NULLRDC_CONF_802154_AUTOACK_HW 1 +#define NULLRDC_CONF_802154_AUTOACK_HW 1 /* Configure ContikiMAC for when it's selected */ #define CONTIKIMAC_CONF_WITH_PHASE_OPTIMIZATION 0