From 1384030d6e6b9431023f42c98cd3c91bda975a05 Mon Sep 17 00:00:00 2001 From: George Oikonomou Date: Sat, 7 Mar 2015 19:04:35 +0000 Subject: [PATCH] Replace SHT21 with HDC1000 driver in the tag build --- platform/srf06-cc26xx/sensortag/Makefile.sensortag | 2 +- platform/srf06-cc26xx/sensortag/board-peripherals.h | 2 +- platform/srf06-cc26xx/sensortag/board.c | 2 +- platform/srf06-cc26xx/sensortag/sensortag-sensors.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/platform/srf06-cc26xx/sensortag/Makefile.sensortag b/platform/srf06-cc26xx/sensortag/Makefile.sensortag index 688826417..94de7711f 100644 --- a/platform/srf06-cc26xx/sensortag/Makefile.sensortag +++ b/platform/srf06-cc26xx/sensortag/Makefile.sensortag @@ -3,6 +3,6 @@ CFLAGS += -DBACKDOOR_IOID=0x00000000 BOARD_SOURCEFILES += leds-arch.c sensortag-sensors.c sensor-common.c BOARD_SOURCEFILES += bmp-280-sensor.c tmp-007-sensor.c opt-3001-sensor.c -BOARD_SOURCEFILES += sht-21-sensor.c mpu-9250-sensor.c button-sensor.c +BOARD_SOURCEFILES += hdc-1000-sensor.c mpu-9250-sensor.c button-sensor.c BOARD_SOURCEFILES += reed-relay.c ext-flash.c buzzer.c BOARD_SOURCEFILES += board.c board-spi.c board-i2c.c diff --git a/platform/srf06-cc26xx/sensortag/board-peripherals.h b/platform/srf06-cc26xx/sensortag/board-peripherals.h index aa61ab333..9c994d9e6 100644 --- a/platform/srf06-cc26xx/sensortag/board-peripherals.h +++ b/platform/srf06-cc26xx/sensortag/board-peripherals.h @@ -43,7 +43,7 @@ #include "bmp-280-sensor.h" #include "tmp-007-sensor.h" #include "opt-3001-sensor.h" -#include "sht-21-sensor.h" +#include "hdc-1000-sensor.h" #include "mpu-9250-sensor.h" #include "reed-relay.h" #include "buzzer.h" diff --git a/platform/srf06-cc26xx/sensortag/board.c b/platform/srf06-cc26xx/sensortag/board.c index 5246a85ef..e397f1266 100644 --- a/platform/srf06-cc26xx/sensortag/board.c +++ b/platform/srf06-cc26xx/sensortag/board.c @@ -76,7 +76,7 @@ shutdown_handler(uint8_t mode) SENSORS_DEACTIVATE(bmp_280_sensor); SENSORS_DEACTIVATE(opt_3001_sensor); SENSORS_DEACTIVATE(tmp_007_sensor); - SENSORS_DEACTIVATE(sht_21_sensor); + SENSORS_DEACTIVATE(hdc_1000_sensor); mpu_9250_sensor.configure(MPU_9250_SENSOR_SHUTDOWN, 0); } } diff --git a/platform/srf06-cc26xx/sensortag/sensortag-sensors.c b/platform/srf06-cc26xx/sensortag/sensortag-sensors.c index a8f26aefe..bcd0fe367 100644 --- a/platform/srf06-cc26xx/sensortag/sensortag-sensors.c +++ b/platform/srf06-cc26xx/sensortag/sensortag-sensors.c @@ -41,7 +41,7 @@ #include "sensortag/bmp-280-sensor.h" #include "sensortag/tmp-007-sensor.h" #include "sensortag/opt-3001-sensor.h" -#include "sensortag/sht-21-sensor.h" +#include "sensortag/hdc-1000-sensor.h" #include "sensortag/mpu-9250-sensor.h" #include "sensortag/reed-relay.h" @@ -49,7 +49,7 @@ /*---------------------------------------------------------------------------*/ /** \brief Exports a global symbol to be used by the sensor API */ SENSORS(&button_left_sensor, &button_right_sensor, - &bmp_280_sensor, &tmp_007_sensor, &opt_3001_sensor, &sht_21_sensor, + &bmp_280_sensor, &tmp_007_sensor, &opt_3001_sensor, &hdc_1000_sensor, &mpu_9250_sensor, &reed_relay_sensor); /*---------------------------------------------------------------------------*/ /** @} */