From 7a6cbff5f6012894aee7d57f6032fe622ce20e72 Mon Sep 17 00:00:00 2001 From: Yasuyuki Tanaka Date: Fri, 12 Oct 2018 16:37:55 +0200 Subject: [PATCH] Rename srf06/{cc26xx,cc13xx} to srf06/{cc26x0,cc13x0} --- .../cc26x0-cc13x0/Makefile.cc26x0-cc13x0 | 4 +-- .../Makefile.cc13x0} | 2 +- .../srf06/{cc13xx => cc13x0}/board.h | 0 .../Makefile.cc26x0} | 2 +- .../srf06/{cc26xx => cc26x0}/board.h | 0 .../6tisch/channel-selection-demo/Makefile | 2 +- examples/6tisch/tsch-stats/Makefile | 2 +- examples/benchmarks/rpl-req-resp/Makefile | 2 +- .../cc26x0-cc13x0/ble-ipv6/Makefile | 2 +- .../{cc26xx-demo.c => cc26x0-demo.c} | 0 .../Makefile | 2 +- .../Makefile.target | 0 .../README.md | 2 +- .../cc26x0-web-demo.c} | 4 +-- .../cc26x0-web-demo.h} | 2 +- .../cetic-6lbr-client.c | 2 +- .../coap-server.c | 4 +-- .../coap-server.h | 2 +- .../httpd-simple.c | 4 +-- .../httpd-simple.h | 2 +- .../img/6lbr-web.png | Bin .../ibm-watson-iot-platform-tls-optional.png | Bin .../img/quickstart-sensortag.png | Bin .../img/sensor-readings-config.png | Bin .../img/well-known-core.png | Bin .../mqtt-client.c | 4 +-- .../mqtt-client.h | 2 +- .../net-uart.c | 2 +- .../net-uart.h | 0 .../project-conf.h | 0 .../resources/res-ble-advd.c | 2 +- .../resources/res-device.c | 4 +-- .../resources/res-leds.c | 2 +- .../resources/res-net.c | 4 +-- .../resources/res-sensors.c | 4 +-- .../resources/res-toggle-leds.c | 2 +- tests/02-compile-arm-ports-01/Makefile | 26 +++++++++--------- 37 files changed, 46 insertions(+), 46 deletions(-) rename arch/platform/cc26x0-cc13x0/srf06/{cc13xx/Makefile.cc13xx => cc13x0/Makefile.cc13x0} (82%) rename arch/platform/cc26x0-cc13x0/srf06/{cc13xx => cc13x0}/board.h (100%) rename arch/platform/cc26x0-cc13x0/srf06/{cc26xx/Makefile.cc26xx => cc26x0/Makefile.cc26x0} (81%) rename arch/platform/cc26x0-cc13x0/srf06/{cc26xx => cc26x0}/board.h (100%) rename examples/platform-specific/cc26x0-cc13x0/{cc26xx-demo.c => cc26x0-demo.c} (100%) rename examples/platform-specific/cc26x0-cc13x0/{cc26xx-web-demo => cc26x0-web-demo}/Makefile (93%) rename examples/platform-specific/cc26x0-cc13x0/{cc26xx-web-demo => cc26x0-web-demo}/Makefile.target (100%) rename examples/platform-specific/cc26x0-cc13x0/{cc26xx-web-demo => cc26x0-web-demo}/README.md (99%) rename examples/platform-specific/cc26x0-cc13x0/{cc26xx-web-demo/cc26xx-web-demo.c => cc26x0-web-demo/cc26x0-web-demo.c} (99%) rename examples/platform-specific/cc26x0-cc13x0/{cc26xx-web-demo/cc26xx-web-demo.h => cc26x0-web-demo/cc26x0-web-demo.h} (99%) rename examples/platform-specific/cc26x0-cc13x0/{cc26xx-web-demo => cc26x0-web-demo}/cetic-6lbr-client.c (99%) rename examples/platform-specific/cc26x0-cc13x0/{cc26xx-web-demo => cc26x0-web-demo}/coap-server.c (99%) rename examples/platform-specific/cc26x0-cc13x0/{cc26xx-web-demo => cc26x0-web-demo}/coap-server.h (98%) rename examples/platform-specific/cc26x0-cc13x0/{cc26xx-web-demo => cc26x0-web-demo}/httpd-simple.c (99%) rename examples/platform-specific/cc26x0-cc13x0/{cc26xx-web-demo => cc26x0-web-demo}/httpd-simple.h (99%) rename examples/platform-specific/cc26x0-cc13x0/{cc26xx-web-demo => cc26x0-web-demo}/img/6lbr-web.png (100%) rename examples/platform-specific/cc26x0-cc13x0/{cc26xx-web-demo => cc26x0-web-demo}/img/ibm-watson-iot-platform-tls-optional.png (100%) rename examples/platform-specific/cc26x0-cc13x0/{cc26xx-web-demo => cc26x0-web-demo}/img/quickstart-sensortag.png (100%) rename examples/platform-specific/cc26x0-cc13x0/{cc26xx-web-demo => cc26x0-web-demo}/img/sensor-readings-config.png (100%) rename examples/platform-specific/cc26x0-cc13x0/{cc26xx-web-demo => cc26x0-web-demo}/img/well-known-core.png (100%) rename examples/platform-specific/cc26x0-cc13x0/{cc26xx-web-demo => cc26x0-web-demo}/mqtt-client.c (99%) rename examples/platform-specific/cc26x0-cc13x0/{cc26xx-web-demo => cc26x0-web-demo}/mqtt-client.h (99%) rename examples/platform-specific/cc26x0-cc13x0/{cc26xx-web-demo => cc26x0-web-demo}/net-uart.c (99%) rename examples/platform-specific/cc26x0-cc13x0/{cc26xx-web-demo => cc26x0-web-demo}/net-uart.h (100%) rename examples/platform-specific/cc26x0-cc13x0/{cc26xx-web-demo => cc26x0-web-demo}/project-conf.h (100%) rename examples/platform-specific/cc26x0-cc13x0/{cc26xx-web-demo => cc26x0-web-demo}/resources/res-ble-advd.c (99%) rename examples/platform-specific/cc26x0-cc13x0/{cc26xx-web-demo => cc26x0-web-demo}/resources/res-device.c (99%) rename examples/platform-specific/cc26x0-cc13x0/{cc26xx-web-demo => cc26x0-web-demo}/resources/res-leds.c (99%) rename examples/platform-specific/cc26x0-cc13x0/{cc26xx-web-demo => cc26x0-web-demo}/resources/res-net.c (98%) rename examples/platform-specific/cc26x0-cc13x0/{cc26xx-web-demo => cc26x0-web-demo}/resources/res-sensors.c (99%) rename examples/platform-specific/cc26x0-cc13x0/{cc26xx-web-demo => cc26x0-web-demo}/resources/res-toggle-leds.c (99%) diff --git a/arch/platform/cc26x0-cc13x0/Makefile.cc26x0-cc13x0 b/arch/platform/cc26x0-cc13x0/Makefile.cc26x0-cc13x0 index 6ff30afc8..0c7557ab1 100644 --- a/arch/platform/cc26x0-cc13x0/Makefile.cc26x0-cc13x0 +++ b/arch/platform/cc26x0-cc13x0/Makefile.cc26x0-cc13x0 @@ -5,8 +5,8 @@ ifndef CONTIKI endif ### Board and BSP selection -BOARD ?= srf06/cc26xx -BOARDS = srf06/cc26xx srf06/cc13xx launchpad/cc2640r2 launchpad/cc2650 launchpad/cc1310 launchpad/cc1350 sensortag/cc2650 sensortag/cc1350 +BOARD ?= srf06/cc26x0 +BOARDS = srf06/cc26x0 srf06/cc13x0 launchpad/cc2640r2 launchpad/cc2650 launchpad/cc1310 launchpad/cc1350 sensortag/cc2650 sensortag/cc1350 CONTIKI_TARGET_DIRS += . diff --git a/arch/platform/cc26x0-cc13x0/srf06/cc13xx/Makefile.cc13xx b/arch/platform/cc26x0-cc13x0/srf06/cc13x0/Makefile.cc13x0 similarity index 82% rename from arch/platform/cc26x0-cc13x0/srf06/cc13xx/Makefile.cc13xx rename to arch/platform/cc26x0-cc13x0/srf06/cc13x0/Makefile.cc13x0 index b83084651..2d92d9113 100644 --- a/arch/platform/cc26x0-cc13x0/srf06/cc13xx/Makefile.cc13xx +++ b/arch/platform/cc26x0-cc13x0/srf06/cc13x0/Makefile.cc13x0 @@ -4,4 +4,4 @@ CPU_FAMILY = cc13xx ### Include the common sensortag makefile include $(PLATFORM_ROOT_DIR)/srf06/Makefile.srf06 -CONTIKI_TARGET_DIRS += srf06/cc13xx +CONTIKI_TARGET_DIRS += srf06/cc13x0 diff --git a/arch/platform/cc26x0-cc13x0/srf06/cc13xx/board.h b/arch/platform/cc26x0-cc13x0/srf06/cc13x0/board.h similarity index 100% rename from arch/platform/cc26x0-cc13x0/srf06/cc13xx/board.h rename to arch/platform/cc26x0-cc13x0/srf06/cc13x0/board.h diff --git a/arch/platform/cc26x0-cc13x0/srf06/cc26xx/Makefile.cc26xx b/arch/platform/cc26x0-cc13x0/srf06/cc26x0/Makefile.cc26x0 similarity index 81% rename from arch/platform/cc26x0-cc13x0/srf06/cc26xx/Makefile.cc26xx rename to arch/platform/cc26x0-cc13x0/srf06/cc26x0/Makefile.cc26x0 index 841442a5c..6e4a09629 100644 --- a/arch/platform/cc26x0-cc13x0/srf06/cc26xx/Makefile.cc26xx +++ b/arch/platform/cc26x0-cc13x0/srf06/cc26x0/Makefile.cc26x0 @@ -4,4 +4,4 @@ CPU_FAMILY = cc26xx ### Include the common makefile include $(PLATFORM_ROOT_DIR)/srf06/Makefile.srf06 -CONTIKI_TARGET_DIRS += srf06/cc26xx +CONTIKI_TARGET_DIRS += srf06/cc26x0 diff --git a/arch/platform/cc26x0-cc13x0/srf06/cc26xx/board.h b/arch/platform/cc26x0-cc13x0/srf06/cc26x0/board.h similarity index 100% rename from arch/platform/cc26x0-cc13x0/srf06/cc26xx/board.h rename to arch/platform/cc26x0-cc13x0/srf06/cc26x0/board.h diff --git a/examples/6tisch/channel-selection-demo/Makefile b/examples/6tisch/channel-selection-demo/Makefile index a44c76f10..ada4a5062 100644 --- a/examples/6tisch/channel-selection-demo/Makefile +++ b/examples/6tisch/channel-selection-demo/Makefile @@ -4,7 +4,7 @@ all: $(CONTIKI_PROJECT) CONTIKI=../../.. PLATFORMS_EXCLUDE = sky nrf52dk native -BOARDS_EXCLUDE = srf06/cc13xx launchpad/cc1310 launchpad/cc1350 sensortag/cc2650 sensortag/cc1350 +BOARDS_EXCLUDE = srf06/cc13x0 launchpad/cc1310 launchpad/cc1350 sensortag/cc2650 sensortag/cc1350 # The channel selection library MODULES += os/services/tsch-cs diff --git a/examples/6tisch/tsch-stats/Makefile b/examples/6tisch/tsch-stats/Makefile index 0c8863301..5fdb5feb6 100644 --- a/examples/6tisch/tsch-stats/Makefile +++ b/examples/6tisch/tsch-stats/Makefile @@ -4,7 +4,7 @@ all: $(CONTIKI_PROJECT) CONTIKI=../../.. PLATFORMS_EXCLUDE = sky nrf52dk native -BOARDS_EXCLUDE = srf06/cc13xx launchpad/cc1310 launchpad/cc1350 sensortag/cc2650 sensortag/cc1350 +BOARDS_EXCLUDE = srf06/cc13x0 launchpad/cc1310 launchpad/cc1350 sensortag/cc2650 sensortag/cc1350 # force Orchestra from command line MAKE_WITH_ORCHESTRA ?= 0 diff --git a/examples/benchmarks/rpl-req-resp/Makefile b/examples/benchmarks/rpl-req-resp/Makefile index 11413ecd3..e23a35d5f 100644 --- a/examples/benchmarks/rpl-req-resp/Makefile +++ b/examples/benchmarks/rpl-req-resp/Makefile @@ -2,7 +2,7 @@ CONTIKI_PROJECT = node all: $(CONTIKI_PROJECT) PLATFORMS_EXCLUDE = sky nrf52dk native simplelink -BOARDS_EXCLUDE = srf06/cc13xx launchpad/cc1310 launchpad/cc1350 sensortag/cc2650 sensortag/cc1350 +BOARDS_EXCLUDE = srf06/cc13x0 launchpad/cc1310 launchpad/cc1350 sensortag/cc2650 sensortag/cc1350 MODULES_REL += ../testbeds MODULES += os/services/deployment diff --git a/examples/platform-specific/cc26x0-cc13x0/ble-ipv6/Makefile b/examples/platform-specific/cc26x0-cc13x0/ble-ipv6/Makefile index 027c851e9..052927896 100644 --- a/examples/platform-specific/cc26x0-cc13x0/ble-ipv6/Makefile +++ b/examples/platform-specific/cc26x0-cc13x0/ble-ipv6/Makefile @@ -3,7 +3,7 @@ CONTIKI_PROJECT=client all: $(CONTIKI_PROJECT) PLATFORMS_ONLY = cc26x0-cc13x0 -BOARDS_ONLY = launchpad/cc2650 sensortag/cc2650 srf06/cc26xx +BOARDS_ONLY = launchpad/cc2650 sensortag/cc2650 srf06/cc26x0 MAKE_MAC = MAKE_MAC_BLE MAKE_NET = MAKE_NET_IPV6 diff --git a/examples/platform-specific/cc26x0-cc13x0/cc26xx-demo.c b/examples/platform-specific/cc26x0-cc13x0/cc26x0-demo.c similarity index 100% rename from examples/platform-specific/cc26x0-cc13x0/cc26xx-demo.c rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-demo.c diff --git a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/Makefile b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/Makefile similarity index 93% rename from examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/Makefile rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/Makefile index 74246220c..6d70a3a24 100644 --- a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/Makefile +++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/Makefile @@ -1,4 +1,4 @@ -CONTIKI_PROJECT = cc26xx-web-demo +CONTIKI_PROJECT = cc26x0-web-demo all: $(CONTIKI_PROJECT) PLATFORMS_ONLY = cc26x0-cc13x0 diff --git a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/Makefile.target b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/Makefile.target similarity index 100% rename from examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/Makefile.target rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/Makefile.target diff --git a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/README.md b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/README.md similarity index 99% rename from examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/README.md rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/README.md index 912fcb72a..6a85ee0b5 100644 --- a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/README.md +++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/README.md @@ -180,6 +180,6 @@ parser into the firmware. IBM Watson IoT Platform ---------------------------- -To use IBM Watson IoT Platform, you have to go to SECURITY tab of Device page to select "TLS Optional". This step is critical. If you don't do this, you need to use TLS for connection and default cc26xx-web-demo won't work. +To use IBM Watson IoT Platform, you have to go to SECURITY tab of Device page to select "TLS Optional". This step is critical. If you don't do this, you need to use TLS for connection and default cc26x0-web-demo won't work. ![IBM Watson IoT Platform TLS Optional Configuration](img/ibm-watson-iot-platform-tls-optional.png) diff --git a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/cc26xx-web-demo.c b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/cc26x0-web-demo.c similarity index 99% rename from examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/cc26xx-web-demo.c rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/cc26x0-web-demo.c index 3944a58b2..6333d5ad5 100644 --- a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/cc26xx-web-demo.c +++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/cc26x0-web-demo.c @@ -28,7 +28,7 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ /** - * \addtogroup cc26xx-web-demo + * \addtogroup cc26x0-web-demo * @{ * * \file @@ -48,7 +48,7 @@ #include "dev/button-hal.h" #include "batmon-sensor.h" #include "httpd-simple.h" -#include "cc26xx-web-demo.h" +#include "cc26x0-web-demo.h" #include "mqtt-client.h" #include "coap-server.h" diff --git a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/cc26xx-web-demo.h b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/cc26x0-web-demo.h similarity index 99% rename from examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/cc26xx-web-demo.h rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/cc26x0-web-demo.h index f59e41bc7..e7252496c 100644 --- a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/cc26xx-web-demo.h +++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/cc26x0-web-demo.h @@ -31,7 +31,7 @@ * \addtogroup cc26xx-examples * @{ * - * \defgroup cc26xx-web-demo CC26xx Web Demo + * \defgroup cc26x0-web-demo CC26xx Web Demo * @{ * * An example demonstrating: diff --git a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/cetic-6lbr-client.c b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/cetic-6lbr-client.c similarity index 99% rename from examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/cetic-6lbr-client.c rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/cetic-6lbr-client.c index 569a36a89..fc8044380 100644 --- a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/cetic-6lbr-client.c +++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/cetic-6lbr-client.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. */ /** - * \addtogroup cc26xx-web-demo + * \addtogroup cc26x0-web-demo * @{ * * \file diff --git a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/coap-server.c b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/coap-server.c similarity index 99% rename from examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/coap-server.c rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/coap-server.c index 37b9a295d..bda7eb8ff 100644 --- a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/coap-server.c +++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/coap-server.c @@ -28,7 +28,7 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ /** - * \addtogroup cc26xx-web-demo + * \addtogroup cc26x0-web-demo * @{ * * \file @@ -40,7 +40,7 @@ #include "coap-engine.h" #include "board-peripherals.h" #include "rf-core/rf-ble.h" -#include "cc26xx-web-demo.h" +#include "cc26x0-web-demo.h" #include #include diff --git a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/coap-server.h b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/coap-server.h similarity index 98% rename from examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/coap-server.h rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/coap-server.h index 7399597c8..0d8c1d40b 100644 --- a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/coap-server.h +++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/coap-server.h @@ -28,7 +28,7 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ /** - * \addtogroup cc26xx-web-demo + * \addtogroup cc26x0-web-demo * @{ * * \file diff --git a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/httpd-simple.c b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/httpd-simple.c similarity index 99% rename from examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/httpd-simple.c rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/httpd-simple.c index e23e78efe..287452bb3 100644 --- a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/httpd-simple.c +++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/httpd-simple.c @@ -29,7 +29,7 @@ * */ /** - * \addtogroup cc26xx-web-demo + * \addtogroup cc26x0-web-demo * @{ * * \file @@ -42,7 +42,7 @@ #include "batmon-sensor.h" #include "lib/sensors.h" #include "lib/list.h" -#include "cc26xx-web-demo.h" +#include "cc26x0-web-demo.h" #include "mqtt-client.h" #include "net-uart.h" diff --git a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/httpd-simple.h b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/httpd-simple.h similarity index 99% rename from examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/httpd-simple.h rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/httpd-simple.h index 25b8db3e5..2b04b264c 100644 --- a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/httpd-simple.h +++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/httpd-simple.h @@ -44,7 +44,7 @@ /*---------------------------------------------------------------------------*/ #include "contiki-net.h" #include "sys/process.h" -#include "cc26xx-web-demo.h" +#include "cc26x0-web-demo.h" /*---------------------------------------------------------------------------*/ /* Ideally a multiple of TCP_MSS */ #ifdef HTTPD_SIMPLE_CONF_MAIN_BUF_SIZE diff --git a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/img/6lbr-web.png b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/img/6lbr-web.png similarity index 100% rename from examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/img/6lbr-web.png rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/img/6lbr-web.png diff --git a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/img/ibm-watson-iot-platform-tls-optional.png b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/img/ibm-watson-iot-platform-tls-optional.png similarity index 100% rename from examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/img/ibm-watson-iot-platform-tls-optional.png rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/img/ibm-watson-iot-platform-tls-optional.png diff --git a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/img/quickstart-sensortag.png b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/img/quickstart-sensortag.png similarity index 100% rename from examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/img/quickstart-sensortag.png rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/img/quickstart-sensortag.png diff --git a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/img/sensor-readings-config.png b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/img/sensor-readings-config.png similarity index 100% rename from examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/img/sensor-readings-config.png rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/img/sensor-readings-config.png diff --git a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/img/well-known-core.png b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/img/well-known-core.png similarity index 100% rename from examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/img/well-known-core.png rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/img/well-known-core.png diff --git a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/mqtt-client.c b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/mqtt-client.c similarity index 99% rename from examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/mqtt-client.c rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/mqtt-client.c index 7562fb89a..0250de322 100644 --- a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/mqtt-client.c +++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/mqtt-client.c @@ -28,7 +28,7 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ /** - * \addtogroup cc26xx-web-demo + * \addtogroup cc26x0-web-demo * @{ * * \file @@ -45,7 +45,7 @@ #include "lib/sensors.h" #include "dev/button-hal.h" #include "board-peripherals.h" -#include "cc26xx-web-demo.h" +#include "cc26x0-web-demo.h" #include "dev/leds.h" #include "mqtt-client.h" #include "httpd-simple.h" diff --git a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/mqtt-client.h b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/mqtt-client.h similarity index 99% rename from examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/mqtt-client.h rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/mqtt-client.h index ab7c08227..68b26af6d 100644 --- a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/mqtt-client.h +++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/mqtt-client.h @@ -28,7 +28,7 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ /** - * \addtogroup cc26xx-web-demo + * \addtogroup cc26x0-web-demo * @{ * * \file diff --git a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/net-uart.c b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/net-uart.c similarity index 99% rename from examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/net-uart.c rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/net-uart.c index ca3bf8c82..a2ea899da 100644 --- a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/net-uart.c +++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/net-uart.c @@ -28,7 +28,7 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ /** - * \addtogroup cc26xx-web-demo + * \addtogroup cc26x0-web-demo * @{ * * \file diff --git a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/net-uart.h b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/net-uart.h similarity index 100% rename from examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/net-uart.h rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/net-uart.h diff --git a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/project-conf.h b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/project-conf.h similarity index 100% rename from examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/project-conf.h rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/project-conf.h diff --git a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/resources/res-ble-advd.c b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-ble-advd.c similarity index 99% rename from examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/resources/res-ble-advd.c rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-ble-advd.c index a94a0b7a0..b32cb82ec 100644 --- a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/resources/res-ble-advd.c +++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-ble-advd.c @@ -28,7 +28,7 @@ */ /*---------------------------------------------------------------------------*/ /** - * \addtogroup cc26xx-web-demo + * \addtogroup cc26x0-web-demo * @{ * * \file diff --git a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/resources/res-device.c b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-device.c similarity index 99% rename from examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/resources/res-device.c rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-device.c index 46344d1ef..bc61b8510 100644 --- a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/resources/res-device.c +++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-device.c @@ -29,7 +29,7 @@ */ /*---------------------------------------------------------------------------*/ /** - * \addtogroup cc26xx-web-demo + * \addtogroup cc26x0-web-demo * @{ * * \file @@ -41,7 +41,7 @@ #include "coap.h" #include "sys/clock.h" #include "coap-server.h" -#include "cc26xx-web-demo.h" +#include "cc26x0-web-demo.h" #include "ti-lib.h" diff --git a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/resources/res-leds.c b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-leds.c similarity index 99% rename from examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/resources/res-leds.c rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-leds.c index 6c396145c..538ecc0bd 100644 --- a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/resources/res-leds.c +++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-leds.c @@ -29,7 +29,7 @@ */ /*---------------------------------------------------------------------------*/ /** - * \addtogroup cc26xx-web-demo + * \addtogroup cc26x0-web-demo * @{ * * \file diff --git a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/resources/res-net.c b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-net.c similarity index 98% rename from examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/resources/res-net.c rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-net.c index 81575f345..43a4da354 100644 --- a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/resources/res-net.c +++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-net.c @@ -29,7 +29,7 @@ */ /*---------------------------------------------------------------------------*/ /** - * \addtogroup cc26xx-web-demo + * \addtogroup cc26x0-web-demo * @{ * * \file @@ -41,7 +41,7 @@ #include "coap.h" #include "net/ipv6/uip-ds6.h" #include "coap-server.h" -#include "cc26xx-web-demo.h" +#include "cc26x0-web-demo.h" #include "ti-lib.h" diff --git a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/resources/res-sensors.c b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-sensors.c similarity index 99% rename from examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/resources/res-sensors.c rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-sensors.c index 9ccc79e97..1852f7cb6 100644 --- a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/resources/res-sensors.c +++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-sensors.c @@ -29,7 +29,7 @@ */ /*---------------------------------------------------------------------------*/ /** - * \addtogroup cc26xx-web-demo + * \addtogroup cc26x0-web-demo * @{ * * \file @@ -39,7 +39,7 @@ #include "contiki.h" #include "coap-engine.h" #include "coap.h" -#include "cc26xx-web-demo.h" +#include "cc26x0-web-demo.h" #include "coap-server.h" #include diff --git a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/resources/res-toggle-leds.c b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-toggle-leds.c similarity index 99% rename from examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/resources/res-toggle-leds.c rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-toggle-leds.c index 1c708b539..00e632cef 100644 --- a/examples/platform-specific/cc26x0-cc13x0/cc26xx-web-demo/resources/res-toggle-leds.c +++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-toggle-leds.c @@ -31,7 +31,7 @@ */ /*---------------------------------------------------------------------------*/ /** - * \addtogroup cc26xx-web-demo + * \addtogroup cc26x0-web-demo * @{ * * \file diff --git a/tests/02-compile-arm-ports-01/Makefile b/tests/02-compile-arm-ports-01/Makefile index e5b403882..43e008c8e 100644 --- a/tests/02-compile-arm-ports-01/Makefile +++ b/tests/02-compile-arm-ports-01/Makefile @@ -2,31 +2,31 @@ EXAMPLESDIR=../../examples TOOLSDIR=../../tools EXAMPLES = \ -platform-specific/cc26x0-cc13x0/cc26xx-web-demo/cc26x0-cc13x0 \ -platform-specific/cc26x0-cc13x0/cc26xx-web-demo/cc26x0-cc13x0:MAKE_ROUTING=MAKE_ROUTING_RPL_CLASSIC \ +platform-specific/cc26x0-cc13x0/cc26x0-web-demo/cc26x0-cc13x0 \ +platform-specific/cc26x0-cc13x0/cc26x0-web-demo/cc26x0-cc13x0:MAKE_ROUTING=MAKE_ROUTING_RPL_CLASSIC \ platform-specific/cc26x0-cc13x0/very-sleepy-demo/cc26x0-cc13x0:BOARD=sensortag/cc2650 \ -platform-specific/cc26x0-cc13x0/cc26xx-web-demo/cc26x0-cc13x0:BOARD=sensortag/cc2650 \ -platform-specific/cc26x0-cc13x0/cc26xx-web-demo/cc26x0-cc13x0:BOARD=sensortag/cc1350 \ -platform-specific/cc26x0-cc13x0/cc26xx-web-demo/cc26x0-cc13x0:BOARD=srf06/cc13xx \ -platform-specific/cc26x0-cc13x0/cc26xx-web-demo/cc26x0-cc13x0:BOARD=launchpad/cc2650 \ -platform-specific/cc26x0-cc13x0/cc26xx-web-demo/cc26x0-cc13x0:BOARD=launchpad/cc1310 \ -platform-specific/cc26x0-cc13x0/cc26xx-web-demo/cc26x0-cc13x0:BOARD=launchpad/cc1350 \ +platform-specific/cc26x0-cc13x0/cc26x0-web-demo/cc26x0-cc13x0:BOARD=sensortag/cc2650 \ +platform-specific/cc26x0-cc13x0/cc26x0-web-demo/cc26x0-cc13x0:BOARD=sensortag/cc1350 \ +platform-specific/cc26x0-cc13x0/cc26x0-web-demo/cc26x0-cc13x0:BOARD=srf06/cc13x0 \ +platform-specific/cc26x0-cc13x0/cc26x0-web-demo/cc26x0-cc13x0:BOARD=launchpad/cc2650 \ +platform-specific/cc26x0-cc13x0/cc26x0-web-demo/cc26x0-cc13x0:BOARD=launchpad/cc1310 \ +platform-specific/cc26x0-cc13x0/cc26x0-web-demo/cc26x0-cc13x0:BOARD=launchpad/cc1350 \ platform-specific/cc26x0-cc13x0/very-sleepy-demo/cc26x0-cc13x0 \ platform-specific/cc26x0-cc13x0/ble-ipv6/cc26x0-cc13x0:BOARD=sensortag/cc2650 \ nullnet/cc26x0-cc13x0:BOARD=sensortag/cc2650 \ rpl-border-router/cc26x0-cc13x0:BOARD=launchpad/cc2650 \ sensniff/cc26x0-cc13x0 \ sensniff/cc26x0-cc13x0:BOARD=launchpad/cc1310 \ -dev/gpio-hal/cc26x0-cc13x0:BOARD=srf06/cc13xx \ -dev/gpio-hal/cc26x0-cc13x0:BOARD=srf06/cc26xx \ +dev/gpio-hal/cc26x0-cc13x0:BOARD=srf06/cc13x0 \ +dev/gpio-hal/cc26x0-cc13x0:BOARD=srf06/cc26x0 \ dev/gpio-hal/cc26x0-cc13x0:BOARD=sensortag/cc1350 \ dev/gpio-hal/cc26x0-cc13x0:BOARD=sensortag/cc2650 \ dev/gpio-hal/cc26x0-cc13x0:BOARD=launchpad/cc1310 \ dev/gpio-hal/cc26x0-cc13x0:BOARD=launchpad/cc1350 \ dev/gpio-hal/cc26x0-cc13x0:BOARD=launchpad/cc2650 \ dev/gpio-hal/cc26x0-cc13x0:BOARD=launchpad/cc2640r2 \ -dev/leds/cc26x0-cc13x0:BOARD=srf06/cc13xx \ -dev/leds/cc26x0-cc13x0:BOARD=srf06/cc26xx \ +dev/leds/cc26x0-cc13x0:BOARD=srf06/cc13x0 \ +dev/leds/cc26x0-cc13x0:BOARD=srf06/cc26x0 \ dev/leds/cc26x0-cc13x0:BOARD=sensortag/cc1350 \ dev/leds/cc26x0-cc13x0:BOARD=sensortag/cc2650 \ dev/leds/cc26x0-cc13x0:BOARD=launchpad/cc1310 \ @@ -34,7 +34,7 @@ dev/leds/cc26x0-cc13x0:BOARD=launchpad/cc1350 \ dev/leds/cc26x0-cc13x0:BOARD=launchpad/cc2650 \ dev/leds/cc26x0-cc13x0:BOARD=launchpad/cc2640r2 \ 6tisch/etsi-plugtest-2017/cc26x0-cc13x0:BOARD=launchpad/cc2650 \ -mqtt-client/cc26x0-cc13x0:BOARD=srf06/cc26xx \ +mqtt-client/cc26x0-cc13x0:BOARD=srf06/cc26x0 \ mqtt-client/cc26x0-cc13x0:BOARD=launchpad/cc2650 \ mqtt-client/cc26x0-cc13x0:BOARD=sensortag/cc2650 \ hello-world/simplelink:BOARD=launchpad/cc26x2r1 \