Enable Shell in rpl-tsch example
This commit is contained in:
parent
ad6ef11a0b
commit
0d6282171f
|
@ -8,7 +8,7 @@ CONTIKI_WITH_IPV6 = 1
|
|||
MAKE_WITH_ORCHESTRA ?= 0 # force Orchestra from command line
|
||||
MAKE_WITH_SECURITY ?= 0 # force Security from command line
|
||||
|
||||
APPS += orchestra
|
||||
APPS += orchestra shell
|
||||
MODULES += core/net/mac/tsch
|
||||
|
||||
ifeq ($(MAKE_WITH_ORCHESTRA),1)
|
||||
|
|
|
@ -48,6 +48,9 @@
|
|||
#if WITH_ORCHESTRA
|
||||
#include "orchestra.h"
|
||||
#endif /* WITH_ORCHESTRA */
|
||||
#if WITH_SHELL
|
||||
#include "serial-shell.h"
|
||||
#endif /* WITH_SHELL */
|
||||
|
||||
#define DEBUG DEBUG_PRINT
|
||||
#include "net/ip/uip-debug.h"
|
||||
|
@ -131,7 +134,7 @@ print_network_status(void)
|
|||
PRINT6ADDR(&child_ipaddr);
|
||||
if(link->parent == NULL) {
|
||||
memset(&parent_ipaddr, 0, sizeof(parent_ipaddr));
|
||||
PRINTF(" --- DODAG root ");
|
||||
PRINTF(" to DODAG root ");
|
||||
} else {
|
||||
PRINTF(" to ");
|
||||
PRINT6ADDR(&parent_ipaddr);
|
||||
|
@ -174,6 +177,10 @@ PROCESS_THREAD(node_process, ev, data)
|
|||
|
||||
int coordinator_candidate = 0;
|
||||
|
||||
#if WITH_SHELL
|
||||
serial_shell_init();
|
||||
#endif /* WITH_SHELL */
|
||||
|
||||
#if CONTIKI_TARGET_COOJA
|
||||
coordinator_candidate = (node_id == 1);
|
||||
#endif
|
||||
|
|
|
@ -35,6 +35,9 @@
|
|||
#ifndef __PROJECT_CONF_H__
|
||||
#define __PROJECT_CONF_H__
|
||||
|
||||
/* Set to use the Contiki shell */
|
||||
#define WITH_SHELL 1
|
||||
|
||||
/* Set to run orchestra */
|
||||
#ifndef WITH_ORCHESTRA
|
||||
#define WITH_ORCHESTRA 0
|
||||
|
@ -75,6 +78,11 @@
|
|||
#undef SYS_CTRL_CONF_OSC32K_USE_XTAL
|
||||
#define SYS_CTRL_CONF_OSC32K_USE_XTAL 1
|
||||
|
||||
#if WITH_SHELL
|
||||
/* Needed for CC2538 platforms, for serial */
|
||||
#define USB_SERIAL_CONF_ENABLE 1
|
||||
#endif /* WITH_SHELL */
|
||||
|
||||
/* Needed for cc2420 platforms only */
|
||||
/* Disable DCO calibration (uses timerB) */
|
||||
#undef DCOSYNCH_CONF_ENABLED
|
||||
|
@ -89,7 +97,7 @@
|
|||
|
||||
/* TSCH per-slot logging */
|
||||
#undef TSCH_LOG_CONF_PER_SLOT
|
||||
#define TSCH_LOG_CONF_PER_SLOT 1
|
||||
#define TSCH_LOG_CONF_PER_SLOT 0
|
||||
|
||||
/* IEEE802.15.4 PANID */
|
||||
#undef IEEE802154_CONF_PANID
|
||||
|
|
Loading…
Reference in New Issue