From 3ecd955f01f2d20fa285a1b6ad8fc8d7f3cea753 Mon Sep 17 00:00:00 2001 From: nifi Date: Thu, 13 Mar 2008 15:58:44 +0000 Subject: [PATCH] energest needs to be initialized before network --- platform/esb/contiki-esb-main.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/platform/esb/contiki-esb-main.c b/platform/esb/contiki-esb-main.c index 325674ef1..34d24a276 100644 --- a/platform/esb/contiki-esb-main.c +++ b/platform/esb/contiki-esb-main.c @@ -28,7 +28,7 @@ * * This file is part of the Contiki operating system. * - * @(#)$Id: contiki-esb-main.c,v 1.14 2008/03/07 17:54:22 nifi Exp $ + * @(#)$Id: contiki-esb-main.c,v 1.15 2008/03/13 15:58:44 nifi Exp $ */ #include @@ -118,6 +118,15 @@ main(void) ctimer_init(); +#if PROFILE_CONF_ON + profile_init(); +#endif /* PROFILE_CONF_ON */ + +#if ENERGEST_CONF_ON + energest_init(); + ENERGEST_ON(ENERGEST_TYPE_CPU); +#endif /* ENERGEST_CONF_ON */ + init_net(); printf(CONTIKI_VERSION_STRING " started. "); @@ -132,15 +141,6 @@ main(void) clock_delay(100); leds_off(LEDS_RED); -#if PROFILE_CONF_ON - profile_init(); -#endif /* PROFILE_CONF_ON */ - -#if ENERGEST_CONF_ON - energest_init(); - ENERGEST_ON(ENERGEST_TYPE_CPU); -#endif /* ENERGEST_CONF_ON */ - init_apps(); print_processes(autostart_processes); autostart_start(autostart_processes);