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

Enable stream mode by default, remove LED debug mode

Browse source
This commit is contained in:
adamdunkels 2009-11-04 16:02:45 +00:00
parent 3a6f44fb34
commit 70fc23ac7e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/net/mac/xmac.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: xmac.c,v 1.40 2009/11/02 11:58:56 adamdunkels Exp $ * $Id: xmac.c,v 1.41 2009/11/04 16:02:45 adamdunkels Exp $
*/ */
/** /**
@ -66,6 +66,7 @@
#define WITH_ACK_OPTIMIZATION 1 #define WITH_ACK_OPTIMIZATION 1
#define WITH_RANDOM_WAIT_BEFORE_SEND 0 #define WITH_RANDOM_WAIT_BEFORE_SEND 0
#define WITH_ENCOUNTER_OPTIMIZATION 1 #define WITH_ENCOUNTER_OPTIMIZATION 1
#define WITH_STREAMING 1
struct announcement_data { struct announcement_data {
uint16_t id; uint16_t id;
@ -164,12 +165,12 @@ static const struct radio_driver *radio;
#define PRINTF(...) printf(__VA_ARGS__) #define PRINTF(...) printf(__VA_ARGS__)
#define PRINTDEBUG(...) printf(__VA_ARGS__) #define PRINTDEBUG(...) printf(__VA_ARGS__)
#else #else
/*#undef LEDS_ON #undef LEDS_ON
#undef LEDS_OFF #undef LEDS_OFF
#undef LEDS_TOGGLE #undef LEDS_TOGGLE
#define LEDS_ON(x) #define LEDS_ON(x)
#define LEDS_OFF(x) #define LEDS_OFF(x)
#define LEDS_TOGGLE(x)*/ #define LEDS_TOGGLE(x)
#define PRINTF(...) #define PRINTF(...)
#define PRINTDEBUG(...) #define PRINTDEBUG(...)
#endif #endif
@ -458,7 +459,6 @@ send_packet(void)
struct queuebuf *packet; struct queuebuf *packet;
int is_already_streaming = 0; int is_already_streaming = 0;
#if WITH_RANDOM_WAIT_BEFORE_SEND #if WITH_RANDOM_WAIT_BEFORE_SEND
{ {
rtimer_clock_t t = RTIMER_NOW() + (random_rand() % (xmac_config.on_time * 4)); rtimer_clock_t t = RTIMER_NOW() + (random_rand() % (xmac_config.on_time * 4));