From cffe0c59f20376f26d6fd777f28b96d74d68297e Mon Sep 17 00:00:00 2001
From: Niclas Finne <nfi@sics.se>
Date: Tue, 31 Oct 2017 19:57:58 +0100
Subject: [PATCH] energest: activate energest type CPU at init

---
 os/contiki-main.c | 1 -
 os/sys/energest.c | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/os/contiki-main.c b/os/contiki-main.c
index d699dc286..b78138472 100644
--- a/os/contiki-main.c
+++ b/os/contiki-main.c
@@ -79,7 +79,6 @@ main(void)
   watchdog_init();
 
   energest_init();
-  ENERGEST_ON(ENERGEST_TYPE_CPU);
 
   platform_init_stage_two();
 
diff --git a/os/sys/energest.c b/os/sys/energest.c
index af0a2949b..3fbb8f46f 100644
--- a/os/sys/energest.c
+++ b/os/sys/energest.c
@@ -55,6 +55,7 @@ energest_init(void)
     energest_total_time[i] = energest_current_time[i] = 0;
     energest_current_mode[i] = 0;
   }
+  ENERGEST_ON(ENERGEST_TYPE_CPU);
 }
 /*---------------------------------------------------------------------------*/
 void