tm3d / owSlave2.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
add SHT3X support / new smaller SHT2X (V2)
[owSlave2.git] / DS18B20_VOC_DS2438_SHT / DS18B20_DS2438.c
diff --git a/DS18B20_VOC_DS2438_SHT/DS18B20_DS2438.c b/DS18B20_VOC_DS2438_SHT/DS18B20_DS2438.c
index 3e1aafc..a85c988 100644 (file)
--- a/DS18B20_VOC_DS2438_SHT/DS18B20_DS2438.c
+++ b/DS18B20_VOC_DS2438_SHT/DS18B20_DS2438.c
@@ -1,5 +1,4 @@
-       \r
-// 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
@@ -31,6 +30,8 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\r
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\r
 \r
+//!!!!!Max Program size 7551 Byte\r
+\r
 #define F_CPU 8000000UL\r
 #include <avr/io.h>\r
 #include <avr/interrupt.h>\r
@@ -40,7 +41,7 @@
 #include <avr/pgmspace.h>\r
 #include "../common/I2C/USI_TWI_Master.h"\r
 #include "../common/I2C/MAX1164x.h"\r
-#include "../common/I2C/SHT2x.h"\r
+#include "../common/I2C/SHT2xV2.h"\r
 #include "../common/calibr.h"\r
 \r
 extern void OWINIT(void);\r
@@ -50,8 +51,8 @@ extern void EXTERN_SLEEP(void);
 \r
 volatile uint8_t owid1[8]={0x28, 0xA3, 0xD9, 0x84, 0x00, 0x16, 0x05, 0x18};/**/\r
 volatile uint8_t owid2[8]={0x26, 0xA3, 0xD9, 0x84, 0x00, 0x16, 0x05, 0x67};/**/\r
-volatile uint8_t config_info1[16]={0x08,0x01, 0x00,0x00, 0x00,0x00, 0x00,0x00, 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00};       \r
-volatile uint8_t config_info2[16]={0x01,0x06, 0x05,0x08, 0x04,0x07, 0x07,0x08, 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00};       \r
+volatile uint8_t config_info1[26]={0x08,18, 0x00,0x00, 0x00,0x00, 0x00,0x00, 0x02,17,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};        \r
+volatile uint8_t config_info2[26]={0x01,0x06, 0x05,0x08, 0x04,0x07, 11,0x08, 0x02,0x07,0x00,0x07,17,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};        \r
        \r
 #if (owid>128) \r
 #error "Variable not correct"\r
@@ -132,7 +133,7 @@ typedef union {
                uint8_t page5[8];  //41\r
                uint8_t page6[8];  //49\r
                uint8_t page7[8];  //57\r
-               //uint8_t crc;  //65\r
+               \r
                #endif\r
        };\r
 } pack2_t;\r
@@ -158,6 +159,7 @@ uint8_t max_adr=0;
 \r
 uint16_t weekmaxarr[8];\r
 \r
+//Kompensieren der Abhänigkeit von RS/RO von Temperatur und Luftfeuchte\r
 inline double interp(double t, double h) {\r
        double h2;\r
         double t2;\r
@@ -171,6 +173,27 @@ uint16_t mr;
 uint8_t startup=10;\r
 double ip;\r
 \r
+\r
+int testSW(void) {\r
+       uint8_t r;\r
+       DDRB&=~(1<<PORTB0);  //Eingang\r
+        __asm__ __volatile__ ("nop"); \r
+        PORTB|=(1<<PORTB0); //Pullup\r
+        __asm__ __volatile__ ("nop"); \r
+        __asm__ __volatile__ ("nop"); \r
+        __asm__ __volatile__ ("nop"); \r
+        __asm__ __volatile__ ("nop"); \r
+        __asm__ __volatile__ ("nop"); \r
+        r=PINB&(1<<PORTB0);\r
+        __asm__ __volatile__ ("nop"); \r
+        PORTB&=~(1<<PORTB0); \r
+        __asm__ __volatile__ ("nop"); \r
+       DDRB|=(1<<PORTB0);  //Eingang\r
+       return (r==0);  //Offen mal HIH4030\r
+        \r
+        \r
+}\r
+\r
 #define EEPROM_R0 0\r
 #define EEPROM_R0d 2\r
 #define EEPROM_R0w 4\r
@@ -210,8 +233,21 @@ void writeEEPROM(uint8_t addr,uint16_t val) {
 }\r
 \r
 int main(void){\r
-       //volatile double test=calibr_hum(20,1,20);\r
     PRR|=(1<<PRADC);  // adc for save Power\r
+       PORTA=0xFF;\r
+       PORTB=0xFF-(1<<PORTB0); //Schalter kann gegen Masse sein und zieht dann immer Strom\r
+       DDRB|=(1<<PORTB0); //Als Ausgang und 0\r
+       OWINIT();\r
+       DDRB|=(1<<PINB1);//Ausgang und 1\r
+       DDRA|=(1<<PINA0);\r
+       \r
+       WDTCSR |= ((1<<WDCE) );   // Enable the WD Change Bit//| (1<<WDE)\r
+       WDTCSR |=   (1<<WDIE) |              // Enable WDT Interrupt\r
+       //(1<<WDP0) |(1<<WDP2) | (1<<WDP1);    // Set Timeout to ~2 seconds\r
+       (1<<WDP3) | (1<<WDP0);    // Set Timeout to ~8 seconds\r
+\r
+       MCUSR=0;\r
+\r
        pack1.temp=0x0550;\r
        pack1.config=0x7F;\r
        pack1.TH=75;\r
@@ -219,17 +255,7 @@ int main(void){
        pack1.rrFF=0xFF;\r
        pack1.rr00=0;\r
        pack1.rr10=0x10;\r
-       PORTA=0xFF;\r
-       PORTB=0xFF;\r
-       OWINIT();\r
-       PORTB|=(1<<PINB1);\r
-       DDRB|=(1<<PINB1);\r
-       PORTA|=(1<<PINA0);\r
-       DDRA|=(1<<PINA0);\r
-       \r
-       MCUCR &=~(1<<PUD); //All Pins Pullup...\r
-       MCUCR |=(1<<BODS);\r
-       \r
+\r
        pack2.cmode=0;\r
        pack2.R0=readEEPROM(EEPROM_R0,1);\r
        R0=pack2.R0/100.0;\r
@@ -242,17 +268,16 @@ int main(void){
                weekmaxarr[i]=pack2.r_week_max;\r
        }\r
 \r
-       WDTCSR |= ((1<<WDCE) );   // Enable the WD Change Bit//| (1<<WDE)\r
-       WDTCSR |=   (1<<WDIE) |              // Enable WDT Interrupt\r
-       //(1<<WDP0) |(1<<WDP2) | (1<<WDP1);    // Set Timeout to ~2 seconds\r
-       (1<<WDP3) | (1<<WDP0);    // Set Timeout to ~8 seconds\r
+       if (testSW()) {\r
+               config_info2[5]=8;\r
+       }else{\r
+               config_info2[5]=7;\r
+       }\r
 \r
-       MCUSR=0;\r
        USI_TWI_Master_Initialise();\r
        \r
-       SHT2x_SoftReset();\r
-       SHT2x_ReadUserRegister(userRegister);\r
-       SHT2x_WriteUserRegister(userRegister); //write changed user reg\r
+       initSHT2x();\r
+       _delay_ms(100);\r
        MAX1164x_config(MAX1164x_S_SEL2|MAX1164x_S_SEL0,CH0_M);//#define MAX1164x_C_CS0\r
        _delay_ms(30); //Internal Referenz start\r
        //2970 -> 1,5V  \r
@@ -290,6 +315,7 @@ int main(void){
                                weekmaxarr[7]=pack2.r_day_max;\r
                                for(uint8_t i=0;i<7;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
                                }\r
                                if (pack2.tol_d>7) {\r
@@ -297,7 +323,8 @@ int main(void){
                                } else {\r
                                        pack2.R0=pack2.r_day_max;\r
                                }\r
-                               R0=pack2.R0/100.0-0.5*(pack2.R0/100-R0);\r
+                               //R0=//R0-0.5*(pack2.R0/100-R0);\r
+                               R0=R0-(R0-pack2.R0/100.0)*0.5   ;\r
                                pack2.R0=R0*100;\r
                                writeEEPROM(EEPROM_R0,pack2.R0);\r
                                writeEEPROM(EEPROM_R0d,pack2.r_day_max);  //Maximum des Tages\r
@@ -306,29 +333,34 @@ int main(void){
                                pack2.r_day_max=0;\r
                        }\r
                        if (startup!=0) startup--;\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
+                       getSHT2xHumTemp(&temperatureC,&humidityRH);\r
                        ip=interp(temperatureC,humidityRH);\r
                        pack2.ip=ip*1000;\r
-                       humidityRH=calibr_hum(temperatureC,-0.45,humidityRH)*10.0;\r
+                       double RH=calibr_hum(temperatureC,-0.2,humidityRH)*10.0;\r
                        //humidityRH=humidityRH*10.0;\r
-                       temperatureC =temperatureC *10.0-4.5;\r
-                       hhum=(1.0546-0.000216*temperatureC)*(humidityRH);\r
-                       am2302_hum=0.318*hhum +76.0;\r
-                       am2302_temp=temperatureC*25.6;\r
+                       double TC =temperatureC *10.0-2;\r
+\r
+\r
+                       if (testSW()) {\r
+                                am2302_hum=RH*10.0;\r
+                                am2302_temp=TC*25.6;\r
+                                //am2302_temp=am2302_temp-45;\r
+                                config_info2[5]=8;     \r
+                       }else{\r
+                               hhum=(1.0546-0.000216*TC)*(RH);\r
+                               //am2302_hum=0.318*hhum +76.0;\r
+                               am2302_hum=0.31*hhum +80;\r
+                               am2302_temp=TC*25.6;\r
+                               config_info2[5]=7;\r
+                       }\r
                        //PORTB&=~(1<<PINB1);\r
                        mr=0;\r
 //Kritische Sektion !___Ein Breakpoint in dieser Section kann den TGS8100 zerstoeren!___________________________\r
-                       PORTB&=~(1<<PINB1);\r
+                       PORTB&=~(1<<PINB1); //Auf 0 Ziehen\r
                        _delay_us(150);\r
                        mr+=MAX1164x_read();\r
                        _delay_us(150);\r
                        mr+=MAX1164x_read();\r
-                       \r
                        PORTB|=(1<<PINB1);\r
 //ENDE Kritische Sektion !______________________________\r
                        //l=mr/2.0*2.048/4096; \r
@@ -354,7 +386,6 @@ int main(void){
                                \r
                                \r
                        }\r
-                       //hr=l*10000.0;\r
                        pack2.VS=mr*5/2;\r
                        l=mr/4000.0;\r
                        l=( 3/l- 1) *30;\r
@@ -372,13 +403,9 @@ int main(void){
                                if (l*100>pack2.r_day_max) {\r
                                        pack2.r_day_max=l*100;\r
                                }\r
-                       }\r
-                        l=l/R0;\r
-                       l=log(1/l);\r
-                       l=l*160*4; //fuer DS18B20\r
-               //      if (l>500) {\r
-               //              l=100;\r
-               //      }\r
+                       } else if (l<R0) l=R0; //negative Werte am Anfang verhintern\r
+                       l=exp((1-(l/R0))*6.05);// exp((1-($val)/55)*5.75);  (5.75 geht über 125 6.05 geht bis 240... mittlere Linie im Datenblatt)\r
+                       l=l*8; //fuer DS18B20\r
                        wdcounter=0;\r
                        \r
                }\r
Simulation of 1-Wire Devices on an Atmel AVR