New I2C devices

[owSlave2.git] / DS18B20_VOC_DS2438_SHT direct / DS18B20_DS2438.c

diff --git a/DS18B20_VOC_DS2438_SHT direct/DS18B20_DS2438.c b/DS18B20_VOC_DS2438_SHT direct/DS18B20_DS2438.c
index 4448c39..5b3461c 100644 (file)
--- a/DS18B20_VOC_DS2438_SHT direct/DS18B20_DS2438.c
+++ b/DS18B20_VOC_DS2438_SHT direct/DS18B20_DS2438.c
@@ -63,6 +63,7 @@ extern uint8_t gcontrol;
 extern uint8_t reset_indicator;\r
 extern uint8_t alarmflag;\r
 volatile uint8_t wdcounter=1;\r
+extern uint8_t cpsp;\r
 \r
 \r
 #if  defined(__AVR_ATtiny24__)||defined(__AVR_ATtiny44__)  || defined(__AVR_ATtiny84__) || defined(__AVR_ATtiny24A__)||defined(__AVR_ATtiny44A__)  || defined(__AVR_ATtiny84A__)\r
@@ -74,8 +75,7 @@ ISR(WATCHDOG_vect) {
                if (reset_indicator==1) reset_indicator++;\r
                else if (reset_indicator==2) mode=0;\r
 \r
-\r
-       }\r
+}\r
 \r
 \r
        typedef union {\r
@@ -114,11 +114,12 @@ ISR(WATCHDOG_vect) {
                        union{\r
                                uint8_t page3[8]; //25\r
                                struct {\r
+                                       uint8_t free;\r
                                        uint16_t R0;\r
                                        uint16_t VS;\r
                                        uint8_t cmode;\r
                                        int16_t ip;\r
-                                       uint8_t free;\r
+                                       \r
                                };\r
                        };\r
                        union{\r
@@ -130,7 +131,19 @@ ISR(WATCHDOG_vect) {
                                        uint16_t r_week_max;\r
                                };\r
                        };\r
-                       uint8_t page5[8];  //41\r
+                       union{\r
+                               uint8_t page5[8];  //41\r
+                               struct {\r
+                                       uint8_t codeVOC; // immer 0x37 nach Neustart\r
+                                       uint8_t days_of_r0; //Anzahl der Tage fuer die r0 ermittelt wird\r
+                                       int8_t corr_VOC_mult; //r0 corr\r
+                                       int8_t corr_VOC_div;\r
+                                       uint16_t vv3;\r
+                                       uint8_t time_corr; //Wiregate;\r
+                                       uint8_t reset_code;\r
+                               };\r
+                               uint16_t page5d[4];\r
+                       };\r
                        uint8_t page6[8];  //49\r
                        uint8_t page7[8];  //57\r
                        \r
@@ -152,7 +165,7 @@ ISR(WATCHDOG_vect) {
        volatile double l;\r
 \r
 \r
-       uint16_t weekmaxarr[8];\r
+       uint16_t weekmaxarr[33];\r
 \r
        //Kompensieren der Abhänigkeit von RS/RO von Temperatur und Luftfeuchte\r
        inline double interp(double t, double h) {\r
@@ -190,11 +203,15 @@ ISR(WATCHDOG_vect) {
                \r
        }\r
 \r
+       \r
        #define EEPROM_R0 0\r
        #define EEPROM_R0d 2\r
        #define EEPROM_R0w 4\r
        #define EEPROM_dol 6\r
-\r
+       #define EEPROM_CODE_DAYOFR0 8\r
+       #define EEPROM_CORR 10\r
+       #define EEPROM_FREE 12\r
+       #define EEPROM_TCORR_RESET 14\r
 \r
        uint16_t readEEPROM(uint8_t addr,uint16_t def) {\r
                uint16_t hr;\r
@@ -254,6 +271,7 @@ ISR(WATCHDOG_vect) {
                pack1.rr00=0;\r
                pack1.rr10=0x10;\r
 \r
+               pack2.page3[0]=0xF1;\r
                pack2.cmode=0;\r
                pack2.R0=readEEPROM(EEPROM_R0,1);\r
                R0=pack2.R0/100.0;\r
@@ -262,10 +280,17 @@ ISR(WATCHDOG_vect) {
                pack2.r_week_max=readEEPROM(EEPROM_R0w,1);\r
                pack2.tol_d=readEEPROM(EEPROM_dol,0);\r
                pack2.tol_s8=0;  //Tag faengt mit Einschalten an\r
-               for(uint8_t i=0;i<7;i++) {\r
+\r
+               pack2.page5d[0]=readEEPROM(EEPROM_CODE_DAYOFR0,0x0437);\r
+               pack2.page5d[1]=readEEPROM(EEPROM_CORR,0x0101);\r
+               pack2.page5d[2]=readEEPROM(EEPROM_FREE,0x0);\r
+               pack2.page5d[3]=readEEPROM( EEPROM_TCORR_RESET,0x0005);\r
+\r
+               for(uint8_t i=0;i<pack2.days_of_r0;i++) {\r
                        weekmaxarr[i]=pack2.r_week_max;\r
                }\r
 \r
+\r
                if (testSW()) {\r
                        config_info2[5]=12;\r
                        }else{\r
@@ -279,7 +304,7 @@ ISR(WATCHDOG_vect) {
                gcontrol=1;\r
                sei();\r
                while(1)   {\r
-                       if (pack1.config==0x1F) {  //Reset R0\r
+                       /*if (pack1.config==0x1F) {  //Reset R0\r
                                pack1.config=0x7F;\r
                                R0=1;\r
                                pack2.R0=0;\r
@@ -299,6 +324,34 @@ ISR(WATCHDOG_vect) {
                                for(uint8_t i=0;i<7;i++) {\r
                                        weekmaxarr[i]=1;\r
                                }\r
+                       }*/\r
+                       if ((cpsp&0x80)!=0) {\r
+                               if ((cpsp&0x0F)==5) {\r
+                                       if (pack2.reset_code==0x01) {\r
+                                               R0=1;\r
+                                               pack2.R0=0;\r
+                                               writeEEPROM(EEPROM_R0,0);\r
+                                       } else if (pack2.reset_code==0x05) {\r
+                                               pack2.r_day_max=1;\r
+                                               pack2.r_week_max=1;\r
+                                               pack2.tol_d=0;\r
+                                               pack2.tol_s8=0;  //Tag faengt mit Einschalten an\r
+                                               R0=1;\r
+                                               writeEEPROM(EEPROM_R0,0xFF);\r
+                                               writeEEPROM(EEPROM_R0d,0xFF);  //Maximum des Tages\r
+                                               writeEEPROM(EEPROM_R0w,0xFF); //Maximum der Letzten 7 Tage\r
+                                               writeEEPROM(EEPROM_dol,0xFF); //Anzahl der Betriebstage\r
+                                               for(uint8_t i=0;i<7;i++) {\r
+                                                       weekmaxarr[i]=1;\r
+                                               }\r
+                                       } else {\r
+                                               writeEEPROM(EEPROM_CODE_DAYOFR0,0x0037|(pack2.days_of_r0<<8));\r
+                                               writeEEPROM(EEPROM_CORR,pack2.page5d[1]);\r
+                                               writeEEPROM(EEPROM_FREE,pack2.page5d[2]);\r
+                                               writeEEPROM(EEPROM_TCORR_RESET,pack2.time_corr);\r
+                                       }\r
+                               }\r
+                               cpsp=0;\r
                        }\r
                        if (wdcounter>0) {  //8s\r
                                pack2.tol_s8++;\r
@@ -306,8 +359,8 @@ ISR(WATCHDOG_vect) {
                                        pack2.tol_s8=0;\r
                                        pack2.tol_d++;  //rund 180 Jahre :-)\r
                                        pack2.r_week_max=0;\r
-                                       weekmaxarr[7]=pack2.r_day_max;\r
-                                       for(uint8_t i=0;i<7;i++) {\r
+                                       weekmaxarr[pack2.days_of_r0]=pack2.r_day_max;\r
+                                       for(uint8_t i=0;i<pack2.days_of_r0;i++) {\r
                                                weekmaxarr[i]=weekmaxarr[i+1];\r
                                                //maximum of week\r
                                                if (weekmaxarr[i]>pack2.r_week_max) pack2.r_week_max=weekmaxarr[i];\r
@@ -330,8 +383,10 @@ ISR(WATCHDOG_vect) {
                                getSHT2xHumTemp(&temperatureC,&humidityRH);\r
                                ip=interp(temperatureC,humidityRH);\r
                                pack2.ip=ip*1000;\r
-                               double RH=calibr_hum(temperatureC,-0.2,humidityRH)*10.0;\r
-                               double TC =temperatureC *10.0-2;\r
+                               //double RH=calibr_hum(temperatureC,-0.2,humidityRH)*10.0;\r
+                               //double TC =temperatureC *10.0-2;\r
+                               double RH=humidityRH*10.0;\r
+                               double TC=temperatureC*10.0;\r
 \r
 \r
                                if (testSW()) {\r
@@ -387,9 +442,17 @@ ISR(WATCHDOG_vect) {
                                                pack2.r_day_max=l*100;\r
                                        }\r
                                } else if (l<R0) l=R0; //negative Werte am Anfang verhintern\r
-                               l=exp((1-(l/R0))*6.05)-1;// exp((1-($val)/55)*5.75);  (5.75 geht über 125 6.05 geht bis 240... mittlere Linie im Datenblatt)\r
-                               l=l*8.0; //fuer DS18B20*/\r
+                               //l=exp((1-(l/R0))*6.05)-1;// exp((1-($val)/55)*5.75);  (5.75 geht über 125 6.05 geht bis 240... mittlere Linie im Datenblatt)\r
+                               //l=pow(R0/l,1.8)*3-3; \r
+                               if (l!=0) {\r
+                                       l=R0/l;\r
+                                       //l=l*l*12-12;\r
+                                       l=exp((1-(1/l))*6.05)-1;\r
+                                       l=l*(double)pack2.corr_VOC_mult/(double)pack2.corr_VOC_div;\r
+                                       l=l*8.0; //fuer DS18B20*/\r
+                               }       \r
                                wdcounter=0;\r
+\r
                                \r
                        }\r
                        \r