Rename srf06/{cc26xx,cc13xx} to srf06/{cc26x0,cc13x0}

This commit is contained in:
Yasuyuki Tanaka 2018-10-12 16:37:55 +02:00
parent 61fba4dcde
commit 7a6cbff5f6
37 changed files with 46 additions and 46 deletions

View File

@ -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 += .

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -1,4 +1,4 @@
CONTIKI_PROJECT = cc26xx-web-demo
CONTIKI_PROJECT = cc26x0-web-demo
all: $(CONTIKI_PROJECT)
PLATFORMS_ONLY = cc26x0-cc13x0

View File

@ -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)

View File

@ -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"

View File

@ -31,7 +31,7 @@
* \addtogroup cc26xx-examples
* @{
*
* \defgroup cc26xx-web-demo CC26xx Web Demo
* \defgroup cc26x0-web-demo CC26xx Web Demo
* @{
*
* An example demonstrating:

View File

@ -24,7 +24,7 @@
* SUCH DAMAGE.
*/
/**
* \addtogroup cc26xx-web-demo
* \addtogroup cc26x0-web-demo
* @{
*
* \file

View File

@ -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 <stdio.h>
#include <stdlib.h>

View File

@ -28,7 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/**
* \addtogroup cc26xx-web-demo
* \addtogroup cc26x0-web-demo
* @{
*
* \file

View File

@ -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"

View File

@ -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

View File

@ -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"

View File

@ -28,7 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/**
* \addtogroup cc26xx-web-demo
* \addtogroup cc26x0-web-demo
* @{
*
* \file

View File

@ -28,7 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/**
* \addtogroup cc26xx-web-demo
* \addtogroup cc26x0-web-demo
* @{
*
* \file

View File

@ -28,7 +28,7 @@
*/
/*---------------------------------------------------------------------------*/
/**
* \addtogroup cc26xx-web-demo
* \addtogroup cc26x0-web-demo
* @{
*
* \file

View File

@ -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"

View File

@ -29,7 +29,7 @@
*/
/*---------------------------------------------------------------------------*/
/**
* \addtogroup cc26xx-web-demo
* \addtogroup cc26x0-web-demo
* @{
*
* \file

View File

@ -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"

View File

@ -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 <stdio.h>

View File

@ -31,7 +31,7 @@
*/
/*---------------------------------------------------------------------------*/
/**
* \addtogroup cc26xx-web-demo
* \addtogroup cc26x0-web-demo
* @{
*
* \file

View File

@ -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 \