deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1978 from makrog/pr/cc1200-fixes

Browse source 
Added NullRDC and ContikiMAC timings for Zolertia RE-Mote.
This commit is contained in:
Antonio Lignan 2016-12-23 18:31:47 +01:00 committed by GitHub
parent edec34f684 7927af021e
commit cf2b24971b
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
platform/zoul/contiki-conf.h
View file

@ -322,8 +322,8 @@ typedef uint32_t rtimer_clock_t;
#endif #endif
/* Configure NullRDC for when it's selected */ /* Configure NullRDC for when it's selected */
#define NULLRDC_802154_AUTOACK 1 #define NULLRDC_CONF_802154_AUTOACK 1
#define NULLRDC_802154_AUTOACK_HW 1 #define NULLRDC_CONF_802154_AUTOACK_HW 1
/* Configure ContikiMAC for when it's selected */ /* Configure ContikiMAC for when it's selected */
#define CONTIKIMAC_CONF_WITH_PHASE_OPTIMIZATION 0 #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_WITH_IPV6 */
#endif /* NETSTACK_CONF_FRAMER */ #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 */ /* This can be overriden to use the cc1200_driver instead */
#ifndef NETSTACK_CONF_RADIO #ifndef NETSTACK_CONF_RADIO
#define NETSTACK_CONF_RADIO cc2538_rf_driver #define NETSTACK_CONF_RADIO cc2538_rf_driver