X-Git-Url: https://git.smho.de/gw/?p=owSlave2.git;a=blobdiff_plain;f=common%2FI2C%2FSHT2xV2.c;h=adbaf061fe500ae28344708420d752439fd569cb;hp=130e85bff1d74e7210370d631ea05e26b4d046b0;hb=refs%2Fheads%2Fmaster;hpb=6467d8138460abffd9ddabc7b0a9f00c764af19c diff --git a/common/I2C/SHT2xV2.c b/common/I2C/SHT2xV2.c index 130e85b..adbaf06 100644 --- a/common/I2C/SHT2xV2.c +++ b/common/I2C/SHT2xV2.c @@ -34,7 +34,7 @@ #define F_CPU 8000000UL #include #include -#include "USI_TWI_Master.h" +#include "TWI_Master.h" #include "SHT2xV2.h" uint8_t initSHT2x(){ @@ -97,9 +97,13 @@ uint8_t getSHT2xHumTemp(double *temp,double *hum) { if (calcCRCSHT2x(t1,t2)==tc) *temp=-46.85 + 175.72/65536 *(double)(((uint16_t)t1<<8)|(t2&0xF8)); else ret=0; - if (calcCRCSHT2x(f1,f2)==fc) + if (calcCRCSHT2x(f1,f2)==fc) { *hum=-6.0+125.0/65536*(double)(((uint16_t)f1<<8)|(f2&0xF8)); + *hum=(*hum)-((100.0/(*hum)*2.5)-2.5); + } else ret=0; + //*temp=20; + //*hum=10; return ret; }