Change from 16 to 24 Byte Config Code

[owSlave2.git] / DS2438_SHT2X / DS2438_SHT2X.c

diff --git a/DS2438_SHT2X/DS2438_SHT2X.c b/DS2438_SHT2X/DS2438_SHT2X.c
index 0da9838..eb182ef 100644 (file)
--- a/DS2438_SHT2X/DS2438_SHT2X.c
+++ b/DS2438_SHT2X/DS2438_SHT2X.c
@@ -1,4 +1,4 @@
-// Copyright (c) 2015, Tobias Mueller tm(at)tm3d.de\r
+// Copyright (c) 2017, Tobias Mueller tm(at)tm3d.de\r
 // All rights reserved.\r
 //\r
 // Redistribution and use in source and binary forms, with or without\r
@@ -41,13 +41,13 @@
 #include "../common/I2C/USI_TWI_Master.h"\r
 #include "../common/I2C/MAX44009.h"\r
 #include "../common/I2C/SHT2x.h"\r
+#include "../common/calibr.h"\r
 \r
 extern void OWINIT();\r
 extern void EXTERN_SLEEP();\r
 \r
 uint8_t owid[8]={0x26, 0xA2, 0xD9, 0x84, 0x00, 0x00, 0x05, 0x16};/**/\r
-uint8_t config_info[16]={0x01,0x06, 0x05,0x08, 0x04,0x07, 0x00,0x00, 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00};\r
-//uint8_t config_info[16]={0x01,0x06, 0x05,0x08, 0x04,0x08, 0x00,0x00, 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00};\r
+uint8_t config_info[26]={0x01,0x06, 0x05,0x08, 0x04,0x07, 0x00,0x00, 0x02,0x07,0x00,0x07,0x00,0x00,0x00,0x00, 0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};\r
        \r
 \r
 extern uint8_t mode;\r
@@ -175,13 +175,15 @@ int main(void){
                         // --- measure temperature with "Polling Mode" (no hold master) ---\r
                         SHT2x_MeasurePoll(TEMP, &sT);\r
                         //-- calculate humidity and temperature --\r
-                        temperatureC = SHT2x_CalcTemperatureC(sT)*10.0;\r
-                        humidityRH = SHT2x_CalcRH(sRH)*10.0;\r
+                        temperatureC = SHT2x_CalcTemperatureC(sT);\r
+                        humidityRH = calibr_hum(temperatureC,-0.2,SHT2x_CalcRH(sRH))*10.0;\r
+                        temperatureC-=0.2;\r
+                        temperatureC*=10.0;\r
                         if (testSW()) {\r
-                                am2302_hum= humidityRH*10.0;\r
+                                am2302_hum= humidityRH;\r
                                 am2302_temp=temperatureC*25.6;\r
                                 //am2302_temp=am2302_temp-45;\r
-                                config_info[5]=8;      \r
+                                config_info[5]=12;     \r
                                 \r
                         }else{\r
                                 \r