giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Moved orchestra to os/services

Browse Source
This commit is contained in:
Simon Duquennoy 2017-09-01 15:43:25 +02:00
parent 192f8ee582
commit c9906caf3c
16 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/ipv6/rpl-tsch/Makefile
View File

@ -9,8 +9,7 @@ MAKE_WITH_ORCHESTRA ?= 0 # force Orchestra from command line
MAKE_WITH_SECURITY ?= 0 # force Security from command line MAKE_WITH_SECURITY ?= 0 # force Security from command line
MAKE_WITH_PERIODIC_ROUTES_PRINT ?= 0 # print #routes periodically, used for regression tests MAKE_WITH_PERIODIC_ROUTES_PRINT ?= 0 # print #routes periodically, used for regression tests
APPS += orchestra MODULES += os/net/mac/tsch os/services/shell os/services/orchestra
MODULES += os/net/mac/tsch os/services/shell
ifeq ($(MAKE_WITH_ORCHESTRA),1) ifeq ($(MAKE_WITH_ORCHESTRA),1)
CFLAGS += -DWITH_ORCHESTRA=1 CFLAGS += -DWITH_ORCHESTRA=1

2
examples/ipv6/rpl-tsch/project-conf.h
View File

@ -125,7 +125,7 @@
#if WITH_ORCHESTRA #if WITH_ORCHESTRA
/* See apps/orchestra/README.md for more Orchestra configuration options */ /* See os/services//orchestra/README.md for more Orchestra configuration options */
#define TSCH_SCHEDULE_CONF_WITH_6TISCH_MINIMAL 0 /* No 6TiSCH minimal schedule */ #define TSCH_SCHEDULE_CONF_WITH_6TISCH_MINIMAL 0 /* No 6TiSCH minimal schedule */
#define TSCH_CONF_WITH_LINK_SELECTOR 1 /* Orchestra requires per-packet link selection */ #define TSCH_CONF_WITH_LINK_SELECTOR 1 /* Orchestra requires per-packet link selection */
/* Orchestra callbacks */ /* Orchestra callbacks */

2
examples/platform-specific/jn516x/rpl/common-conf.h
View File

@ -88,7 +88,7 @@
#if WITH_ORCHESTRA #if WITH_ORCHESTRA
/* See apps/orchestra/README.md for more Orchestra configuration options */ /* See os/services/orchestra/README.md for more Orchestra configuration options */
#define TSCH_SCHEDULE_CONF_WITH_6TISCH_MINIMAL 0 /* No 6TiSCH minimal schedule */ #define TSCH_SCHEDULE_CONF_WITH_6TISCH_MINIMAL 0 /* No 6TiSCH minimal schedule */
#define TSCH_CONF_WITH_LINK_SELECTOR 1 /* Orchestra requires per-packet link selection */ #define TSCH_CONF_WITH_LINK_SELECTOR 1 /* Orchestra requires per-packet link selection */
/* Orchestra callbacks */ /* Orchestra callbacks */

3
examples/platform-specific/jn516x/tsch/simple-sensor-network/node/Makefile
View File

@ -13,11 +13,10 @@ PROJECT_SOURCEFILES += rpl-tools.c
CFLAGS += -DWITH_COAP CFLAGS += -DWITH_COAP
CFLAGS += -DREST=coap_rest_implementation CFLAGS += -DREST=coap_rest_implementation
CFLAGS += -DUIP_CONF_TCP=0 CFLAGS += -DUIP_CONF_TCP=0
APPS += orchestra
APPS += json APPS += json
APPS += er-coap APPS += er-coap
MODULES += os/net/mac/tsch MODULES += os/net/mac/tsch os/services/orchestra
all: $(CONTIKI_PROJECT) all: $(CONTIKI_PROJECT)

3
examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/Makefile
View File

@ -15,11 +15,10 @@ PROJECT_SOURCEFILES += rpl-tools.c
CFLAGS += -DWITH_COAP CFLAGS += -DWITH_COAP
CFLAGS += -DREST=coap_rest_implementation CFLAGS += -DREST=coap_rest_implementation
CFLAGS += -DUIP_CONF_TCP=0 CFLAGS += -DUIP_CONF_TCP=0
APPS += orchestra
APPS += json APPS += json
APPS += er-coap APPS += er-coap
MODULES += os/net/mac/tsch MODULES += os/net/mac/tsch os/services/orchestra
all: $(CONTIKI_PROJECT) all: $(CONTIKI_PROJECT)
include $(CONTIKI)/Makefile.include include $(CONTIKI)/Makefile.include

3
examples/platform-specific/jn516x/tsch/tx-power-verification/node/Makefile
View File

@ -13,11 +13,10 @@ PROJECT_SOURCEFILES += rpl-tools.c
CFLAGS += -DWITH_COAP CFLAGS += -DWITH_COAP
CFLAGS += -DREST=coap_rest_implementation CFLAGS += -DREST=coap_rest_implementation
CFLAGS += -DUIP_CONF_TCP=0 CFLAGS += -DUIP_CONF_TCP=0
APPS += orchestra
APPS += json APPS += json
APPS += er-coap APPS += er-coap
MODULES += os/net/mac/tsch MODULES += os/net/mac/tsch os/services/orchestra
all: $(CONTIKI_PROJECT) all: $(CONTIKI_PROJECT)

3
examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/Makefile
View File

@ -16,11 +16,10 @@ PROJECT_SOURCEFILES += rpl-tools.c
CFLAGS += -DWITH_COAP CFLAGS += -DWITH_COAP
CFLAGS += -DREST=coap_rest_implementation CFLAGS += -DREST=coap_rest_implementation
CFLAGS += -DUIP_CONF_TCP=0 CFLAGS += -DUIP_CONF_TCP=0
APPS += orchestra
APPS += json APPS += json
APPS += er-coap APPS += er-coap
MODULES += os/net/mac/tsch MODULES += os/net/mac/tsch os/services/orchestra
all: $(CONTIKI_PROJECT) all: $(CONTIKI_PROJECT)
include $(CONTIKI)/Makefile.include include $(CONTIKI)/Makefile.include

3
examples/platform-specific/jn516x/tsch/uart1-test-node/Makefile
View File

@ -14,11 +14,10 @@ PROJECT_SOURCEFILES += rpl-tools.c
CFLAGS += -DWITH_COAP CFLAGS += -DWITH_COAP
CFLAGS += -DREST=coap_rest_implementation CFLAGS += -DREST=coap_rest_implementation
CFLAGS += -DUIP_CONF_TCP=0 CFLAGS += -DUIP_CONF_TCP=0
APPS += orchestra
APPS += json APPS += json
APPS += er-coap APPS += er-coap
MODULES += os/net/mac/tsch MODULES += os/net/mac/tsch os/services/orchestra
all: $(CONTIKI_PROJECT) all: $(CONTIKI_PROJECT)

0
apps/orchestra/README.md → os/services/orchestra/README.md
View File

0
apps/orchestra/orchestra-conf.h → os/services/orchestra/orchestra-conf.h
View File

0
apps/orchestra/orchestra-rule-default-common.c → os/services/orchestra/orchestra-rule-default-common.c
View File

0
apps/orchestra/orchestra-rule-eb-per-time-source.c → os/services/orchestra/orchestra-rule-eb-per-time-source.c
View File

0
apps/orchestra/orchestra-rule-unicast-per-neighbor-rpl-ns.c → os/services/orchestra/orchestra-rule-unicast-per-neighbor-rpl-ns.c
View File

0
apps/orchestra/orchestra-rule-unicast-per-neighbor-rpl-storing.c → os/services/orchestra/orchestra-rule-unicast-per-neighbor-rpl-storing.c
View File

0
apps/orchestra/orchestra.c → os/services/orchestra/orchestra.c
View File

0
apps/orchestra/orchestra.h → os/services/orchestra/orchestra.h
View File