X-Git-Url: http://git.smho.de/gw/?p=owSlave2.git;a=blobdiff_plain;f=DS18B20_BMP280_DS2438_SHT%2FDS18B20_DS2438.c;h=d4dbcc0629eda8ade6de32e6b98db8d8881389de;hp=f7261e39974e18c2b63db0278c43ee1284bb4f4e;hb=3f2aceaf525eeceff3baece206b2048bbf286c40;hpb=1624c8ce9acb762d2cdc0b2f6b064448561ff752

diff --git a/DS18B20_BMP280_DS2438_SHT/DS18B20_DS2438.c b/DS18B20_BMP280_DS2438_SHT/DS18B20_DS2438.c
index f7261e3..d4dbcc0 100644
--- 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()) {
 				 am2302_hum= humidityRH*10.0;
 				 am2302_temp=temperatureC*25.6;
-				 am2302_temp=am2302_temp-20;
+				 //am2302_temp=am2302_temp-20;
 				 config_info2[5]=8;
 				 
 				 }else{
@@ -238,13 +238,13 @@ int main(void){
 				 //am2302_hum=0.318*hhum +76.0;
 				 am2302_hum=0.31*hhum +80;
 				 am2302_temp=temperatureC*25.6;
-				 am2302_temp=am2302_temp-20;
+				 //am2302_temp=am2302_temp-20;
 				 config_info2[5]=7;
 			 }
 			wdcounter=0;
 		}
 	
-		if (gcontrol==1) {
+		if ((gcontrol&1)==1) {
 			
 				bmp280ConvertInt(&t,&P,1);
 				P=P-70000;