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

temp and hum sensors values xxxx -> xx.xx

Browse source
This commit is contained in:
harald 2014-03-03 14:24:58 +01:00
parent f8c298a495
commit 87028c1f60
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
platform/osd-merkur/dev/dht11.c
View file

@ -30,7 +30,7 @@
#define mdelay(u) clock_delay_msec(u)
// define for DHT11 else for DHT22, RHT03
#define DHT11 1
#define DHT11 1
uint8_t DHT_Read_Data(uint16_t *temperature, uint16_t *humidity){
@ -107,11 +107,11 @@ uint8_t DHT_Read_Data(uint16_t *temperature, uint16_t *humidity){
//Check if data received are correct by checking the CheckSum
if ((uint8_t)(data[0] + data[1] + data[2] + data[3]) == data[4]) {
#ifdef DHT11
*humidity = data[0];
*temperature = data[2];
*humidity = data[0]*100;
*temperature = data[2]*100;
#else
*humidity = (uint16_t)data[0]<<8 | data[1];
*temperature = (uint16_t)data[2]<<8 | data[3];
*humidity = ((uint16_t)data[0]<<8 | data[1])*10;
*temperature = ((uint16_t)data[2]<<8 | data[3])*10;
#endif
return 0;
}else{