From 2e39fe0d6bf61e30763ad577890e41102b1a9158 Mon Sep 17 00:00:00 2001 From: Simon Duquennoy Date: Thu, 12 Oct 2017 09:22:24 +0200 Subject: [PATCH] TSCH: disable per-slot logging in most examples --- examples/6tisch/6p-packet/project-conf.h | 1 - examples/ipv6/rpl-simple/project-conf.h | 3 --- examples/ipv6/rpl-tsch-sixtop/project-conf.h | 5 ----- examples/platform-specific/jn516x/rpl/common-conf.h | 3 --- examples/platform-specific/jn516x/tsch/common-conf.h | 1 - tests/13-ieee802154/code-flush-nbr-queue/project-conf.h | 3 --- tests/16-6tisch/code/project-conf.h | 2 -- 7 files changed, 18 deletions(-) diff --git a/examples/6tisch/6p-packet/project-conf.h b/examples/6tisch/6p-packet/project-conf.h index 756496a8f..112c5b3ae 100644 --- a/examples/6tisch/6p-packet/project-conf.h +++ b/examples/6tisch/6p-packet/project-conf.h @@ -40,7 +40,6 @@ #endif /* CONTIKI_TARGET_COOJA */ #define TSCH_CONF_WITH_SIXTOP 1 -#define TSCH_LOG_CONF_LEVEL 2 #define TSCH_CONF_AUTOSTART 1 #define TSCH_CONF_DEFAULT_HOPPING_SEQUENCE TSCH_HOPPING_SEQUENCE_1_1 diff --git a/examples/ipv6/rpl-simple/project-conf.h b/examples/ipv6/rpl-simple/project-conf.h index b5c3c9991..3d60588bc 100644 --- a/examples/ipv6/rpl-simple/project-conf.h +++ b/examples/ipv6/rpl-simple/project-conf.h @@ -56,9 +56,6 @@ /*******************************************************/ #endif /* MAC_CONF_WITH_TSCH */ -/* TSCH per-slot logging */ -#define TSCH_LOG_CONF_PER_SLOT 1 - /* Do not start TSCH at init, wait for NETSTACK_MAC.on() */ #define TSCH_CONF_AUTOSTART 0 diff --git a/examples/ipv6/rpl-tsch-sixtop/project-conf.h b/examples/ipv6/rpl-tsch-sixtop/project-conf.h index 3fa3d548a..11c9b16e7 100755 --- a/examples/ipv6/rpl-tsch-sixtop/project-conf.h +++ b/examples/ipv6/rpl-tsch-sixtop/project-conf.h @@ -71,9 +71,6 @@ /******************* Configure TSCH ********************/ /*******************************************************/ -/* TSCH logging. */ -#define TSCH_LOG_CONF_PER_SLOT 1 - /* IEEE802.15.4 PANID */ #define IEEE802154_CONF_PANID 0xabcd @@ -113,8 +110,6 @@ * a very short 6TiSCH minimal schedule length */ #define TSCH_CONF_DEFAULT_TIMESLOT_LENGTH 65000 #define TSCH_SCHEDULE_CONF_DEFAULT_LENGTH 2 -/* Reduce log level to make space for security on z1 */ -#define TSCH_LOG_CONF_LEVEL 0 #endif /* WITH_SECURITY */ #endif /* CONTIKI_TARGET_Z1 */ diff --git a/examples/platform-specific/jn516x/rpl/common-conf.h b/examples/platform-specific/jn516x/rpl/common-conf.h index fb7b0d51c..97bc5fd37 100644 --- a/examples/platform-specific/jn516x/rpl/common-conf.h +++ b/examples/platform-specific/jn516x/rpl/common-conf.h @@ -60,9 +60,6 @@ #define TSCH_CALLBACK_JOINING_NETWORK tsch_rpl_callback_joining_network #define TSCH_CALLBACK_LEAVING_NETWORK tsch_rpl_callback_leaving_network -/* TSCH per-slot logging */ -#define TSCH_LOG_CONF_PER_SLOT 1 - /* Do not start TSCH at init, wait for NETSTACK_MAC.on() */ #define TSCH_CONF_AUTOSTART 0 diff --git a/examples/platform-specific/jn516x/tsch/common-conf.h b/examples/platform-specific/jn516x/tsch/common-conf.h index 28c5e2835..325bc2536 100644 --- a/examples/platform-specific/jn516x/tsch/common-conf.h +++ b/examples/platform-specific/jn516x/tsch/common-conf.h @@ -37,7 +37,6 @@ /* Global config flags */ #define WITH_TSCH_SECURITY 0 -#define TSCH_LOG_CONF_PER_SLOT 1 #define WITH_COAP_RESOURCES 0 #define ENABLE_COOJA_DEBUG 0 diff --git a/tests/13-ieee802154/code-flush-nbr-queue/project-conf.h b/tests/13-ieee802154/code-flush-nbr-queue/project-conf.h index 52b95b95c..a0cde69ec 100644 --- a/tests/13-ieee802154/code-flush-nbr-queue/project-conf.h +++ b/tests/13-ieee802154/code-flush-nbr-queue/project-conf.h @@ -37,9 +37,6 @@ /* Set the minimum value of QUEUEBUF_CONF_NUM for the flush_nbr_queue test */ #define QUEUEBUF_CONF_NUM 1 -/* TSCH per-slot logging */ -#define TSCH_LOG_CONF_PER_SLOT 1 - #define TSCH_CONF_AUTOSTART 1 #define TSCH_CONF_WITH_SIXTOP 1 diff --git a/tests/16-6tisch/code/project-conf.h b/tests/16-6tisch/code/project-conf.h index 3cd35f11d..41782a8a3 100644 --- a/tests/16-6tisch/code/project-conf.h +++ b/tests/16-6tisch/code/project-conf.h @@ -49,8 +49,6 @@ #define TSCH_CONF_WITH_SIXTOP 1 -#define TSCH_LOG_CONF_PER_SLOT 1 - #define LOG_CONF_LEVEL_6TOP LOG_LEVEL_DBG #define TSCH_CONF_AUTOSTART 0