X-Git-Url: http://git.smho.de/?a=blobdiff_plain;f=DS18B20_BMP280_DS2438_SHT%2FDS18B20_DS2438.c;h=191de8f5e376f9269024ab9d8aadcdbd67a39c69;hb=0cfac594b8129d2ec9f134432bf4c8cf25f5b819;hp=f7261e39974e18c2b63db0278c43ee1284bb4f4e;hpb=a6a04f58e4afd20f206fdf4a8a7b3ce4062f1b67;p=owSlave2.git

diff --git a/DS18B20_BMP280_DS2438_SHT/DS18B20_DS2438.c b/DS18B20_BMP280_DS2438_SHT/DS18B20_DS2438.c
index f7261e3..191de8f 100644
--- 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
+// Copyright (c) 2017, Tobias Mueller tm(at)tm3d.de
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -48,8 +48,10 @@ extern void EXTERN_SLEEP();
 
 uint8_t owid1[8]={0x28, 0xA3, 0xD9, 0x84, 0x00, 0x16, 0x05, 0x18};/**/
 uint8_t owid2[8]={0x26, 0xA3, 0xD9, 0x84, 0x00, 0x16, 0x05, 0x67};/**/
-uint8_t config_info1[16]={0x02,0x03, 0x00,0x00, 0x00,0x00, 0x00,0x00, 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00};	
-uint8_t config_info2[16]={0x01,0x06, 0x05,0x08, 0x04,0x07, 0x00,0x00, 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00};	
+
+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};
+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};
+
 	
 #if (owid>128) 
 #error "Variable not correct"
@@ -229,7 +231,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 +240,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;