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

Added energy estimation

Browse source
This commit is contained in:
adamdunkels 2007-05-22 20:59:11 +00:00
parent 9277197506
commit 9a5bac6282
4 changed files with 43 additions and 31 deletions
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.
*
* @(#)$Id: clock.c,v 1.6 2007/04/02 16:32:20 joxe Exp $
* @(#)$Id: clock.c,v 1.7 2007/05/22 20:59:27 adamdunkels Exp $
*/
@ -37,6 +37,7 @@
#include "contiki-conf.h"
#include "lib/energest.h"
#include "sys/clock.h"
#include "sys/etimer.h"
@ -50,6 +51,7 @@ static volatile clock_time_t count = 0;
static unsigned short last_tar = 0;
/*---------------------------------------------------------------------------*/
interrupt(TIMERA1_VECTOR) timera1 (void) {
ENERGEST_ON(ENERGEST_TYPE_IRQ);
if(TAIV == 2) {
TACCR1 += INTERVAL;
last_tar = TAR;
@ -61,6 +63,7 @@ interrupt(TIMERA1_VECTOR) timera1 (void) {
LPM4_EXIT;
}
}
ENERGEST_OFF(ENERGEST_TYPE_IRQ);
}
/*---------------------------------------------------------------------------*/
clock_time_t