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

Turned off streaming by default to save code space; made guard time a little more conservative

Browse source
This commit is contained in:
adamdunkels 2010-11-02 11:00:08 +00:00
parent 1b5001b226
commit b7df18a96a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: contikimac.c,v 1.40 2010/10/24 21:06:17 adamdunkels Exp $ * $Id: contikimac.c,v 1.41 2010/11/02 11:00:08 adamdunkels Exp $
*/ */
/** /**
@ -67,7 +67,7 @@
#define WITH_PHASE_OPTIMIZATION 1 #define WITH_PHASE_OPTIMIZATION 1
#endif #endif
#ifndef WITH_STREAMING #ifndef WITH_STREAMING
#define WITH_STREAMING 1 #define WITH_STREAMING 0
#endif #endif
#ifndef WITH_CONTIKIMAC_HEADER #ifndef WITH_CONTIKIMAC_HEADER
#define WITH_CONTIKIMAC_HEADER 1 #define WITH_CONTIKIMAC_HEADER 1
@ -122,7 +122,7 @@ struct announcement_msg {
#define STREAM_CCA_COUNT (CYCLE_TIME / (CCA_SLEEP_TIME + CCA_CHECK_TIME) - CCA_COUNT_MAX) #define STREAM_CCA_COUNT (CYCLE_TIME / (CCA_SLEEP_TIME + CCA_CHECK_TIME) - CCA_COUNT_MAX)
#define GUARD_TIME 8 * CHECK_TIME #define GUARD_TIME 9 * CHECK_TIME
#define INTER_PACKET_INTERVAL RTIMER_ARCH_SECOND / 5000 #define INTER_PACKET_INTERVAL RTIMER_ARCH_SECOND / 5000
#define AFTER_ACK_DETECTECT_WAIT_TIME RTIMER_ARCH_SECOND / 1500 #define AFTER_ACK_DETECTECT_WAIT_TIME RTIMER_ARCH_SECOND / 1500