X-Git-Url: http://git.smho.de/gw/?p=owSlave2.git;a=blobdiff_plain;f=DS2438_SHT2X%2FDS2438_SHT2X.c;fp=DS2438_SHT2X%2FDS2438_SHT2X.c;h=eef88e3c297f887b84df8a46415e277dc5a17a2f;hp=0da98384346d6ef9063d16b191e7a97ef1ad3066;hb=3f2aceaf525eeceff3baece206b2048bbf286c40;hpb=1624c8ce9acb762d2cdc0b2f6b064448561ff752

diff --git a/DS2438_SHT2X/DS2438_SHT2X.c b/DS2438_SHT2X/DS2438_SHT2X.c
index 0da9838..eef88e3 100644
--- a/DS2438_SHT2X/DS2438_SHT2X.c
+++ b/DS2438_SHT2X/DS2438_SHT2X.c
@@ -41,6 +41,7 @@
 #include "../common/I2C/USI_TWI_Master.h"
 #include "../common/I2C/MAX44009.h"
 #include "../common/I2C/SHT2x.h"
+#include "../common/calibr.h"
 
 extern void OWINIT();
 extern void EXTERN_SLEEP();
@@ -175,13 +176,15 @@ int main(void){
 			 // --- measure temperature with "Polling Mode" (no hold master) ---
 			 SHT2x_MeasurePoll(TEMP, &sT);
 			 //-- calculate humidity and temperature --
-			 temperatureC = SHT2x_CalcTemperatureC(sT)*10.0;
-			 humidityRH = SHT2x_CalcRH(sRH)*10.0;
+			 temperatureC = SHT2x_CalcTemperatureC(sT);
+			 humidityRH = calibr_hum(temperatureC,-0.2,SHT2x_CalcRH(sRH))*10.0;
+			 temperatureC-=0.2;
+			 temperatureC*=10.0;
 			 if (testSW()) {
-				 am2302_hum= humidityRH*10.0;
+				 am2302_hum= humidityRH;
 				 am2302_temp=temperatureC*25.6;
 				 //am2302_temp=am2302_temp-45;
-				 config_info[5]=8;	
+				 config_info[5]=12;	
 				 
 			 }else{