4MHz - Some New double Double Devices

[owSlave2.git] / DS18B20_BMP280_DS2438_SHT / DS18B20_DS2438.c

diff --git a/DS18B20_BMP280_DS2438_SHT/DS18B20_DS2438.c b/DS18B20_BMP280_DS2438_SHT/DS18B20_DS2438.c
index f7261e3..e379db8 100644 (file)
--- a/DS18B20_BMP280_DS2438_SHT/DS18B20_DS2438.c
+++ b/DS18B20_BMP280_DS2438_SHT/DS18B20_DS2438.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
@@ -48,8 +48,10 @@ extern void EXTERN_SLEEP();
 \r
 uint8_t owid1[8]={0x28, 0xA3, 0xD9, 0x84, 0x00, 0x16, 0x05, 0x18};/**/\r
 uint8_t owid2[8]={0x26, 0xA3, 0xD9, 0x84, 0x00, 0x16, 0x05, 0x67};/**/\r
-uint8_t config_info1[16]={0x02,0x03, 0x00,0x00, 0x00,0x00, 0x00,0x00, 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00};        \r
-uint8_t config_info2[16]={0x01,0x06, 0x05,0x08, 0x04,0x07, 0x00,0x00, 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00};        \r
+\r
+uint8_t config_info1[26]={0x02,0x03, 0x00,0x00, 0x00,0x00, 0x00,0x00, 0x02,14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};\r
+uint8_t config_info2[26]={0x01,0x06, 0x05,0x08, 0x04,0x07, 0x00,0x00, 0x02,7,0x00,7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};\r
+\r
        \r
 #if (owid>128) \r
 #error "Variable not correct"\r
@@ -192,7 +194,7 @@ int main(void){
                }else{\r
                config_info2[5]=7;\r
        }\r
-       \r
+       pack2.page3[0]=0xF1;\r
 \r
        MCUSR=0;\r
        USI_TWI_Master_Initialise();\r
@@ -229,7 +231,7 @@ int main(void){
                         if (testSW()) {\r
                                 am2302_hum= humidityRH*10.0;\r
                                 am2302_temp=temperatureC*25.6;\r
-                                am2302_temp=am2302_temp-20;\r
+                                //am2302_temp=am2302_temp-20;\r
                                 config_info2[5]=8;\r
                                 \r
                                 }else{\r
@@ -238,13 +240,13 @@ int main(void){
                                 //am2302_hum=0.318*hhum +76.0;\r
                                 am2302_hum=0.31*hhum +80;\r
                                 am2302_temp=temperatureC*25.6;\r
-                                am2302_temp=am2302_temp-20;\r
+                                //am2302_temp=am2302_temp-20;\r
                                 config_info2[5]=7;\r
                         }\r
                        wdcounter=0;\r
                }\r
        \r
-               if (gcontrol==1) {\r
+               if ((gcontrol&1)==1) {\r
                        \r
                                bmp280ConvertInt(&t,&P,1);\r
                                P=P-70000;\r