From 537f9a5baf4077d9e764d5436792df5e4424e7be Mon Sep 17 00:00:00 2001 From: Edvard Pettersen Date: Thu, 26 Jul 2018 16:39:37 +0200 Subject: [PATCH] Minor fixes --- arch/cpu/cc13xx-cc26xx/cc13x0-cc26x0/cc13x0-cc26x0.lds | 4 ---- arch/cpu/cc13xx-cc26xx/cc13x2-cc26x2/cc13x2-cc26x2.lds | 4 ---- .../simplelink/cc13xx-cc26xx/sensortag/mpu-9250-sensor.c | 2 +- .../cc26xx/cc26xx-web-demo/cc26xx-web-demo.h | 8 ++++---- .../simplelink/cc13xx-cc26xx/web-demo/web-demo.c | 8 ++++---- 5 files changed, 9 insertions(+), 17 deletions(-) diff --git a/arch/cpu/cc13xx-cc26xx/cc13x0-cc26x0/cc13x0-cc26x0.lds b/arch/cpu/cc13xx-cc26xx/cc13x0-cc26x0/cc13x0-cc26x0.lds index 4d71d6b45..83e834f13 100644 --- a/arch/cpu/cc13xx-cc26xx/cc13x0-cc26x0/cc13x0-cc26x0.lds +++ b/arch/cpu/cc13xx-cc26xx/cc13x0-cc26x0/cc13x0-cc26x0.lds @@ -29,10 +29,6 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* - * ======== CC1310_LAUNCHXL_NoRTOS.lds ======== - * Default Linker script for the Texas Instruments CC1310 - */ MIN_STACKSIZE = 0x800; /* 2048 bytes */ HEAPSIZE = 0x100; /* 256 bytes */ diff --git a/arch/cpu/cc13xx-cc26xx/cc13x2-cc26x2/cc13x2-cc26x2.lds b/arch/cpu/cc13xx-cc26xx/cc13x2-cc26x2/cc13x2-cc26x2.lds index d8699f651..2c663d6b2 100644 --- a/arch/cpu/cc13xx-cc26xx/cc13x2-cc26x2/cc13x2-cc26x2.lds +++ b/arch/cpu/cc13xx-cc26xx/cc13x2-cc26x2/cc13x2-cc26x2.lds @@ -29,10 +29,6 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* - * ======== CC26X2R1_LAUNCHXL_NoRTOS.lds ======== - * Default Linker script for the Texas Instruments CC1352 - */ MIN_STACKSIZE = 0x800; /* 2048 bytes */ HEAPSIZE = 0x100; /* 256 bytes */ diff --git a/arch/platform/simplelink/cc13xx-cc26xx/sensortag/mpu-9250-sensor.c b/arch/platform/simplelink/cc13xx-cc26xx/sensortag/mpu-9250-sensor.c index 825a4043c..8842d4177 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/sensortag/mpu-9250-sensor.c +++ b/arch/platform/simplelink/cc13xx-cc26xx/sensortag/mpu-9250-sensor.c @@ -47,7 +47,7 @@ #include #include -#include DeviceFamily_constructPath(driverlib / cpu.h) +#include DeviceFamily_constructPath(driverlib/cpu.h) #include #include diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/cc26xx-web-demo.h b/examples/platform-specific/cc26xx/cc26xx-web-demo/cc26xx-web-demo.h index 0761725c7..1840c31b1 100644 --- a/examples/platform-specific/cc26xx/cc26xx-web-demo/cc26xx-web-demo.h +++ b/examples/platform-specific/cc26xx/cc26xx-web-demo/cc26xx-web-demo.h @@ -98,18 +98,18 @@ /*---------------------------------------------------------------------------*/ /* User configuration */ /* Take a sensor reading on button press */ -#define CC26XX_WEB_DEMO_SENSOR_READING_TRIGGER BOARD_BUTTON_HAL_INDEX_KEY_LEFT +#define CC26XX_WEB_DEMO_SENSOR_READING_TRIGGER BUTTON_HAL_ID_KEY_LEFT /* Payload length of ICMPv6 echo requests used to measure RSSI with def rt */ #define CC26XX_WEB_DEMO_ECHO_REQ_PAYLOAD_LEN 20 #if BOARD_SENSORTAG /* Force an MQTT publish on sensor event */ -#define CC26XX_WEB_DEMO_MQTT_PUBLISH_TRIGGER BOARD_BUTTON_HAL_INDEX_REED_RELAY +#define CC26XX_WEB_DEMO_MQTT_PUBLISH_TRIGGER BUTTON_HAL_ID_REED_RELAY #elif BOARD_LAUNCHPAD -#define CC26XX_WEB_DEMO_MQTT_PUBLISH_TRIGGER BOARD_BUTTON_HAL_INDEX_KEY_LEFT +#define CC26XX_WEB_DEMO_MQTT_PUBLISH_TRIGGER BUTTON_HAL_ID_KEY_LEFT #else -#define CC26XX_WEB_DEMO_MQTT_PUBLISH_TRIGGER BOARD_BUTTON_HAL_INDEX_KEY_DOWN +#define CC26XX_WEB_DEMO_MQTT_PUBLISH_TRIGGER BUTTON_HAL_ID_KEY_DOWN #endif #define CC26XX_WEB_DEMO_STATUS_LED LEDS_GREEN diff --git a/examples/platform-specific/simplelink/cc13xx-cc26xx/web-demo/web-demo.c b/examples/platform-specific/simplelink/cc13xx-cc26xx/web-demo/web-demo.c index 54ae61066..8e729576d 100644 --- a/examples/platform-specific/simplelink/cc13xx-cc26xx/web-demo/web-demo.c +++ b/examples/platform-specific/simplelink/cc13xx-cc26xx/web-demo/web-demo.c @@ -580,7 +580,7 @@ get_tmp_reading() (random_rand() % SENSOR_READING_RANDOM); if(tmp_amb_reading.publish || tmp_obj_reading.publish) { - if(tmp_007_sensor.value(TMP_007_SENSOR_TYPE_ALL) == + if(tmp_007_sensor.value(TMP_007_TYPE_ALL) == TMP_007_READING_ERROR) { SENSORS_DEACTIVATE(tmp_007_sensor); @@ -589,7 +589,7 @@ get_tmp_reading() } if(tmp_amb_reading.publish) { - value = tmp_007_sensor.value(TMP_007_SENSOR_TYPE_AMBIENT); + value = tmp_007_sensor.value(TMP_007_TYPE_AMBIENT); tmp_amb_reading.raw = value; compare_and_update(&tmp_amb_reading); @@ -601,7 +601,7 @@ get_tmp_reading() } if(tmp_obj_reading.publish) { - value = tmp_007_sensor.value(TMP_007_SENSOR_TYPE_OBJECT); + value = tmp_007_sensor.value(TMP_007_TYPE_OBJECT); tmp_obj_reading.raw = value; compare_and_update(&tmp_obj_reading); @@ -640,7 +640,7 @@ get_hdc_reading() } if(hdc_hum_reading.publish) { - value = hdc_1000_sensor.value(HDC_1000_SENSOR_TYPE_HUMIDITY); + value = hdc_1000_sensor.value(HDC_1000_SENSOR_TYPE_HUMID); if(value != HDC_1000_READING_ERROR) { hdc_hum_reading.raw = value;