diff --git a/examples/cc26xx/cc26xx-web-demo/cc26xx-web-demo.c b/examples/cc26xx/cc26xx-web-demo/cc26xx-web-demo.c index 1eaf35648..a363c31d5 100644 --- a/examples/cc26xx/cc26xx-web-demo/cc26xx-web-demo.c +++ b/examples/cc26xx/cc26xx-web-demo/cc26xx-web-demo.c @@ -175,7 +175,7 @@ static void save_config() { /* Dump current running config to flash */ -#if BOARD_SENSORTAG +#if BOARD_SENSORTAG || BOARD_LAUNCHPAD int rv; cc26xx_web_demo_sensor_reading_t *reading = NULL; @@ -218,7 +218,7 @@ save_config() static void load_config() { -#if BOARD_SENSORTAG +#if BOARD_SENSORTAG || BOARD_LAUNCHPAD /* Read from flash into a temp buffer */ cc26xx_web_demo_config_t tmp_cfg; cc26xx_web_demo_sensor_reading_t *reading = NULL; diff --git a/examples/cc26xx/cc26xx-web-demo/cc26xx-web-demo.h b/examples/cc26xx/cc26xx-web-demo/cc26xx-web-demo.h index 026461f32..14bf3150c 100644 --- a/examples/cc26xx/cc26xx-web-demo/cc26xx-web-demo.h +++ b/examples/cc26xx/cc26xx-web-demo/cc26xx-web-demo.h @@ -100,6 +100,8 @@ #if BOARD_SENSORTAG /* Force an MQTT publish on sensor event */ #define CC26XX_WEB_DEMO_MQTT_PUBLISH_TRIGGER &reed_relay_sensor +#elif BOARD_LAUNCHPAD +#define CC26XX_WEB_DEMO_MQTT_PUBLISH_TRIGGER &button_left_sensor #else #define CC26XX_WEB_DEMO_MQTT_PUBLISH_TRIGGER &button_down_sensor #endif diff --git a/examples/cc26xx/cc26xx-web-demo/coap-server.c b/examples/cc26xx/cc26xx-web-demo/coap-server.c index 9b4155d00..518065f6e 100644 --- a/examples/cc26xx/cc26xx-web-demo/coap-server.c +++ b/examples/cc26xx/cc26xx-web-demo/coap-server.c @@ -63,6 +63,9 @@ extern resource_t res_parent_ip; extern resource_t res_ble_advd; #endif +extern resource_t res_toggle_red; +extern resource_t res_toggle_green; + /* Board-specific resources */ #if BOARD_SENSORTAG extern resource_t res_bmp280_temp; @@ -78,11 +81,7 @@ extern resource_t res_mpu_acc_z; extern resource_t res_mpu_gyro_x; extern resource_t res_mpu_gyro_y; extern resource_t res_mpu_gyro_z; -extern resource_t res_toggle_red; -extern resource_t res_toggle_green; #else -extern resource_t res_toggle_red; -extern resource_t res_toggle_green; extern resource_t res_toggle_orange; extern resource_t res_toggle_yellow; #endif @@ -96,6 +95,11 @@ const char *coap_server_supported_msg = "Supported:" static void start_board_resources(void) { + + rest_activate_resource(&res_toggle_green, "lt/g"); + rest_activate_resource(&res_toggle_red, "lt/r"); + rest_activate_resource(&res_leds, "lt"); + #if BOARD_SENSORTAG rest_activate_resource(&res_bmp280_temp, "sen/bar/temp"); rest_activate_resource(&res_bmp280_press, "sen/bar/pres"); @@ -110,14 +114,8 @@ start_board_resources(void) rest_activate_resource(&res_mpu_gyro_x, "sen/mpu/gyro/x"); rest_activate_resource(&res_mpu_gyro_y, "sen/mpu/gyro/y"); rest_activate_resource(&res_mpu_gyro_z, "sen/mpu/gyro/z"); - rest_activate_resource(&res_leds, "lt"); - rest_activate_resource(&res_toggle_green, "lt/g"); - rest_activate_resource(&res_toggle_red, "lt/r"); #elif BOARD_SMARTRF06EB - rest_activate_resource(&res_leds, "lt"); - rest_activate_resource(&res_toggle_red, "lt/r"); rest_activate_resource(&res_toggle_yellow, "lt/y"); - rest_activate_resource(&res_toggle_green, "lt/g"); rest_activate_resource(&res_toggle_orange, "lt/o"); #endif } diff --git a/examples/cc26xx/cc26xx-web-demo/resources/res-leds.c b/examples/cc26xx/cc26xx-web-demo/resources/res-leds.c index 2a86ad25b..85ce353b5 100644 --- a/examples/cc26xx/cc26xx-web-demo/resources/res-leds.c +++ b/examples/cc26xx/cc26xx-web-demo/resources/res-leds.c @@ -94,7 +94,7 @@ res_post_put_handler(void *request, void *response, uint8_t *buffer, * A simple actuator example, depending on the color query parameter and post * variable mode, corresponding led is activated or deactivated */ -#if BOARD_SENSORTAG +#if BOARD_SENSORTAG || BOARD_LAUNCHPAD #define RESOURCE_PARAMS "r|g" #elif BOARD_SMARTRF06EB #define RESOURCE_PARAMS "r|g|y|o"