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

moved energest init to after the rtimer init

Browse source
This commit is contained in:
root 2017-03-13 13:54:40 +00:00
parent 42cbe85a49
commit cc4aa440a0
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
platform/avr-rss2/contiki-main.c
View file

@ -258,6 +258,8 @@ initialize(void)
/* rtimers needed for radio cycling */ /* rtimers needed for radio cycling */
rtimer_init(); rtimer_init();
/* we can initialize the energest arrays here */
energest_init();
/* after the timer intitialisation we start the cpu measurement */ /* after the timer intitialisation we start the cpu measurement */
ENERGEST_ON(ENERGEST_TYPE_CPU); ENERGEST_ON(ENERGEST_TYPE_CPU);
@ -462,9 +464,6 @@ main(void)
#if NETSTACK_CONF_WITH_IPV6 #if NETSTACK_CONF_WITH_IPV6
uip_ds6_nbr_t *nbr; uip_ds6_nbr_t *nbr;
#endif /* NETSTACK_CONF_WITH_IPV6 */ #endif /* NETSTACK_CONF_WITH_IPV6 */
/* we can initialize the energest here, before the hardware */
energest_init();
initialize(); initialize();