X-Git-Url: http://git.smho.de/gw/?p=owSlave2.git;a=blobdiff_plain;f=DS18B20_VOC_DS2438_SHT%2FDS18B20_DS2438.c;fp=DS18B20_VOC_DS2438_SHT%2FDS18B20_DS2438.c;h=3726641dd98ceb3eb2b35be3912a1e182ee04f6d;hp=a85c988d89838fa7c8f6c92a68ef8555d5fd5b7f;hb=485bc58764a5b2a1296dee25aadb42316e8defe0;hpb=a07a7e7b05471927bf3046ee265792231711f8a4

diff --git a/DS18B20_VOC_DS2438_SHT/DS18B20_DS2438.c b/DS18B20_VOC_DS2438_SHT/DS18B20_DS2438.c
index a85c988..3726641 100644
--- a/DS18B20_VOC_DS2438_SHT/DS18B20_DS2438.c
+++ b/DS18B20_VOC_DS2438_SHT/DS18B20_DS2438.c
@@ -269,7 +269,7 @@ int main(void){
 	}
 
 	if (testSW()) {
-		config_info2[5]=8;
+		config_info2[5]=12;
 	}else{
 		config_info2[5]=7;
 	}
@@ -285,13 +285,13 @@ int main(void){
 	sei();
 	//DDRB|=(1<<PINB1);
     while(1)   {
-		if (pack1.config==0x1F) {
+		if (pack1.config==0x1F) {  //Reset R0
 			pack1.config=0x7F;
 			R0=1;
 			pack2.R0=0;
 			writeEEPROM(EEPROM_R0,0);
 		} 
-		if (pack1.config==0x05) {
+		if (pack1.config==0x05) {  //Reset all Data
 			pack1.config=0x7F;				
 			pack2.r_day_max=1;
 			pack2.r_week_max=1;
@@ -306,7 +306,7 @@ int main(void){
 				weekmaxarr[i]=1;
 			}				
 		} 
-		if (wdcounter>0) {
+		if (wdcounter>0) {  //8s
 			pack2.tol_s8++;
 			if (pack2.tol_s8>(10000))  {//10800 ist theortisch der Tag aber meistens zu lang
 				pack2.tol_s8=0;
@@ -337,15 +337,13 @@ int main(void){
 			ip=interp(temperatureC,humidityRH);
 			pack2.ip=ip*1000;
 			double RH=calibr_hum(temperatureC,-0.2,humidityRH)*10.0;
-			//humidityRH=humidityRH*10.0;
 			double TC =temperatureC *10.0-2;
 
 
 			if (testSW()) {
-				 am2302_hum=RH*10.0;
+				 am2302_hum=RH;
 				 am2302_temp=TC*25.6;
-				 //am2302_temp=am2302_temp-45;
-				 config_info2[5]=8;	
+				 config_info2[5]=12;	//10V = 100%
 			}else{
 				hhum=(1.0546-0.000216*TC)*(RH);
 				//am2302_hum=0.318*hhum +76.0;
@@ -353,7 +351,6 @@ int main(void){
 				am2302_temp=TC*25.6;
 				config_info2[5]=7;
 			}
-			//PORTB&=~(1<<PINB1);
 			mr=0;
 //Kritische Sektion !___Ein Breakpoint in dieser Section kann den TGS8100 zerstoeren!___________________________
 			PORTB&=~(1<<PINB1); //Auf 0 Ziehen
@@ -404,7 +401,8 @@ int main(void){
 					pack2.r_day_max=l*100;
 				}
 			} else if (l<R0) l=R0; //negative Werte am Anfang verhintern
-			l=exp((1-(l/R0))*6.05);// exp((1-($val)/55)*5.75);  (5.75 geht über 125 6.05 geht bis 240... mittlere Linie im Datenblatt)
+			l=exp((1-(l/R0))*6.05)-1;// exp((1-($val)/55)*5.75);  (5.75 geht über 125 6.05 geht bis 240... mittlere Linie im Datenblatt)
+			//l=(l/R0*100.0);
 			l=l*8; //fuer DS18B20
 			wdcounter=0;