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

Bugfix: the clock interrupt now flushes the energy estimator to avoid overflow of the LPM mode

Browse source
This commit is contained in:
adamdunkels 2010-04-04 12:29:50 +00:00
parent 7d6ff0289e
commit 0ed236e774
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cpu/msp430/clock.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: clock.c,v 1.24 2010/03/29 21:53:32 adamdunkels Exp $ * @(#)$Id: clock.c,v 1.25 2010/04/04 12:29:50 adamdunkels Exp $
*/ */
@ -53,7 +53,6 @@ static volatile clock_time_t count = 0;
static unsigned short last_tar = 0; static unsigned short last_tar = 0;
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
interrupt(TIMERA1_VECTOR) timera1 (void) { interrupt(TIMERA1_VECTOR) timera1 (void) {
ENERGEST_OFF(ENERGEST_TYPE_LPM);
ENERGEST_ON(ENERGEST_TYPE_IRQ); ENERGEST_ON(ENERGEST_TYPE_IRQ);
if(TAIV == 2) { if(TAIV == 2) {
@ -79,6 +78,7 @@ interrupt(TIMERA1_VECTOR) timera1 (void) {
#endif #endif
if(count % CLOCK_CONF_SECOND == 0) { if(count % CLOCK_CONF_SECOND == 0) {
++seconds; ++seconds;
energest_flush();
} }
} while((TACCR1 - TAR) > INTERVAL); } while((TACCR1 - TAR) > INTERVAL);
@ -96,7 +96,6 @@ interrupt(TIMERA1_VECTOR) timera1 (void) {
}*/ }*/
ENERGEST_OFF(ENERGEST_TYPE_IRQ); ENERGEST_OFF(ENERGEST_TYPE_IRQ);
ENERGEST_ON(ENERGEST_TYPE_LPM);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
clock_time_t clock_time_t