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

stm32w platforms: use 2 cca and default contikimac guard time

Browse source
This commit is contained in:
simonduq 2012-03-20 11:46:38 +01:00
parent 5da4463236
commit 7784cf7827
3 changed files with 43 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/net/mac/contikimac.c
View file

@ -127,11 +127,7 @@ static int is_receiver_awake = 0;
consists of two or more CCA checks. CCA_COUNT_MAX is the number of consists of two or more CCA checks. CCA_COUNT_MAX is the number of
CCAs to be done for each periodic channel check. The default is CCAs to be done for each periodic channel check. The default is
two.*/ two.*/
#ifdef CONTIKIMAC_CONF_CCA_COUNT_MAX
#define CCA_COUNT_MAX CONTIKIMAC_CONF_CCA_COUNT_MAX
#else
#define CCA_COUNT_MAX 2 #define CCA_COUNT_MAX 2
#endif
/* Before starting a transmission, Contikimac checks the availability /* Before starting a transmission, Contikimac checks the availability
of the channel with CCA_COUNT_MAX_TX consecutive CCAs */ of the channel with CCA_COUNT_MAX_TX consecutive CCAs */
@ -180,11 +176,7 @@ static int is_receiver_awake = 0;
/* GUARD_TIME is the time before the expected phase of a neighbor that /* GUARD_TIME is the time before the expected phase of a neighbor that
a transmitted should begin transmitting packets. */ a transmitted should begin transmitting packets. */
#ifdef CONTIKIMAC_CONF_GUARD_TIME
#define GUARD_TIME CONTIKIMAC_CONF_GUARD_TIME * CHECK_TIME + CHECK_TIME_TX
#else
#define GUARD_TIME 10 * CHECK_TIME + CHECK_TIME_TX #define GUARD_TIME 10 * CHECK_TIME + CHECK_TIME_TX
#endif
/* INTER_PACKET_INTERVAL is the interval between two successive packet transmissions */ /* INTER_PACKET_INTERVAL is the interval between two successive packet transmissions */
#define INTER_PACKET_INTERVAL RTIMER_ARCH_SECOND / 5000 #define INTER_PACKET_INTERVAL RTIMER_ARCH_SECOND / 5000

6
platform/mb851/contiki-conf.h
View file

@ -38,6 +38,7 @@
* \author * \author
* Salvatore Pitrulli <salvopitru@users.sourceforge.net> * Salvatore Pitrulli <salvopitru@users.sourceforge.net>
* Chi-Anh La <la@imag.fr> * Chi-Anh La <la@imag.fr>
* Simon Duquennoy <simonduq@sics.se>
*/ */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -103,14 +104,11 @@ typedef unsigned short uip_stats_t;
#define RDC_CONF_DEBUG_LED 1 #define RDC_CONF_DEBUG_LED 1
/* ContikiMAC config */ /* ContikiMAC config */
#define CONTIKIMAC_CONF_CCA_COUNT_MAX 3 #define SICSLOWPAN_CONF_COMPRESSION_THRESHOLD 63
#define CONTIKIMAC_CONF_WITH_CONTIKIMAC_HEADER 0 #define CONTIKIMAC_CONF_WITH_CONTIKIMAC_HEADER 0
#define WITH_PHASE_OPTIMIZATION 1
#define CONTIKIMAC_CONF_COMPOWER 1 #define CONTIKIMAC_CONF_COMPOWER 1
#define CONTIKIMAC_CONF_BROADCAST_RATE_LIMIT 0 #define CONTIKIMAC_CONF_BROADCAST_RATE_LIMIT 0
#define CONTIKIMAC_CONF_ANNOUNCEMENTS 0 #define CONTIKIMAC_CONF_ANNOUNCEMENTS 0
#define WITH_FAST_SLEEP 0
#define CONTIKIMAC_CONF_GUARD_TIME 4
/* CXMAC config */ /* CXMAC config */
#define CXMAC_CONF_ANNOUNCEMENTS 0 #define CXMAC_CONF_ANNOUNCEMENTS 0

6
platform/mbxxx/contiki-conf.h
View file

@ -37,6 +37,7 @@
* \author * \author
* Salvatore Pitrulli <salvopitru@users.sourceforge.net> * Salvatore Pitrulli <salvopitru@users.sourceforge.net>
* Chi-Anh La <la@imag.fr> * Chi-Anh La <la@imag.fr>
* Simon Duquennoy <simonduq@sics.se>
*/ */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -102,14 +103,11 @@ typedef unsigned short uip_stats_t;
#define RDC_CONF_DEBUG_LED 1 #define RDC_CONF_DEBUG_LED 1
/* ContikiMAC config */ /* ContikiMAC config */
#define CONTIKIMAC_CONF_CCA_COUNT_MAX 3 #define SICSLOWPAN_CONF_COMPRESSION_THRESHOLD 63
#define CONTIKIMAC_CONF_WITH_CONTIKIMAC_HEADER 0 #define CONTIKIMAC_CONF_WITH_CONTIKIMAC_HEADER 0
#define WITH_PHASE_OPTIMIZATION 1
#define CONTIKIMAC_CONF_COMPOWER 1 #define CONTIKIMAC_CONF_COMPOWER 1
#define CONTIKIMAC_CONF_BROADCAST_RATE_LIMIT 0 #define CONTIKIMAC_CONF_BROADCAST_RATE_LIMIT 0
#define CONTIKIMAC_CONF_ANNOUNCEMENTS 0 #define CONTIKIMAC_CONF_ANNOUNCEMENTS 0
#define WITH_FAST_SLEEP 0
#define CONTIKIMAC_CONF_GUARD_TIME 4
/* CXMAC config */ /* CXMAC config */
#define CXMAC_CONF_ANNOUNCEMENTS 0 #define CXMAC_CONF_ANNOUNCEMENTS 0