deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Extend the CC26xx demo to support the LaunchPad

Browse source
This commit is contained in:
George Oikonomou 2016-01-24 16:54:20 +00:00
parent 387bb96ca4
commit 54f0a2ecbd
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
examples/cc26xx/cc26xx-demo.c
View file

@ -44,6 +44,7 @@
* This example will work for the following boards: * This example will work for the following boards:
* - srf06-cc26xx: SmartRF06EB + CC26XX EM * - srf06-cc26xx: SmartRF06EB + CC26XX EM
* - sensortag-cc26xx: CC26XX sensortag * - sensortag-cc26xx: CC26XX sensortag
* - The CC2650 LaunchPad
* *
* By default, the example will build for the srf06-cc26xx board. To switch * By default, the example will build for the srf06-cc26xx board. To switch
* between platforms: * between platforms:
@ -114,6 +115,10 @@
#define CC26XX_DEMO_SENSOR_3 CC26XX_DEMO_SENSOR_NONE #define CC26XX_DEMO_SENSOR_3 CC26XX_DEMO_SENSOR_NONE
#define CC26XX_DEMO_SENSOR_4 CC26XX_DEMO_SENSOR_NONE #define CC26XX_DEMO_SENSOR_4 CC26XX_DEMO_SENSOR_NONE
#define CC26XX_DEMO_SENSOR_5 &reed_relay_sensor #define CC26XX_DEMO_SENSOR_5 &reed_relay_sensor
#elif BOARD_LAUNCHPAD
#define CC26XX_DEMO_SENSOR_3 CC26XX_DEMO_SENSOR_NONE
#define CC26XX_DEMO_SENSOR_4 CC26XX_DEMO_SENSOR_NONE
#define CC26XX_DEMO_SENSOR_5 CC26XX_DEMO_SENSOR_NONE
#else #else
#define CC26XX_DEMO_SENSOR_3 &button_up_sensor #define CC26XX_DEMO_SENSOR_3 &button_up_sensor
#define CC26XX_DEMO_SENSOR_4 &button_down_sensor #define CC26XX_DEMO_SENSOR_4 &button_down_sensor
@ -423,7 +428,7 @@ PROCESS_THREAD(cc26xx_demo_process, ev, data)
get_tmp_reading(); get_tmp_reading();
} else if(ev == sensors_event && data == &mpu_9250_sensor) { } else if(ev == sensors_event && data == &mpu_9250_sensor) {
get_mpu_reading(); get_mpu_reading();
#else #elif BOARD_SMARTRF06EB
printf("Sel: Pin %d, press duration %d clock ticks\n", printf("Sel: Pin %d, press duration %d clock ticks\n",
button_select_sensor.value(BUTTON_SENSOR_VALUE_STATE), button_select_sensor.value(BUTTON_SENSOR_VALUE_STATE),
button_select_sensor.value(BUTTON_SENSOR_VALUE_DURATION)); button_select_sensor.value(BUTTON_SENSOR_VALUE_DURATION));