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

Reduced default strobe time, which seems to work well. Avoid running the interrupt if the power-save feature is turned off (fixes problems with serial data reception on a gateway mote)

Browse source
This commit is contained in:
adamdunkels 2009-04-29 11:42:13 +00:00
parent c02a82ac41
commit cc44e89415
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
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.31 2009/04/28 14:00:53 adamdunkels Exp $ * $Id: xmac.c,v 1.32 2009/04/29 11:42:13 adamdunkels Exp $
*/ */
/** /**
@ -116,7 +116,7 @@ struct xmac_hdr {
struct xmac_config xmac_config = { struct xmac_config xmac_config = {
DEFAULT_ON_TIME, DEFAULT_ON_TIME,
DEFAULT_OFF_TIME, DEFAULT_OFF_TIME,
20 * DEFAULT_ON_TIME + DEFAULT_OFF_TIME, 4 * DEFAULT_ON_TIME + DEFAULT_OFF_TIME,
DEFAULT_STROBE_WAIT_TIME DEFAULT_STROBE_WAIT_TIME
}; };
@ -273,11 +273,15 @@ powercycle(struct rtimer *t, void *ptr)
} else { } else {
adjust = should_be - RTIMER_TIME(t); adjust = should_be - RTIMER_TIME(t);
} }
r = rtimer_set(t, RTIMER_TIME(t) + adjust, 1, if(xmac_is_on) {
(void (*)(struct rtimer *, void *))powercycle, ptr); r = rtimer_set(t, RTIMER_TIME(t) + adjust, 1,
(void (*)(struct rtimer *, void *))powercycle, ptr);
}
#else /* WITH_TIMESYNCH */ #else /* WITH_TIMESYNCH */
r = rtimer_set(t, RTIMER_TIME(t) + xmac_config.off_time, 1, if(xmac_is_on) {
(void (*)(struct rtimer *, void *))powercycle, ptr); r = rtimer_set(t, RTIMER_TIME(t) + xmac_config.off_time, 1,
(void (*)(struct rtimer *, void *))powercycle, ptr);
}
#endif /* WITH_TIMESYNCH */ #endif /* WITH_TIMESYNCH */
if(r) { if(r) {
PRINTF("xmac: 1 could not set rtimer %d\n", r); PRINTF("xmac: 1 could not set rtimer %d\n", r);
@ -289,8 +293,10 @@ powercycle(struct rtimer *t, void *ptr)
waiting_for_packet == 0) { waiting_for_packet == 0) {
on(); on();
} }
r = rtimer_set(t, RTIMER_TIME(t) + xmac_config.on_time, 1, if(xmac_is_on) {
(void (*)(struct rtimer *, void *))powercycle, ptr); r = rtimer_set(t, RTIMER_TIME(t) + xmac_config.on_time, 1,
(void (*)(struct rtimer *, void *))powercycle, ptr);
}
if(r) { if(r) {
PRINTF("xmac: 3 could not set rtimer %d\n", r); PRINTF("xmac: 3 could not set rtimer %d\n", r);
} }
@ -781,6 +787,8 @@ static int
turn_on(void) turn_on(void)
{ {
xmac_is_on = 1; xmac_is_on = 1;
rtimer_set(&rt, RTIMER_NOW() + xmac_config.off_time, 1,
(void (*)(struct rtimer *, void *))powercycle, NULL);
return 1; return 1;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/