- temperatureC = SHT2x_CalcTemperatureC(sT)*10.0;
- humidityRH = SHT2x_CalcRH(sRH)*10.0;
- double hhum=(1.0546-0.000216*temperatureC)*(humidityRH);
- am2302_hum=0.318*hhum +76.0;
- am2302_temp=temperatureC*25.6;
+ temperatureC = SHT2x_CalcTemperatureC(sT);
+ humidityRH = SHT2x_CalcRH(sRH);
+ humidityRH=calibr_hum(temperatureC,-0.45,humidityRH)*10.0;
+ temperatureC=temperatureC*10.0-4.5;
+ if (testSW()) {
+ am2302_hum= humidityRH*10.0;
+ am2302_temp=temperatureC*25.6;
+ am2302_temp=am2302_temp-20;
+ config_info2[5]=8;
+
+ }else{
+
+ double hhum=(1.0546-0.000216*temperatureC)*(humidityRH);
+ //am2302_hum=0.318*hhum +76.0;
+ am2302_hum=0.31*hhum +80;
+ am2302_temp=temperatureC*25.6;
+ am2302_temp=am2302_temp-20;
+ config_info2[5]=7;
+ }