#include <avr/pgmspace.h>\r
#include "../common/I2C/USI_TWI_Master.h"\r
#include "../common/I2C/MAX1164x.h"\r
-#include "../common/I2C/SHT2x.h"\r
+#include "../common/I2C/SHT2xV2.h"\r
#include "../common/calibr.h"\r
\r
extern void OWINIT(void);\r
\r
volatile uint8_t owid1[8]={0x28, 0xA3, 0xD9, 0x84, 0x00, 0x16, 0x05, 0x18};/**/\r
volatile uint8_t owid2[8]={0x26, 0xA3, 0xD9, 0x84, 0x00, 0x16, 0x05, 0x67};/**/\r
-volatile uint8_t config_info1[26]={0x08,0x01, 0x00,0x00, 0x00,0x00, 0x00,0x00, 0x02,17,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}; \r
+volatile uint8_t config_info1[26]={0x08,18, 0x00,0x00, 0x00,0x00, 0x00,0x00, 0x02,17,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}; \r
volatile uint8_t config_info2[26]={0x01,0x06, 0x05,0x08, 0x04,0x07, 11,0x08, 0x02,0x07,0x00,0x07,17,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}; \r
\r
#if (owid>128) \r
\r
USI_TWI_Master_Initialise();\r
\r
- SHT2x_SoftReset();\r
- SHT2x_ReadUserRegister(userRegister);\r
- SHT2x_WriteUserRegister(userRegister); //write changed user reg\r
+ initSHT2x();\r
+ _delay_ms(100);\r
MAX1164x_config(MAX1164x_S_SEL2|MAX1164x_S_SEL0,CH0_M);//#define MAX1164x_C_CS0\r
_delay_ms(30); //Internal Referenz start\r
//2970 -> 1,5V \r
pack2.r_day_max=0;\r
}\r
if (startup!=0) startup--;\r
- SHT2x_MeasurePoll(HUMIDITY, &sRH);\r
- // --- measure temperature with "Polling Mode" (no hold master) ---\r
- SHT2x_MeasurePoll(TEMP, &sT);\r
- //-- calculate humidity and temperature --\r
- temperatureC = SHT2x_CalcTemperatureC(sT);\r
- humidityRH = SHT2x_CalcRH(sRH);\r
+ getSHT2xHumTemp(&temperatureC,&humidityRH);\r
ip=interp(temperatureC,humidityRH);\r
pack2.ip=ip*1000;\r
- humidityRH=calibr_hum(temperatureC,-0.2,humidityRH)*10.0;\r
+ double RH=calibr_hum(temperatureC,-0.2,humidityRH)*10.0;\r
//humidityRH=humidityRH*10.0;\r
- temperatureC =temperatureC *10.0-2;\r
+ double TC =temperatureC *10.0-2;\r
\r
\r
if (testSW()) {\r
- am2302_hum= humidityRH*10.0;\r
- am2302_temp=temperatureC*25.6;\r
+ am2302_hum=RH*10.0;\r
+ am2302_temp=TC*25.6;\r
//am2302_temp=am2302_temp-45;\r
config_info2[5]=8; \r
}else{\r
- hhum=(1.0546-0.000216*temperatureC)*(humidityRH);\r
+ hhum=(1.0546-0.000216*TC)*(RH);\r
//am2302_hum=0.318*hhum +76.0;\r
am2302_hum=0.31*hhum +80;\r
- am2302_temp=temperatureC*25.6;\r
+ am2302_temp=TC*25.6;\r
config_info2[5]=7;\r
}\r
//PORTB&=~(1<<PINB1);\r
pack2.r_day_max=l*100;\r
}\r
} else if (l<R0) l=R0; //negative Werte am Anfang verhintern\r
- l=R0/l;\r
- l=log(l);\r
- l=l*160*4; //fuer DS18B20\r
+ l=exp((1-(l/R0))*6.05);// exp((1-($val)/55)*5.75); (5.75 geht über 125 6.05 geht bis 240... mittlere Linie im Datenblatt)\r
+ l=l*8; //fuer DS18B20\r
wdcounter=0;\r
\r
}\r