tm3d
/
owSlave2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Many changes from 2018
[owSlave2.git]
/
common
/
I2C
/
SHT2xV2.c
diff --git
a/common/I2C/SHT2xV2.c
b/common/I2C/SHT2xV2.c
index
130e85b
..
adbaf06
100644
(file)
--- a/
common/I2C/SHT2xV2.c
+++ b/
common/I2C/SHT2xV2.c
@@
-34,7
+34,7
@@
#define F_CPU 8000000UL
\r
#include <avr/io.h>
\r
#include <util/delay.h>
\r
#define F_CPU 8000000UL
\r
#include <avr/io.h>
\r
#include <util/delay.h>
\r
-#include "
USI_
TWI_Master.h"
\r
+#include "TWI_Master.h"
\r
#include "SHT2xV2.h"
\r
\r
uint8_t initSHT2x(){
\r
#include "SHT2xV2.h"
\r
\r
uint8_t initSHT2x(){
\r
@@
-97,9
+97,13
@@
uint8_t getSHT2xHumTemp(double *temp,double *hum) {
if (calcCRCSHT2x(t1,t2)==tc)
\r
*temp=-46.85 + 175.72/65536 *(double)(((uint16_t)t1<<8)|(t2&0xF8));
\r
else ret=0;
\r
if (calcCRCSHT2x(t1,t2)==tc)
\r
*temp=-46.85 + 175.72/65536 *(double)(((uint16_t)t1<<8)|(t2&0xF8));
\r
else ret=0;
\r
- if (calcCRCSHT2x(f1,f2)==fc)
\r
+ if (calcCRCSHT2x(f1,f2)==fc)
{
\r
*hum=-6.0+125.0/65536*(double)(((uint16_t)f1<<8)|(f2&0xF8));
\r
*hum=-6.0+125.0/65536*(double)(((uint16_t)f1<<8)|(f2&0xF8));
\r
+ *hum=(*hum)-((100.0/(*hum)*2.5)-2.5);
\r
+ }
\r
else ret=0;
\r
else ret=0;
\r
+ //*temp=20;
\r
+ //*hum=10;
\r
return ret;
\r
}
\r
\r
return ret;
\r
}
\r
\r