From 36362a49d3a5a47271dfd6bec6877449c0951c9e Mon Sep 17 00:00:00 2001 From: Niclas Finne Date: Thu, 2 Nov 2017 00:10:56 +0100 Subject: [PATCH] Added energest configuration to viewconf --- os/sys/energest.h | 5 +++++ tools/viewconf.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/os/sys/energest.h b/os/sys/energest.h index a9620c351..0875eaba7 100644 --- a/os/sys/energest.h +++ b/os/sys/energest.h @@ -42,6 +42,11 @@ #include "contiki.h" +#ifndef ENERGEST_CONF_ON +/* Energest is disabled by default */ +#define ENERGEST_CONF_ON 0 +#endif /* ENERGEST_CONF_ON */ + #ifndef ENERGEST_CURRENT_TIME #ifdef ENERGEST_CONF_CURRENT_TIME #define ENERGEST_CURRENT_TIME ENERGEST_CONF_CURRENT_TIME diff --git a/tools/viewconf.c b/tools/viewconf.c index 61666b77c..f742b66a0 100644 --- a/tools/viewconf.c +++ b/tools/viewconf.c @@ -8,6 +8,7 @@ #include "os/net/queuebuf.h" #include "os/net/nbr-table.h" #include "os/sys/log-conf.h" +#include "os/sys/energest.h" #ifdef PROJECT_CONF_PATH ##### "PROJECT_CONF_PATH": _____________________ == PROJECT_CONF_PATH @@ -139,6 +140,8 @@ ##### "SICSLOWPAN_CONF_COMPRESSION": ___________ -> SICSLOWPAN_COMPRESSION #endif +##### "ENERGEST_CONF_ON": ______________________ == ENERGEST_CONF_ON + ##### "LOG_CONF_LEVEL_RPL": ____________________ == LOG_CONF_LEVEL_RPL ##### "LOG_CONF_LEVEL_TCPIP": __________________ == LOG_CONF_LEVEL_TCPIP ##### "LOG_CONF_LEVEL_IPV6": ___________________ == LOG_CONF_LEVEL_IPV6