New 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..d4dbcc0 100644 (file)
--- a/DS18B20_BMP280_DS2438_SHT/DS18B20_DS2438.c
+++ b/DS18B20_BMP280_DS2438_SHT/DS18B20_DS2438.c
@@ -229,7 +229,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 +238,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