riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests/driver_dht: adjusted to interface changes

Browse Source
This commit is contained in:
Hauke Petersen 2016-01-21 18:42:48 +01:00
parent 6fca96c668
commit edce26bb15
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tests/driver_dht/main.c
View File

@ -1,5 +1,6 @@
/* /*
* Copyright (C) 2015 Ludwig Knüpfer, Christian Mehlis * Copyright (C) 2015 Ludwig Knüpfer, Christian Mehlis
* 2016 Freie Universität Berlin
* *
* This file is subject to the terms and conditions of the GNU Lesser * This file is subject to the terms and conditions of the GNU Lesser
* General Public License v2.1. See the file LICENSE in the top level * General Public License v2.1. See the file LICENSE in the top level
@ -15,6 +16,7 @@
* *
* @author Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de> * @author Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
* @author Christian Mehlis <mehlis@inf.fu-berlin.de> * @author Christian Mehlis <mehlis@inf.fu-berlin.de>
* @author Hauke Petersen <hauke.petersen@fu-berlin.de>
* *
* @} * @}
*/ */
@ -29,22 +31,32 @@ extern dht_t dht_devs[];
int main(void) int main(void)
{ {
dht_data_t data;
float temp, hum;
puts("DHT temperature and humidity sensor test application\n"); puts("DHT temperature and humidity sensor test application\n");
/* periodically read temp and humidity values */ /* periodically read temp and humidity values */
while (1) { while (1) {
for (unsigned i = 0; i < DHT_NUMOF; i++) { for (unsigned i = 0; i < DHT_NUMOF; i++) {
dht_t *dev = &dht_devs[i]; dht_t *dev = &dht_devs[i];
int16_t temp, hum;
int16_t dec_temp, dec_hum, int_temp, int_hum;
if (dht_read_raw(dev, &data) == -1) { if (dht_read(dev, &temp, &hum) == -1) {
puts("error reading data"); puts("error reading data");
continue;
} }
dht_parse(dev, &data, &hum, &temp);
printf("raw relative humidity: %i\nraw temperature: %i C\n", data.humidity, data.temperature); /* split up values into integral and fractional parts for nicer
printf("relative humidity: %i\ntemperature: %i C\n", (int) hum, (int) temp); * printing
* TODO: this should be done in some kind of library... */
int_temp = temp / 10;
dec_temp = temp - (int_temp * 10);
int_hum = hum / 10;
dec_hum = hum - (int_hum * 10);
printf("DHT device #%i - ", i);
printf("temp: %i.%i°C, ", int_temp, dec_temp);
printf("relative humidity: %i.%i%%\n", int_hum, dec_hum);
xtimer_usleep(2000 * MS_IN_USEC); xtimer_usleep(2000 * MS_IN_USEC);
} }
} }