X-Git-Url: https://git.smho.de/gw/?p=owSlave2.git;a=blobdiff_plain;f=DS2438_VOC_DS2438_SHT_Wiregate%2FDS2438_DS2438.c;fp=DS2438_VOC_DS2438_SHT_Wiregate%2FDS2438_DS2438.c;h=05b8a2856b0830463dea6decc685f0290d772e7d;hp=00a58ef7e3b7c07dc466a7d2a122ff5e1de974e4;hb=2490e261a78b2a98ee2a9b8fc19cb3f20225926b;hpb=45806622c08cded7d77c9c9735c433de5f7fa027

diff --git a/DS2438_VOC_DS2438_SHT_Wiregate/DS2438_DS2438.c b/DS2438_VOC_DS2438_SHT_Wiregate/DS2438_DS2438.c
index 00a58ef..05b8a28 100644
--- a/DS2438_VOC_DS2438_SHT_Wiregate/DS2438_DS2438.c
+++ b/DS2438_VOC_DS2438_SHT_Wiregate/DS2438_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 cpsp2;
 
 
 typedef union {
@@ -125,23 +126,50 @@ typedef union {
 		uint8_t threshold; //8
 		
 		uint8_t page1[8]; //9
-		#if  defined(__AVR_ATtiny25__)
-		#else
+		
 		uint8_t page2[8]; //17
 		uint8_t page3[8]; //25
 		
-		uint8_t page4[8];  //33
-		uint8_t page5[8];  //41
-		uint8_t page6[8];  //49
+		union{
+			uint8_t page4[8];  //33
+			struct {
+				uint16_t tol_s8;
+				uint16_t tol_d;
+				uint16_t r_day_max;
+				uint16_t r_week_max;
+			};
+		};
+		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];
+		};
+		union{
+			uint8_t page6[8]; //25
+			struct {
+				uint16_t R0;
+				uint16_t VS;
+				uint8_t cmode;
+				int16_t ip;
+				uint8_t free;
+			};
+		};
 		uint8_t page7[8];  //57
 		
-		#endif
 	};
 } pack2_t;
 volatile pack2_t pack2;
 
-#define TIME_CORR 5
-volatile int8_t time_corr_count=TIME_CORR;
+//#define TIME_CORR 3
+volatile int8_t time_corr_count;//=TIME_CORR;
 
 #if  defined(__AVR_ATtiny24__)||defined(__AVR_ATtiny44__)  || defined(__AVR_ATtiny84__) || defined(__AVR_ATtiny24A__)||defined(__AVR_ATtiny44A__)  || defined(__AVR_ATtiny84A__)
 ISR(WATCHDOG_vect) {
@@ -156,7 +184,7 @@ ISR(WATCHDOG_vect) {
 			if (time_corr_count<=0) {
 				//wdcounter++;
 				pack1.etm+=1;
-				time_corr_count=TIME_CORR;
+				time_corr_count=pack2.time_corr;
 			}
 	/*	if ((pack1.page1[0]&0x0F)==0) {
 			 pack1.etm+=2;
@@ -174,15 +202,6 @@ ISR(WATCHDOG_vect) {
 
 
 
-uint16_t pR0;
-uint16_t pVS;
-uint8_t pcmode;
-int16_t pip;
-
-uint16_t ptol_s8;
-uint16_t ptol_d;
-uint16_t pr_day_max;
-uint16_t pr_week_max;
 
 
 volatile int16_t DS2438_1_TEMP;
@@ -202,7 +221,7 @@ uint8_t max_adr=0;
 #define CH0_CH1 MAX1164x_C_SCAN0
 //|MAX1164x_C_CS0
 
-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) {
@@ -243,6 +262,10 @@ int testSW(void) {
 #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) {
@@ -295,18 +318,25 @@ int main(void){
 
 	pack1.temp=0x0550;
 	pack2.page3[0]=0xF1;
-	pcmode=0;
-	pR0=readEEPROM(EEPROM_R0,1);
-	R0=pR0/100.0;
+	pack2.cmode=0;
+	pack2.R0=readEEPROM(EEPROM_R0,1);
+	R0=pack2.R0/100.0;
 		
-	pr_day_max=readEEPROM(EEPROM_R0d,1);
-	pr_week_max=readEEPROM(EEPROM_R0w,1);
-	ptol_d=readEEPROM(EEPROM_dol,0); 
-	ptol_s8=0;  //Tag faengt mit Einschalten an
-	for(uint8_t i=0;i<7;i++) {
-		weekmaxarr[i]=pr_week_max;
-	}
+	pack2.r_day_max=readEEPROM(EEPROM_R0d,1);
+	pack2.r_week_max=readEEPROM(EEPROM_R0w,1);
+	pack2.tol_d=readEEPROM(EEPROM_dol,0); 
+	pack2.tol_s8=0;  //Tag faengt mit Einschalten an
+	
 
+	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);
+	time_corr_count=pack2.time_corr;
+
+	for(uint8_t i=0;i<pack2.days_of_r0;i++) {
+		weekmaxarr[i]=pack2.r_week_max;
+	}
 	if (testSW()) {
 		config_info2[5]=12;
 	}else{
@@ -323,60 +353,69 @@ int main(void){
 	sei();
 	//DDRB|=(1<<PINB1);
     while(1)   {
-/*		if (pack1.config==0x1F) {  //Reset R0
-			pack1.config=0x7F;
-			R0=1;
-			pR0=0;
-			writeEEPROM(EEPROM_R0,0);
-		} 
-		if (pack1.config==0x05) {  //Reset all Data
-			pack1.config=0x7F;				
-			pr_day_max=1;
-			pr_week_max=1;
-			ptol_d=0;
-			ptol_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;
-			}				
-		} */
+			if ((cpsp2&0x80)!=0) {
+				if ((cpsp2&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);
+					}
+				}
+				cpsp2=0;
+		}
 		if (wdcounter>0) {  //8s
-			ptol_s8++;
+			pack2.tol_s8++;
 			
 			//pack1.dis+=8;
 			//pack1.eoc+=8;
-			if (ptol_s8>(10000))  {//10800 ist theortisch der Tag aber meistens zu lang
-				ptol_s8=0;
-				ptol_d++;  //rund 180 Jahre :-)
-				pr_week_max=0;
-				weekmaxarr[7]=pr_day_max;
-				for(uint8_t i=0;i<7;i++) {
+			if (pack2.tol_s8>(10000))  {//10800 ist theortisch der Tag aber meistens zu lang
+				pack2.tol_s8=0;
+				pack2.tol_d++;  //rund 180 Jahre :-)
+				pack2.r_week_max=0;
+				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]>pr_week_max) pr_week_max=weekmaxarr[i];
+					if (weekmaxarr[i]>pack2.r_week_max) pack2.r_week_max=weekmaxarr[i];
 				}
-				if (ptol_d>7) {
-					pR0=pr_week_max;
+				if (pack2.tol_d>pack2.days_of_r0) {
+					pack2.R0=pack2.r_week_max;
 				} else {
-					pR0=pr_day_max;
+					pack2.R0=pack2.r_day_max;
 				}
 				//R0=//R0-0.5*(pack2.R0/100-R0);
-				R0=R0-(R0-pR0/100.0)*0.5	;
-				pR0=R0*100;
-				writeEEPROM(EEPROM_R0,pR0);
-				writeEEPROM(EEPROM_R0d,pr_day_max);  //Maximum des Tages
-				writeEEPROM(EEPROM_R0w,pr_week_max); //Maximum der Letzten 7 Tage
-				writeEEPROM(EEPROM_dol,ptol_d); //Anzahl der Betriebstage
-				pr_day_max=0;
+				//R0=R0-(R0-pack2.R0/100.0)*0.5	;
+				R0=pack2.R0/100.0;
+				pack2.R0=R0*100;
+				writeEEPROM(EEPROM_R0,pack2.R0);
+				writeEEPROM(EEPROM_R0d,pack2.r_day_max);  //Maximum des Tages
+				writeEEPROM(EEPROM_R0w,pack2.r_week_max); //Maximum der Letzten 7 Tage
+				writeEEPROM(EEPROM_dol,pack2.tol_d); //Anzahl der Betriebstage
+				pack2.r_day_max=0;
 			}
 			if (startup!=0) startup--;
 			getSHT2xHumTemp(&temperatureC,&humidityRH);
 			ip=interp(temperatureC,humidityRH);
-			pip=ip*1000;
+			pack2.ip=ip*1000;
 			double RH=calibr_hum(temperatureC,-0.2,humidityRH)*10.0;
 			double TC =temperatureC *10.0-2;
 
@@ -406,27 +445,27 @@ int main(void){
 			//l=mr/2.0*2.048/4096; 
 			// l maximal 2  mr max 4096  //mr 2V=8000 
 			
-			if (pcmode) { //cmode=0 V 0..2 V cmode=1 V 1.5..3.5V
+			if (pack2.cmode) { //cmode=0 V 0..2 V cmode=1 V 1.5..3.5V
 				//l+=1.5; //Spannung real
 				mr+=6000;
 			} 
 			//if (l>1.8) {
 			if (mr>7200) {				
-				if (pcmode==0) {
+				if (pack2.cmode==0) {
 					MAX1164x_config(MAX1164x_S_SEL2|MAX1164x_S_SEL0,CH0_CH1);
-					pcmode=1;
+					pack2.cmode=1;
 				}
 			}
 			//if (l<1.6) {
 			if (mr<6400) {	
-				if (pcmode==1) {
+				if (pack2.cmode==1) {
 					MAX1164x_config(MAX1164x_S_SEL2|MAX1164x_S_SEL0,CH0_M);
-					pcmode=0;
+					pack2.cmode=0;
 				}
 				
 				
 			}
-			pVS=mr*5/2;
+			pack2.VS=mr*5/2;
 			l=mr/4000.0;
 			l=( 3/l- 1) *30;
 			pack2.current=l*100;
@@ -436,17 +475,18 @@ int main(void){
 			if (startup==0){
 				if (l>R0) {
 					R0=l;
-					pR0=R0*100;
-					writeEEPROM(EEPROM_R0,pR0);
+					pack2.R0=R0*100;
+					writeEEPROM(EEPROM_R0,pack2.R0);
 
 				}
-				if (l*100>pr_day_max) {
-					pr_day_max=l*100;
+				if (l*100>pack2.r_day_max) {
+					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/R0*100.0);
 			l=l*0.5*35; //fuer DS2438
+			l=l*(double)pack2.corr_VOC_mult/(double)pack2.corr_VOC_div;
 			if (l==0) l=1;
 			gcontrol=1;
 			wdcounter=0;