From 2ab15a00e902b13f752136445f68971d573df4b7 Mon Sep 17 00:00:00 2001 From: Simon Duquennoy Date: Thu, 12 Oct 2017 17:02:12 +0200 Subject: [PATCH] Cleanup Shell setup --- examples/6tisch/etsi-plugtest-2017/project-conf.h | 3 --- examples/ipv6/rpl-tsch/node.c | 9 --------- examples/ipv6/rpl-tsch/project-conf.h | 11 ----------- 3 files changed, 23 deletions(-) diff --git a/examples/6tisch/etsi-plugtest-2017/project-conf.h b/examples/6tisch/etsi-plugtest-2017/project-conf.h index e66c2b098..751ccf977 100644 --- a/examples/6tisch/etsi-plugtest-2017/project-conf.h +++ b/examples/6tisch/etsi-plugtest-2017/project-conf.h @@ -35,9 +35,6 @@ #ifndef __PROJECT_CONF_H__ #define __PROJECT_CONF_H__ -/* Set to use the Contiki shell */ -#define WITH_SHELL 1 - /* Set to enable TSCH security */ #ifndef WITH_SECURITY #define WITH_SECURITY 0 diff --git a/examples/ipv6/rpl-tsch/node.c b/examples/ipv6/rpl-tsch/node.c index b27157783..9884b4e0e 100644 --- a/examples/ipv6/rpl-tsch/node.c +++ b/examples/ipv6/rpl-tsch/node.c @@ -47,9 +47,6 @@ #if UIP_CONF_IPV6_RPL_LITE == 0 #include "rpl-private.h" #endif /* UIP_CONF_IPV6_RPL_LITE == 0 */ -#if WITH_SHELL -#include "serial-shell.h" -#endif /* WITH_SHELL */ #define DEBUG DEBUG_PRINT #include "net/ipv6/uip-debug.h" @@ -67,12 +64,6 @@ PROCESS_THREAD(node_process, ev, data) is_coordinator = 0; -#if WITH_SHELL - serial_shell_init(); - log_set_level("all", LOG_LEVEL_WARN); - tsch_log_stop(); -#endif /* WITH_SHELL */ - #if CONTIKI_TARGET_COOJA is_coordinator = (node_id == 1); #endif diff --git a/examples/ipv6/rpl-tsch/project-conf.h b/examples/ipv6/rpl-tsch/project-conf.h index b40eca3c1..a46792fea 100644 --- a/examples/ipv6/rpl-tsch/project-conf.h +++ b/examples/ipv6/rpl-tsch/project-conf.h @@ -35,9 +35,6 @@ #ifndef __PROJECT_CONF_H__ #define __PROJECT_CONF_H__ -/* Set to use the Contiki shell */ -#define WITH_SHELL 1 - /* Set to enable TSCH security */ #ifndef WITH_SECURITY #define WITH_SECURITY 0 @@ -49,18 +46,10 @@ #define RPL_CONF_MOP RPL_MOP_NON_STORING /* Mode of operation*/ -/*******************************************************/ -/********************* Configure TSCH *********************/ -/*******************************************************/ - -#if WITH_SHELL - /* USB serial takes space, free more space elsewhere */ #define SICSLOWPAN_CONF_FRAG 0 #define UIP_CONF_BUFFER_SIZE 160 -#endif /* WITH_SHELL */ - /*******************************************************/ /******************* Configure TSCH ********************/ /*******************************************************/