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

Bugfix: attribute energy expenditure to a device only if the device was actually switched on

Browse source
This commit is contained in:
adamdunkels 2009-10-20 20:19:27 +00:00
parent 15c4cdaa3e
commit a25a3a45b5
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/sys/energest.h
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: energest.h,v 1.4 2009/05/11 15:26:24 nvt-se Exp $ * $Id: energest.h,v 1.5 2009/10/20 20:19:27 adamdunkels Exp $
*/ */
/** /**
@ -92,7 +92,7 @@ extern energest_t energest_leveldevice_current_leveltime[ENERGEST_CONF_LEVELDEVI
energest_current_mode[type] = 1; \ energest_current_mode[type] = 1; \
} while(0) } while(0)
#define ENERGEST_OFF(type) do { \ #define ENERGEST_OFF(type) if(energest_current_mode[type] != 0) do { \
energest_total_time[type].current += (rtimer_clock_t)(RTIMER_NOW() - \ energest_total_time[type].current += (rtimer_clock_t)(RTIMER_NOW() - \
energest_current_time[type]); \ energest_current_time[type]); \
energest_current_mode[type] = 0; \ energest_current_mode[type] = 0; \