From edebc1dd2c825323bb2522d849ed1e0b667162e0 Mon Sep 17 00:00:00 2001 From: George Oikonomou Date: Sun, 6 Nov 2016 17:18:30 +0000 Subject: [PATCH] Add documentation for the new boards --- examples/cc26xx/cc26xx-demo.c | 17 ++++------------- examples/cc26xx/very-sleepy-demo/README.md | 2 +- platform/srf06-cc26xx/README.md | 6 +++++- platform/srf06-cc26xx/contiki-main.c | 6 ++++-- 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/examples/cc26xx/cc26xx-demo.c b/examples/cc26xx/cc26xx-demo.c index 50d2190d3..f5045a5bd 100644 --- a/examples/cc26xx/cc26xx-demo.c +++ b/examples/cc26xx/cc26xx-demo.c @@ -39,21 +39,12 @@ * * \defgroup cc26xx-demo CC26xx Demo Project * - * Example project demonstrating the CC26xx platforms + * Example project demonstrating the CC13xx/CC26xx platforms * * This example will work for the following boards: - * - srf06-cc26xx: SmartRF06EB + CC26XX EM - * - sensortag-cc26xx: CC26XX sensortag - * - The CC2650 LaunchPad - * - * By default, the example will build for the srf06-cc26xx board. To switch - * between platforms: - * - make clean - * - make BOARD=sensortag-cc26xx savetarget - * - * or - * - * make BOARD=srf06-cc26xx savetarget + * - srf06-cc26xx: SmartRF06EB + CC13xx/CC26xx EM + * - CC2650 and CC1350 SensorTag + * - CC1310, CC1350, CC2650 LaunchPads * * This is an IPv6/RPL-enabled example. Thus, if you have a border router in * your installation (same RDC layer, same PAN ID and RF channel), you should diff --git a/examples/cc26xx/very-sleepy-demo/README.md b/examples/cc26xx/very-sleepy-demo/README.md index fcdedf77f..851150432 100644 --- a/examples/cc26xx/very-sleepy-demo/README.md +++ b/examples/cc26xx/very-sleepy-demo/README.md @@ -23,7 +23,7 @@ as per the instructions below. When the node is duty-cycling the radio, either because it is in normal mode or because network maintenance is taking place, it will keep its green LED on thus -providing an indication that it is reachable. +providing an indication that it is reachable (red LED for the CC1350 tag). A normal mode stint can be manually triggered by pressing the left button. diff --git a/platform/srf06-cc26xx/README.md b/platform/srf06-cc26xx/README.md index b95f3e9cd..ae8645426 100644 --- a/platform/srf06-cc26xx/README.md +++ b/platform/srf06-cc26xx/README.md @@ -2,13 +2,15 @@ Getting Started with Contiki for TI CC26xx ========================================== This guide's aim is to help you start using Contiki for TI's CC26xx. The -platform supports two different boards: +platform supports multiple boards: * SmartRF 06 Evaluation Board with a CC26xx or CC13xx Evaluation Module (relevant files and drivers are under `srf06/`) * CC2650 SensorTag 2.0 (relevant drivers under `sensortag/cc2650`) +* CC1350 SensorTag 2.0 (relevant drivers under `sensortag/cc1350`) * CC2650 LaunchPad (relevant drivers under `launchpad/cc2650`) * CC1310 LaunchPad (relevant drivers under `launchpad/cc1310`) +* CC1350 LaunchPad (relevant drivers under `launchpad/cc1350`) The CPU code, common for both platforms, can be found under `$(CONTIKI)/cpu/cc26xx-cc13xx`. The port was developed and tested with CC2650s, but the intention is for it to @@ -100,8 +102,10 @@ Other options for the `BOARD` make variable are: * Srf06+CC26xxEM: Set `BOARD=srf06/cc26xx` * Srf06+CC13xxEM: Set `BOARD=srf06/cc13xx` * CC2650 tag: Set `BOARD=sensortag/cc2650` +* CC1350 tag: Set `BOARD=sensortag/cc1350` * CC2650 Launchpad: Set `BOARD=launchpad/cc2650` * CC1310 Launchpad: Set `BOARD=launchpad/cc1310` +* CC1350 Launchpad: Set `BOARD=launchpad/cc1350` If the `BOARD` variable is unspecified, an image for the Srf06 CC26XXEM will be built. diff --git a/platform/srf06-cc26xx/contiki-main.c b/platform/srf06-cc26xx/contiki-main.c index 0aa1c4526..78b10d0df 100644 --- a/platform/srf06-cc26xx/contiki-main.c +++ b/platform/srf06-cc26xx/contiki-main.c @@ -32,14 +32,16 @@ * \addtogroup cc26xx-platforms * @{ * - * \defgroup cc26xx-srf-tag SmartRF+CC13xx/CC26xx EM, CC2650 SensorTag and LaunchPads + * \defgroup cc26xx-srf-tag SmartRF+CC13xx/CC26xx EM, SensorTags and LaunchPads * * This platform supports a number of different boards: * - A standard TI SmartRF06EB with a CC26xx EM mounted on it * - A standard TI SmartRF06EB with a CC1310 EM mounted on it - * - The new TI SensorTag2.0 + * - The TI CC2650 SensorTag + * - The TI CC1350 SensorTag * - The TI CC2650 LaunchPad * - The TI CC1310 LaunchPad + * - The TI CC1350 LaunchPad * @{ */ #include "ti-lib.h"