From a25a3a45b5035e7f9bf85f59585ec9f9afa0317b Mon Sep 17 00:00:00 2001 From: adamdunkels Date: Tue, 20 Oct 2009 20:19:27 +0000 Subject: [PATCH] Bugfix: attribute energy expenditure to a device only if the device was actually switched on --- core/sys/energest.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/sys/energest.h b/core/sys/energest.h index c453755fe..8929b3547 100644 --- a/core/sys/energest.h +++ b/core/sys/energest.h @@ -28,7 +28,7 @@ * * 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; \ } 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_current_time[type]); \ energest_current_mode[type] = 0; \