Many changes from 2018

[owSlave2.git] / DS2438_SHT2X / DS2438_SHT2X.c

diff --git a/DS2438_SHT2X/DS2438_SHT2X.c b/DS2438_SHT2X/DS2438_SHT2X.c
index eef88e3..349736e 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
@@ -39,16 +39,14 @@
 #include <avr/sleep.h>\r
 #include <avr/pgmspace.h>\r
 #include "../common/I2C/USI_TWI_Master.h"\r
-#include "../common/I2C/MAX44009.h"\r
-#include "../common/I2C/SHT2x.h"\r
+#include "../common/I2C/SHT2xV2.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
@@ -87,8 +85,7 @@ volatile int16_t am2302_temp;
 volatile uint16_t am2302_hum;\r
 \r
 uint8_t userRegister[1];\r
-int16_t sRH,sT;\r
-volatile double temperatureC,humidityRH;\r
+double temperatureC,humidityRH;\r
 volatile double l;\r
 \r
 #if  defined(__AVR_ATtiny24__)||defined(__AVR_ATtiny44__)  || defined(__AVR_ATtiny84__) || defined(__AVR_ATtiny24A__)||defined(__AVR_ATtiny44A__)  || defined(__AVR_ATtiny84A__)\r
@@ -149,49 +146,34 @@ int main(void){
        \r
     uint8_t i;\r
     for(i=0;i<64;i++) pack.bytes[i]=0;\r
+       pack.page3[0]=0xF1;\r
        MCUSR=0;\r
        USI_TWI_Master_Initialise();\r
-       SHT2x_SoftReset();\r
-       SHT2x_ReadUserRegister(userRegister);\r
-       //(userRegister & ~SHT2x_RES_MASK) | SHT2x_RES_10_13BIT;\r
-       SHT2x_WriteUserRegister(userRegister); //write changed user reg\r
-       // --- measure humidity with "Hold Master Mode (HM)" ---\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
-       \r
+       initSHT2x();\r
+       _delay_ms(100);\r
        sei();\r
        \r
-        while(1)   {\r
+        while(1)   { \r
                 if (gcontrol) {\r
                         wdcounter=3;\r
                         gcontrol=0;\r
                 }\r
                 if (wdcounter>2) {\r
-                        //PORTB|=(1<<PINB1); //Dauer 440ms\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 = calibr_hum(temperatureC,-0.2,SHT2x_CalcRH(sRH))*10.0;\r
-                        temperatureC-=0.2;\r
-                        temperatureC*=10.0;\r
+                        getSHT2xHumTemp(&temperatureC,&humidityRH);\r
+                        double RH = humidityRH*10.0;//calibr_hum(temperatureC,-0.2,humidityRH)*10.0;\r
+                        double T=temperatureC;//-0.2;\r
+                        T*=10.0;\r
                         if (testSW()) {\r
-                                am2302_hum= humidityRH;\r
-                                am2302_temp=temperatureC*25.6;\r
-                                //am2302_temp=am2302_temp-45;\r
+                                am2302_hum= RH;\r
+                                am2302_temp=T*25.6;\r
                                 config_info[5]=12;     \r
                                 \r
                         }else{\r
                                 \r
-                               double hhum=(1.0546-0.000216*temperatureC)*(humidityRH);\r
+                               double hhum=(1.0546-0.000216*T)*(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=T*25.6;\r
                                //am2302_temp=am2302_temp-45;\r
                                config_info[5]=7;\r
                         }\r