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

Replace SHT21 with HDC1000 in the web demo

Browse source
This commit is contained in:
George Oikonomou 2015-03-07 19:21:52 +00:00
parent 62f978b993
commit e4722bb0ea
4 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
examples/cc26xx/cc26xx-web-demo/cc26xx-web-demo.c
View file

@ -68,7 +68,7 @@ PROCESS(cc26xx_web_demo_process, "CC26XX Web Demo");
struct ctimer batmon_timer; struct ctimer batmon_timer;
#if BOARD_SENSORTAG #if BOARD_SENSORTAG
struct ctimer bmp_timer, sht_timer, tmp_timer, opt_timer, mpu_timer; struct ctimer bmp_timer, hdc_timer, tmp_timer, opt_timer, mpu_timer;
#endif #endif
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Provide visible feedback via LEDS while searching for a network */ /* Provide visible feedback via LEDS while searching for a network */
@ -111,11 +111,11 @@ DEMO_SENSOR(bmp_pres, CC26XX_WEB_DEMO_SENSOR_BMP_PRES,
DEMO_SENSOR(bmp_temp, CC26XX_WEB_DEMO_SENSOR_BMP_TEMP, DEMO_SENSOR(bmp_temp, CC26XX_WEB_DEMO_SENSOR_BMP_TEMP,
"Air Temp", "air-temp", "bmp_temp", "Air Temp", "air-temp", "bmp_temp",
CC26XX_WEB_DEMO_UNIT_TEMP); CC26XX_WEB_DEMO_UNIT_TEMP);
DEMO_SENSOR(sht_temp, CC26XX_WEB_DEMO_SENSOR_SHT_TEMP, DEMO_SENSOR(hdc_temp, CC26XX_WEB_DEMO_SENSOR_HDC_TEMP,
"SHT Temp", "sht-temp", "sht_temp", "HDC Temp", "hdc-temp", "hdc_temp",
CC26XX_WEB_DEMO_UNIT_TEMP); CC26XX_WEB_DEMO_UNIT_TEMP);
DEMO_SENSOR(sht_hum, CC26XX_WEB_DEMO_SENSOR_SHT_HUMIDITY, DEMO_SENSOR(hdc_hum, CC26XX_WEB_DEMO_SENSOR_HDC_HUMIDITY,
"SHT Humidity", "sht-humidity", "sht_hum", "HDC Humidity", "hdc-humidity", "hdc_hum",
CC26XX_WEB_DEMO_UNIT_HUMIDITY); CC26XX_WEB_DEMO_UNIT_HUMIDITY);
DEMO_SENSOR(tmp_amb, CC26XX_WEB_DEMO_SENSOR_TMP_AMBIENT, DEMO_SENSOR(tmp_amb, CC26XX_WEB_DEMO_SENSOR_TMP_AMBIENT,
"Ambient Temp", "ambient-temp", "tmp_amb", "Ambient Temp", "ambient-temp", "tmp_amb",
@ -152,7 +152,7 @@ DEMO_SENSOR(mpu_gyro_z, CC26XX_WEB_DEMO_SENSOR_MPU_GYRO_Z,
#if BOARD_SENSORTAG #if BOARD_SENSORTAG
static void init_bmp_reading(void *data); static void init_bmp_reading(void *data);
static void init_light_reading(void *data); static void init_light_reading(void *data);
static void init_sht_reading(void *data); static void init_hdc_reading(void *data);
static void init_tmp_reading(void *data); static void init_tmp_reading(void *data);
static void init_mpu_reading(void *data); static void init_mpu_reading(void *data);
#endif #endif
@ -526,42 +526,42 @@ get_tmp_reading()
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void static void
get_sht_reading() get_hdc_reading()
{ {
int value; int value;
char *buf; char *buf;
clock_time_t next = SENSOR_READING_PERIOD + clock_time_t next = SENSOR_READING_PERIOD +
(random_rand() % SENSOR_READING_RANDOM); (random_rand() % SENSOR_READING_RANDOM);
if(sht_temp_reading.publish) { if(hdc_temp_reading.publish) {
value = sht_21_sensor.value(SHT_21_SENSOR_TYPE_TEMP); value = hdc_1000_sensor.value(HDC_1000_SENSOR_TYPE_TEMP);
if(value != CC26XX_SENSOR_READING_ERROR) { if(value != CC26XX_SENSOR_READING_ERROR) {
sht_temp_reading.raw = value; hdc_temp_reading.raw = value;
compare_and_update(&sht_temp_reading); compare_and_update(&hdc_temp_reading);
buf = sht_temp_reading.converted; buf = hdc_temp_reading.converted;
memset(buf, 0, CC26XX_WEB_DEMO_CONVERTED_LEN); memset(buf, 0, CC26XX_WEB_DEMO_CONVERTED_LEN);
snprintf(buf, CC26XX_WEB_DEMO_CONVERTED_LEN, "%d.%02d", value / 100, snprintf(buf, CC26XX_WEB_DEMO_CONVERTED_LEN, "%d.%02d", value / 100,
value % 100); value % 100);
} }
} }
if(sht_hum_reading.publish) { if(hdc_hum_reading.publish) {
value = sht_21_sensor.value(SHT_21_SENSOR_TYPE_HUMIDITY); value = hdc_1000_sensor.value(HDC_1000_SENSOR_TYPE_HUMIDITY);
if(value != CC26XX_SENSOR_READING_ERROR) { if(value != CC26XX_SENSOR_READING_ERROR) {
sht_hum_reading.raw = value; hdc_hum_reading.raw = value;
compare_and_update(&sht_hum_reading); compare_and_update(&hdc_hum_reading);
buf = sht_hum_reading.converted; buf = hdc_hum_reading.converted;
memset(buf, 0, CC26XX_WEB_DEMO_CONVERTED_LEN); memset(buf, 0, CC26XX_WEB_DEMO_CONVERTED_LEN);
snprintf(buf, CC26XX_WEB_DEMO_CONVERTED_LEN, "%d.%02d", value / 100, snprintf(buf, CC26XX_WEB_DEMO_CONVERTED_LEN, "%d.%02d", value / 100,
value % 100); value % 100);
} }
} }
ctimer_set(&sht_timer, next, init_sht_reading, NULL); ctimer_set(&hdc_timer, next, init_hdc_reading, NULL);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void static void
@ -702,12 +702,12 @@ init_bmp_reading(void *data)
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void static void
init_sht_reading(void *data) init_hdc_reading(void *data)
{ {
if(sht_hum_reading.publish || sht_temp_reading.publish) { if(hdc_hum_reading.publish || hdc_temp_reading.publish) {
SENSORS_ACTIVATE(sht_21_sensor); SENSORS_ACTIVATE(hdc_1000_sensor);
} else { } else {
ctimer_set(&sht_timer, CLOCK_SECOND, init_sht_reading, NULL); ctimer_set(&hdc_timer, CLOCK_SECOND, init_hdc_reading, NULL);
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -756,7 +756,7 @@ init_sensor_readings(void)
#if BOARD_SENSORTAG #if BOARD_SENSORTAG
init_bmp_reading(NULL); init_bmp_reading(NULL);
init_light_reading(NULL); init_light_reading(NULL);
init_sht_reading(NULL); init_hdc_reading(NULL);
init_tmp_reading(NULL); init_tmp_reading(NULL);
init_mpu_reading(NULL); init_mpu_reading(NULL);
#endif /* BOARD_SENSORTAG */ #endif /* BOARD_SENSORTAG */
@ -781,8 +781,8 @@ init_sensors(void)
list_add(sensor_list, &opt_reading); list_add(sensor_list, &opt_reading);
list_add(sensor_list, &sht_hum_reading); list_add(sensor_list, &hdc_hum_reading);
list_add(sensor_list, &sht_temp_reading); list_add(sensor_list, &hdc_temp_reading);
list_add(sensor_list, &mpu_acc_x_reading); list_add(sensor_list, &mpu_acc_x_reading);
list_add(sensor_list, &mpu_acc_y_reading); list_add(sensor_list, &mpu_acc_y_reading);
@ -873,8 +873,8 @@ PROCESS_THREAD(cc26xx_web_demo_process, ev, data)
get_bmp_reading(); get_bmp_reading();
} else if(ev == sensors_event && data == &opt_3001_sensor) { } else if(ev == sensors_event && data == &opt_3001_sensor) {
get_light_reading(); get_light_reading();
} else if(ev == sensors_event && data == &sht_21_sensor) { } else if(ev == sensors_event && data == &hdc_1000_sensor) {
get_sht_reading(); get_hdc_reading();
} else if(ev == sensors_event && data == &tmp_007_sensor) { } else if(ev == sensors_event && data == &tmp_007_sensor) {
get_tmp_reading(); get_tmp_reading();
} else if(ev == sensors_event && data == &mpu_9250_sensor) { } else if(ev == sensors_event && data == &mpu_9250_sensor) {

4
examples/cc26xx/cc26xx-web-demo/cc26xx-web-demo.h
View file

@ -121,8 +121,8 @@
#define CC26XX_WEB_DEMO_SENSOR_BMP_TEMP 3 #define CC26XX_WEB_DEMO_SENSOR_BMP_TEMP 3
#define CC26XX_WEB_DEMO_SENSOR_TMP_AMBIENT 4 #define CC26XX_WEB_DEMO_SENSOR_TMP_AMBIENT 4
#define CC26XX_WEB_DEMO_SENSOR_TMP_OBJECT 5 #define CC26XX_WEB_DEMO_SENSOR_TMP_OBJECT 5
#define CC26XX_WEB_DEMO_SENSOR_SHT_TEMP 6 #define CC26XX_WEB_DEMO_SENSOR_HDC_TEMP 6
#define CC26XX_WEB_DEMO_SENSOR_SHT_HUMIDITY 7 #define CC26XX_WEB_DEMO_SENSOR_HDC_HUMIDITY 7
#define CC26XX_WEB_DEMO_SENSOR_OPT_LIGHT 8 #define CC26XX_WEB_DEMO_SENSOR_OPT_LIGHT 8
#define CC26XX_WEB_DEMO_SENSOR_MPU_ACC_X 9 #define CC26XX_WEB_DEMO_SENSOR_MPU_ACC_X 9
#define CC26XX_WEB_DEMO_SENSOR_MPU_ACC_Y 10 #define CC26XX_WEB_DEMO_SENSOR_MPU_ACC_Y 10

8
examples/cc26xx/cc26xx-web-demo/coap-server.c
View file

@ -66,8 +66,8 @@ extern resource_t res_bmp280_temp;
extern resource_t res_bmp280_press; extern resource_t res_bmp280_press;
extern resource_t res_tmp007_amb; extern resource_t res_tmp007_amb;
extern resource_t res_tmp007_obj; extern resource_t res_tmp007_obj;
extern resource_t res_sht21_temp; extern resource_t res_hdc1000_temp;
extern resource_t res_sht21_hum; extern resource_t res_hdc1000_hum;
extern resource_t res_opt3001_light; extern resource_t res_opt3001_light;
extern resource_t res_mpu_acc_x; extern resource_t res_mpu_acc_x;
extern resource_t res_mpu_acc_y; extern resource_t res_mpu_acc_y;
@ -98,8 +98,8 @@ start_board_resources(void)
rest_activate_resource(&res_bmp280_press, "sen/bar/pres"); rest_activate_resource(&res_bmp280_press, "sen/bar/pres");
rest_activate_resource(&res_tmp007_amb, "sen/tmp/amb"); rest_activate_resource(&res_tmp007_amb, "sen/tmp/amb");
rest_activate_resource(&res_tmp007_obj, "sen/tmp/obj"); rest_activate_resource(&res_tmp007_obj, "sen/tmp/obj");
rest_activate_resource(&res_sht21_temp, "sen/sht/t"); rest_activate_resource(&res_hdc1000_temp, "sen/hdc/t");
rest_activate_resource(&res_sht21_hum, "sen/sht/h"); rest_activate_resource(&res_hdc1000_hum, "sen/hdc/h");
rest_activate_resource(&res_opt3001_light, "sen/opt/light"); rest_activate_resource(&res_opt3001_light, "sen/opt/light");
rest_activate_resource(&res_mpu_acc_x, "sen/mpu/acc/x"); rest_activate_resource(&res_mpu_acc_x, "sen/mpu/acc/x");
rest_activate_resource(&res_mpu_acc_y, "sen/mpu/acc/y"); rest_activate_resource(&res_mpu_acc_y, "sen/mpu/acc/y");

18
examples/cc26xx/cc26xx-web-demo/resources/res-sensors.c
View file

@ -229,28 +229,28 @@ RESOURCE(res_bmp280_press,
"title=\"Barometer (Pressure)\";rt=\"hPa (hectopascal / millibar)\"", "title=\"Barometer (Pressure)\";rt=\"hPa (hectopascal / millibar)\"",
res_get_handler_bmp_press, NULL, NULL, NULL); res_get_handler_bmp_press, NULL, NULL, NULL);
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* SHT21 sensor resources and handler: Temperature, Pressure */ /* HDC1000 sensor resources and handler: Temperature, Pressure */
static void static void
res_get_handler_sht_temp(void *request, void *response, uint8_t *buffer, res_get_handler_hdc_temp(void *request, void *response, uint8_t *buffer,
uint16_t preferred_size, int32_t *offset) uint16_t preferred_size, int32_t *offset)
{ {
res_get_handler_all(CC26XX_WEB_DEMO_SENSOR_SHT_TEMP, request, response, res_get_handler_all(CC26XX_WEB_DEMO_SENSOR_HDC_TEMP, request, response,
buffer, preferred_size, offset); buffer, preferred_size, offset);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void static void
res_get_handler_sht_humidity(void *request, void *response, uint8_t *buffer, res_get_handler_hdc_humidity(void *request, void *response, uint8_t *buffer,
uint16_t preferred_size, int32_t *offset) uint16_t preferred_size, int32_t *offset)
{ {
res_get_handler_all(CC26XX_WEB_DEMO_SENSOR_SHT_HUMIDITY, request, response, res_get_handler_all(CC26XX_WEB_DEMO_SENSOR_HDC_HUMIDITY, request, response,
buffer, preferred_size, offset); buffer, preferred_size, offset);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
RESOURCE(res_sht21_temp, "title=\"Temperature\";rt=\"C\"", RESOURCE(res_hdc1000_temp, "title=\"Temperature\";rt=\"C\"",
res_get_handler_sht_temp, NULL, NULL, NULL); res_get_handler_hdc_temp, NULL, NULL, NULL);
RESOURCE(res_sht21_hum, "title=\"Humidity\";rt=\"%RH\"", RESOURCE(res_hdc1000_hum, "title=\"Humidity\";rt=\"%RH\"",
res_get_handler_sht_humidity, NULL, NULL, NULL); res_get_handler_hdc_humidity, NULL, NULL, NULL);
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Illuminance resources and handler */ /* Illuminance resources and handler */
static void static void