Move zoul examples one level up

2017-05-17 22:24:41 +02:00 · 2017-05-17 22:24:41 +02:00 · dd4ea6d412
commit dd4ea6d412
parent 78e424200b
58 changed files with 9 additions and 9 deletions
--- a/examples/platform-specific/zolertia/zoul/Makefile
+++ b/examples/platform-specific/zolertia/zoul/Makefile
@ -17,6 +17,6 @@ MODULES += drivers//dev/bme280

 all: $(CONTIKI_PROJECT)

-CONTIKI = ../../../..
+CONTIKI = ../../..
 CONTIKI_WITH_RIME = 1
 include $(CONTIKI)/Makefile.include
--- a/examples/platform-specific/zolertia/zoul/Makefile.target
+++ b/examples/platform-specific/zolertia/zoul/Makefile.target
--- a/examples/platform-specific/zolertia/zoul/README.md
+++ b/examples/platform-specific/zolertia/zoul/README.md
--- a/examples/platform-specific/zolertia/zoul/at-test/Makefile
+++ b/examples/platform-specific/zolertia/zoul/at-test/Makefile
@ -3,5 +3,5 @@ CONTIKI_PROJECT = at-master-test
 APPS = at-master
 all: $(CONTIKI_PROJECT)

-CONTIKI = ../../../..
+CONTIKI = ../../..
 include $(CONTIKI)/Makefile.include
--- a/examples/platform-specific/zolertia/zoul/at-test/at-master-test.c
+++ b/examples/platform-specific/zolertia/zoul/at-test/at-master-test.c
--- a/examples/platform-specific/zolertia/zoul/at-test/project-conf.h
+++ b/examples/platform-specific/zolertia/zoul/at-test/project-conf.h
--- a/examples/platform-specific/zolertia/zoul/cc1200-demo/Makefile
+++ b/examples/platform-specific/zolertia/zoul/cc1200-demo/Makefile
@ -3,6 +3,6 @@ CONTIKI_PROJECT = cc1200-demo

 all: $(CONTIKI_PROJECT)

-CONTIKI = ../../../../../..
+CONTIKI = ../../../../..
 CONTIKI_WITH_RIME = 1
 include $(CONTIKI)/Makefile.include
--- a/examples/platform-specific/zolertia/zoul/cc1200-demo/Makefile.target
+++ b/examples/platform-specific/zolertia/zoul/cc1200-demo/Makefile.target
--- a/examples/platform-specific/zolertia/zoul/cc1200-demo/cc1200-demo.c
+++ b/examples/platform-specific/zolertia/zoul/cc1200-demo/cc1200-demo.c
--- a/examples/platform-specific/zolertia/zoul/cc1200-demo/project-conf.h
+++ b/examples/platform-specific/zolertia/zoul/cc1200-demo/project-conf.h
--- a/examples/platform-specific/zolertia/zoul/node-red/README.md
+++ b/examples/platform-specific/zolertia/zoul/node-red/README.md
--- a/examples/platform-specific/zolertia/zoul/node-red/mqtt-remote-demo.json
+++ b/examples/platform-specific/zolertia/zoul/node-red/mqtt-remote-demo.json
--- a/examples/platform-specific/zolertia/zoul/orion/README.md
+++ b/examples/platform-specific/zolertia/zoul/orion/README.md
--- a/examples/platform-specific/zolertia/zoul/orion/client/Makefile
+++ b/examples/platform-specific/zolertia/zoul/orion/client/Makefile
@ -8,5 +8,5 @@ APPS += http-socket

 WITH_IP64 = 1

-CONTIKI = ../../../../../..
+CONTIKI = ../../../../..
 include $(CONTIKI)/Makefile.include
--- a/examples/platform-specific/zolertia/zoul/orion/client/client.c
+++ b/examples/platform-specific/zolertia/zoul/orion/client/client.c
--- a/examples/platform-specific/zolertia/zoul/orion/client/ifttt-client.c
+++ b/examples/platform-specific/zolertia/zoul/orion/client/ifttt-client.c
--- a/examples/platform-specific/zolertia/zoul/orion/client/project-conf.h
+++ b/examples/platform-specific/zolertia/zoul/orion/client/project-conf.h
--- a/examples/platform-specific/zolertia/zoul/orion/ip64-router/Makefile
+++ b/examples/platform-specific/zolertia/zoul/orion/ip64-router/Makefile
@ -4,7 +4,7 @@ all: ip64-router

 BOARD = orion

-CONTIKI = ../../../../../..
+CONTIKI = ../../../../..

 WITH_IP64 = 1
 CONTIKI_WITH_IPV6 = 1
--- a/examples/platform-specific/zolertia/zoul/orion/ip64-router/Makefile.target
+++ b/examples/platform-specific/zolertia/zoul/orion/ip64-router/Makefile.target
--- a/examples/platform-specific/zolertia/zoul/orion/ip64-router/httpd-simple.c
+++ b/examples/platform-specific/zolertia/zoul/orion/ip64-router/httpd-simple.c
--- a/examples/platform-specific/zolertia/zoul/orion/ip64-router/httpd-simple.h
+++ b/examples/platform-specific/zolertia/zoul/orion/ip64-router/httpd-simple.h
--- a/examples/platform-specific/zolertia/zoul/orion/ip64-router/ip64-router.c
+++ b/examples/platform-specific/zolertia/zoul/orion/ip64-router/ip64-router.c
--- a/examples/platform-specific/zolertia/zoul/orion/ip64-router/project-conf.h
+++ b/examples/platform-specific/zolertia/zoul/orion/ip64-router/project-conf.h
--- a/examples/platform-specific/zolertia/zoul/project-conf.h
+++ b/examples/platform-specific/zolertia/zoul/project-conf.h
--- a/examples/platform-specific/zolertia/zoul/rev-a/Makefile
+++ b/examples/platform-specific/zolertia/zoul/rev-a/Makefile
@ -4,6 +4,6 @@ CONTIKI_PROJECT = test-power-mgmt

 all: $(CONTIKI_PROJECT)

-CONTIKI = ../../../../..
+CONTIKI = ../../../..
 CONTIKI_WITH_RIME = 1
 include $(CONTIKI)/Makefile.include
--- a/examples/platform-specific/zolertia/zoul/rev-a/Makefile.target
+++ b/examples/platform-specific/zolertia/zoul/rev-a/Makefile.target
--- a/examples/platform-specific/zolertia/zoul/rev-a/project-conf.h
+++ b/examples/platform-specific/zolertia/zoul/rev-a/project-conf.h
--- a/examples/platform-specific/zolertia/zoul/rev-a/test-power-mgmt.c
+++ b/examples/platform-specific/zolertia/zoul/rev-a/test-power-mgmt.c
--- a/examples/platform-specific/zolertia/zoul/rev-b/Makefile
+++ b/examples/platform-specific/zolertia/zoul/rev-b/Makefile
@ -6,6 +6,6 @@ BOARD ?= remote-revb

 all: $(CONTIKI_PROJECT)

-CONTIKI = ../../../../..
+CONTIKI = ../../../..
 CONTIKI_WITH_RIME = 1
 include $(CONTIKI)/Makefile.include
--- a/examples/platform-specific/zolertia/zoul/rev-b/Makefile.target
+++ b/examples/platform-specific/zolertia/zoul/rev-b/Makefile.target
--- a/examples/platform-specific/zolertia/zoul/rev-b/project-conf.h
+++ b/examples/platform-specific/zolertia/zoul/rev-b/project-conf.h
--- a/examples/platform-specific/zolertia/zoul/rev-b/test-power-mgmt.c
+++ b/examples/platform-specific/zolertia/zoul/rev-b/test-power-mgmt.c
--- a/examples/platform-specific/zolertia/zoul/rtcc/Makefile
+++ b/examples/platform-specific/zolertia/zoul/rtcc/Makefile
@ -5,5 +5,5 @@ TARGET = zoul

 all: $(CONTIKI_PROJECT)

-CONTIKI = ../../../../..
+CONTIKI = ../../../..
 include $(CONTIKI)/Makefile.include
--- a/examples/platform-specific/zolertia/zoul/rtcc/Makefile.target
+++ b/examples/platform-specific/zolertia/zoul/rtcc/Makefile.target
--- a/examples/platform-specific/zolertia/zoul/rtcc/project-conf.h
+++ b/examples/platform-specific/zolertia/zoul/rtcc/project-conf.h
--- a/examples/platform-specific/zolertia/zoul/rtcc/test-rtcc.c
+++ b/examples/platform-specific/zolertia/zoul/rtcc/test-rtcc.c
--- a/examples/platform-specific/zolertia/zoul/test-aac-sensor.c
+++ b/examples/platform-specific/zolertia/zoul/test-aac-sensor.c
--- a/examples/platform-specific/zolertia/zoul/test-ac-dimmer.c
+++ b/examples/platform-specific/zolertia/zoul/test-ac-dimmer.c
--- a/examples/platform-specific/zolertia/zoul/test-bme280.c
+++ b/examples/platform-specific/zolertia/zoul/test-bme280.c
--- a/examples/platform-specific/zolertia/zoul/test-bmp085-bmp180.c
+++ b/examples/platform-specific/zolertia/zoul/test-bmp085-bmp180.c
--- a/examples/platform-specific/zolertia/zoul/test-dht22.c
+++ b/examples/platform-specific/zolertia/zoul/test-dht22.c
--- a/examples/platform-specific/zolertia/zoul/test-grove-gyro.c
+++ b/examples/platform-specific/zolertia/zoul/test-grove-gyro.c
--- a/examples/platform-specific/zolertia/zoul/test-grove-light-sensor.c
+++ b/examples/platform-specific/zolertia/zoul/test-grove-light-sensor.c
--- a/examples/platform-specific/zolertia/zoul/test-grove-loudness-sensor.c
+++ b/examples/platform-specific/zolertia/zoul/test-grove-loudness-sensor.c
--- a/examples/platform-specific/zolertia/zoul/test-iaq.c
+++ b/examples/platform-specific/zolertia/zoul/test-iaq.c
--- a/examples/platform-specific/zolertia/zoul/test-lcd.c
+++ b/examples/platform-specific/zolertia/zoul/test-lcd.c
--- a/examples/platform-specific/zolertia/zoul/test-motion.c
+++ b/examples/platform-specific/zolertia/zoul/test-motion.c
--- a/examples/platform-specific/zolertia/zoul/test-pm10-sensor.c
+++ b/examples/platform-specific/zolertia/zoul/test-pm10-sensor.c
--- a/examples/platform-specific/zolertia/zoul/test-relay.c
+++ b/examples/platform-specific/zolertia/zoul/test-relay.c
--- a/examples/platform-specific/zolertia/zoul/test-rotation-sensor.c
+++ b/examples/platform-specific/zolertia/zoul/test-rotation-sensor.c
--- a/examples/platform-specific/zolertia/zoul/test-servo.c
+++ b/examples/platform-specific/zolertia/zoul/test-servo.c
--- a/examples/platform-specific/zolertia/zoul/test-sht25.c
+++ b/examples/platform-specific/zolertia/zoul/test-sht25.c
--- a/examples/platform-specific/zolertia/zoul/test-tsl256x.c
+++ b/examples/platform-specific/zolertia/zoul/test-tsl256x.c
--- a/examples/platform-specific/zolertia/zoul/test-vac-sensor.c
+++ b/examples/platform-specific/zolertia/zoul/test-vac-sensor.c
--- a/examples/platform-specific/zolertia/zoul/test-weather-meter.c
+++ b/examples/platform-specific/zolertia/zoul/test-weather-meter.c
--- a/examples/platform-specific/zolertia/zoul/test-zonik.c
+++ b/examples/platform-specific/zolertia/zoul/test-zonik.c
--- a/examples/platform-specific/zolertia/zoul/zoul-demo.c
+++ b/examples/platform-specific/zolertia/zoul/zoul-demo.c
--- a/regression-tests/02-compile-arm-ports/Makefile
+++ b/regression-tests/02-compile-arm-ports/Makefile
@ -26,7 +26,7 @@ platform-specific/cc2538-common/zoul \
 platform-specific/cc2538-common/mqtt-demo/zoul \
 platform-specific/cc2538-common/crypto/zoul \
 platform-specific/cc2538-common/pka/zoul \
-platform-specific/zolertia/zoul/orion/ip64-router/zoul:BOARD=orion \
+platform-specific/zoul/orion/ip64-router/zoul:BOARD=orion \
 ipv6/er-rest-example/zoul \
 ipso-objects/zoul \
 hello-world/zoul \