Merge pull request #50 from simonduq/pr/rpl-compile-test

More compile tests for RPL
This commit is contained in:
Nicolas Tsiftes 2017-07-03 18:53:00 +02:00 committed by GitHub
commit a7818cf654
6 changed files with 4 additions and 27 deletions

View File

@ -17,10 +17,6 @@ PROJECT_SOURCEFILES += slip-bridge.c
#of the slip connection. Large MSS together with low baud rates without flow
#control will overrun the transmit buffer when the style sheet is requested.
ifeq ($(MAKE_WITH_NON_STORING),1)
CFLAGS += -DWITH_NON_STORING=1
endif
WITH_WEBSERVER=1
ifeq ($(WITH_WEBSERVER),1)
CFLAGS += -DUIP_CONF_TCP=1

View File

@ -31,15 +31,6 @@
#ifndef PROJECT_ROUTER_CONF_H_
#define PROJECT_ROUTER_CONF_H_
#ifndef WITH_NON_STORING
#define WITH_NON_STORING 0 /* Set this to run with non-storing mode */
#endif /* WITH_NON_STORING */
#if WITH_NON_STORING
#undef RPL_CONF_MOP
#define RPL_CONF_MOP RPL_MOP_NON_STORING /* Mode of operation*/
#endif /* WITH_NON_STORING */
#ifndef UIP_FALLBACK_INTERFACE
#define UIP_FALLBACK_INTERFACE rpl_interface
#endif

View File

@ -15,9 +15,5 @@ ifdef PERIOD
CFLAGS+=-DPERIOD=$(PERIOD)
endif
ifeq ($(MAKE_WITH_NON_STORING),1)
CFLAGS += -DWITH_NON_STORING=1
endif
CONTIKI_WITH_IPV6 = 1
include $(CONTIKI)/Makefile.include

View File

@ -30,10 +30,6 @@
#ifndef PROJECT_CONF_H_
#define PROJECT_CONF_H_
#ifndef WITH_NON_STORING
#define WITH_NON_STORING 0 /* Set this to run with non-storing mode */
#endif /* WITH_NON_STORING */
#ifdef TEST_MORE_ROUTES
/* configure number of neighbors and routes */
#define NBR_TABLE_CONF_MAX_NEIGHBORS 10
@ -55,9 +51,4 @@
#define RPL_CONF_DEFAULT_ROUTE_INFINITE_LIFETIME 1
#if WITH_NON_STORING
#undef RPL_CONF_MOP
#define RPL_CONF_MOP RPL_MOP_NON_STORING /* Mode of operation*/
#endif /* WITH_NON_STORING */
#endif

View File

@ -7,6 +7,8 @@ hello-world/sky \
eeprom-test/native \
ipv6/multicast/sky \
logging/native \
ipv6/rpl-udp/sky \
ipv6/rpl-simple/sky \
TOOLS=

View File

@ -13,7 +13,8 @@ platform-specific/cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=launchpad/cc1350 \
platform-specific/cc26xx/very-sleepy-demo/srf06-cc26xx \
hello-world/cc2538dk \
ipv6/rpl-border-router/cc2538dk \
ipv6/rpl-border-router/cc2538dk:MAKE_WITH_NON_STORING=1 \
ipv6/rpl-udp/cc2538dk \
ipv6/rpl-simple/cc2538dk \
ipv6/er-rest-example/cc2538dk \
ipso-objects/cc2538dk \
platform-specific/cc2538dk/udp-ipv6-echo-server/cc2538dk \