X-Git-Url: https://git.smho.de/gw/?p=owSlave2.git;a=blobdiff_plain;f=DS18B20_VOC_DS2438_SHT%20direct%2FDS18B20_DS2438.c;fp=DS18B20_VOC_DS2438_SHT%20direct%2FDS18B20_DS2438.c;h=5b3461c4da69598b4b4cfa6f92ff60b2657401ef;hp=4448c39b6fc5a4f6ccec50189d80f99db43e4c7c;hb=2490e261a78b2a98ee2a9b8fc19cb3f20225926b;hpb=45806622c08cded7d77c9c9735c433de5f7fa027

diff --git a/DS18B20_VOC_DS2438_SHT direct/DS18B20_DS2438.c b/DS18B20_VOC_DS2438_SHT direct/DS18B20_DS2438.c
index 4448c39..5b3461c 100644
--- a/DS18B20_VOC_DS2438_SHT direct/DS18B20_DS2438.c	
+++ b/DS18B20_VOC_DS2438_SHT direct/DS18B20_DS2438.c	
@@ -63,6 +63,7 @@ extern uint8_t gcontrol;
 extern uint8_t reset_indicator;
 extern uint8_t alarmflag;
 volatile uint8_t wdcounter=1;
+extern uint8_t cpsp;
 
 
 #if  defined(__AVR_ATtiny24__)||defined(__AVR_ATtiny44__)  || defined(__AVR_ATtiny84__) || defined(__AVR_ATtiny24A__)||defined(__AVR_ATtiny44A__)  || defined(__AVR_ATtiny84A__)
@@ -74,8 +75,7 @@ ISR(WATCHDOG_vect) {
 		if (reset_indicator==1) reset_indicator++;
 		else if (reset_indicator==2) mode=0;
 
-
-	}
+}
 
 
 	typedef union {
@@ -114,11 +114,12 @@ ISR(WATCHDOG_vect) {
 			union{
 				uint8_t page3[8]; //25
 				struct {
+					uint8_t free;
 					uint16_t R0;
 					uint16_t VS;
 					uint8_t cmode;
 					int16_t ip;
-					uint8_t free;
+					
 				};
 			};
 			union{
@@ -130,7 +131,19 @@ ISR(WATCHDOG_vect) {
 					uint16_t r_week_max;
 				};
 			};
-			uint8_t page5[8];  //41
+			union{
+				uint8_t page5[8];  //41
+				struct {
+					uint8_t codeVOC; // immer 0x37 nach Neustart
+					uint8_t days_of_r0; //Anzahl der Tage fuer die r0 ermittelt wird
+					int8_t corr_VOC_mult; //r0 corr
+					int8_t corr_VOC_div;
+					uint16_t vv3;
+					uint8_t time_corr; //Wiregate;
+					uint8_t reset_code;
+				};
+				uint16_t page5d[4];
+			};
 			uint8_t page6[8];  //49
 			uint8_t page7[8];  //57
 			
@@ -152,7 +165,7 @@ ISR(WATCHDOG_vect) {
 	volatile double l;
 
 
-	uint16_t weekmaxarr[8];
+	uint16_t weekmaxarr[33];
 
 	//Kompensieren der Abhänigkeit von RS/RO von Temperatur und Luftfeuchte
 	inline double interp(double t, double h) {
@@ -190,11 +203,15 @@ ISR(WATCHDOG_vect) {
 		
 	}
 
+	
 	#define EEPROM_R0 0
 	#define EEPROM_R0d 2
 	#define EEPROM_R0w 4
 	#define EEPROM_dol 6
-
+	#define EEPROM_CODE_DAYOFR0 8
+	#define EEPROM_CORR 10
+	#define EEPROM_FREE 12
+	#define EEPROM_TCORR_RESET 14
 
 	uint16_t readEEPROM(uint8_t addr,uint16_t def) {
 		uint16_t hr;
@@ -254,6 +271,7 @@ ISR(WATCHDOG_vect) {
 		pack1.rr00=0;
 		pack1.rr10=0x10;
 
+		pack2.page3[0]=0xF1;
 		pack2.cmode=0;
 		pack2.R0=readEEPROM(EEPROM_R0,1);
 		R0=pack2.R0/100.0;
@@ -262,10 +280,17 @@ ISR(WATCHDOG_vect) {
 		pack2.r_week_max=readEEPROM(EEPROM_R0w,1);
 		pack2.tol_d=readEEPROM(EEPROM_dol,0);
 		pack2.tol_s8=0;  //Tag faengt mit Einschalten an
-		for(uint8_t i=0;i<7;i++) {
+
+		pack2.page5d[0]=readEEPROM(EEPROM_CODE_DAYOFR0,0x0437);
+		pack2.page5d[1]=readEEPROM(EEPROM_CORR,0x0101);
+		pack2.page5d[2]=readEEPROM(EEPROM_FREE,0x0);
+		pack2.page5d[3]=readEEPROM( EEPROM_TCORR_RESET,0x0005);
+
+		for(uint8_t i=0;i<pack2.days_of_r0;i++) {
 			weekmaxarr[i]=pack2.r_week_max;
 		}
 
+
 		if (testSW()) {
 			config_info2[5]=12;
 			}else{
@@ -279,7 +304,7 @@ ISR(WATCHDOG_vect) {
 		gcontrol=1;
 		sei();
 		while(1)   {
-			if (pack1.config==0x1F) {  //Reset R0
+			/*if (pack1.config==0x1F) {  //Reset R0
 				pack1.config=0x7F;
 				R0=1;
 				pack2.R0=0;
@@ -299,6 +324,34 @@ ISR(WATCHDOG_vect) {
 				for(uint8_t i=0;i<7;i++) {
 					weekmaxarr[i]=1;
 				}
+			}*/
+			if ((cpsp&0x80)!=0) {
+				if ((cpsp&0x0F)==5) {
+					if (pack2.reset_code==0x01) {
+						R0=1;
+						pack2.R0=0;
+						writeEEPROM(EEPROM_R0,0);
+					} else if (pack2.reset_code==0x05) {
+						pack2.r_day_max=1;
+						pack2.r_week_max=1;
+						pack2.tol_d=0;
+						pack2.tol_s8=0;  //Tag faengt mit Einschalten an
+						R0=1;
+						writeEEPROM(EEPROM_R0,0xFF);
+						writeEEPROM(EEPROM_R0d,0xFF);  //Maximum des Tages
+						writeEEPROM(EEPROM_R0w,0xFF); //Maximum der Letzten 7 Tage
+						writeEEPROM(EEPROM_dol,0xFF); //Anzahl der Betriebstage
+						for(uint8_t i=0;i<7;i++) {
+							weekmaxarr[i]=1;
+						}
+					} else {
+						writeEEPROM(EEPROM_CODE_DAYOFR0,0x0037|(pack2.days_of_r0<<8));
+						writeEEPROM(EEPROM_CORR,pack2.page5d[1]);
+						writeEEPROM(EEPROM_FREE,pack2.page5d[2]);
+						writeEEPROM(EEPROM_TCORR_RESET,pack2.time_corr);
+					}
+				}
+				cpsp=0;
 			}
 			if (wdcounter>0) {  //8s
 				pack2.tol_s8++;
@@ -306,8 +359,8 @@ ISR(WATCHDOG_vect) {
 					pack2.tol_s8=0;
 					pack2.tol_d++;  //rund 180 Jahre :-)
 					pack2.r_week_max=0;
-					weekmaxarr[7]=pack2.r_day_max;
-					for(uint8_t i=0;i<7;i++) {
+					weekmaxarr[pack2.days_of_r0]=pack2.r_day_max;
+					for(uint8_t i=0;i<pack2.days_of_r0;i++) {
 						weekmaxarr[i]=weekmaxarr[i+1];
 						//maximum of week
 						if (weekmaxarr[i]>pack2.r_week_max) pack2.r_week_max=weekmaxarr[i];
@@ -330,8 +383,10 @@ ISR(WATCHDOG_vect) {
 				getSHT2xHumTemp(&temperatureC,&humidityRH);
 				ip=interp(temperatureC,humidityRH);
 				pack2.ip=ip*1000;
-				double RH=calibr_hum(temperatureC,-0.2,humidityRH)*10.0;
-				double TC =temperatureC *10.0-2;
+				//double RH=calibr_hum(temperatureC,-0.2,humidityRH)*10.0;
+				//double TC =temperatureC *10.0-2;
+				double RH=humidityRH*10.0;
+				double TC=temperatureC*10.0;
 
 
 				if (testSW()) {
@@ -387,9 +442,17 @@ ISR(WATCHDOG_vect) {
 						pack2.r_day_max=l*100;
 					}
 				} else if (l<R0) l=R0; //negative Werte am Anfang verhintern
-				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*8.0; //fuer DS18B20*/
+				//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=pow(R0/l,1.8)*3-3; 
+				if (l!=0) {
+					l=R0/l;
+					//l=l*l*12-12;
+					l=exp((1-(1/l))*6.05)-1;
+					l=l*(double)pack2.corr_VOC_mult/(double)pack2.corr_VOC_div;
+					l=l*8.0; //fuer DS18B20*/
+				}	
 				wdcounter=0;
+
 				
 			}