X-Git-Url: https://git.smho.de/gw/?a=blobdiff_plain;f=DS18B20_MAX44009_DS2438_SHT%2FDS18B20_DS2438.c;h=4e8d28bce9d183579f43cecb1b9d2a697ec90685;hb=2490e261a78b2a98ee2a9b8fc19cb3f20225926b;hp=f1d01bea62844fef8d942926559cff6dcab5883a;hpb=a6a04f58e4afd20f206fdf4a8a7b3ce4062f1b67;p=owSlave2.git

diff --git a/DS18B20_MAX44009_DS2438_SHT/DS18B20_DS2438.c b/DS18B20_MAX44009_DS2438_SHT/DS18B20_DS2438.c
index f1d01be..4e8d28b 100644
--- a/DS18B20_MAX44009_DS2438_SHT/DS18B20_DS2438.c
+++ b/DS18B20_MAX44009_DS2438_SHT/DS18B20_DS2438.c
@@ -1,5 +1,5 @@
 
-// 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
@@ -49,8 +49,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]={0x03,0x04, 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]={0x03,0x04, 0x00,0x00, 0x00,0x00, 0x00,0x00, 0x02,15,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"
@@ -186,6 +188,7 @@ int main(void){
 		config_info2[5]=7;
 	}
 	MCUSR=0;
+	sei();
 	USI_TWI_Master_Initialise();
 	if (checkMAX44009(0)) max_adr=0; else max_adr=1 ;
 	SHT2x_SoftReset();
@@ -204,9 +207,9 @@ int main(void){
 	sei();
 	//DDRB|=(1<<PINB1);
     while(1)   {
-		if ((gcontrol==2)||(gcontrol==3)) {
+		if ((gcontrol&2)==2){
 			wdcounter=3;
-			gcontrol=0;
+			
 			
 		}
 		
@@ -216,7 +219,7 @@ int main(void){
 			// --- measure temperature with "Polling Mode" (no hold master) ---
 			SHT2x_MeasurePoll(TEMP, &sT);
 			//-- calculate humidity and temperature --
-			temperatureC = SHT2x_CalcTemperatureC(sT)*10.0-4;
+			temperatureC = SHT2x_CalcTemperatureC(sT)*10.0-2;
 			humidityRH = SHT2x_CalcRH(sRH)*10.0+5;
 			if (humidityRH>1000) humidityRH=1000;
 			if (testSW()) {
@@ -237,7 +240,7 @@ int main(void){
 			wdcounter=0;
 		}
 	
-		if (gcontrol==1) {
+		if ((gcontrol&1)==1) {
 			gcontrol=0;
 			l=MAX44009getlux(max_adr);		
 			if (l<0.030) l=0.030; //Darf nicht 0 sein. minimum -35°C Sensor minimum 0.045