X-Git-Url: https://git.smho.de/gw/?p=owSlave2.git;a=blobdiff_plain;f=DS18B20_VOC_DS2438_SHT%2FDS18B20_DS2438.c;h=03d0e68610561bccc638ca10e35bf1b1433f6e77;hp=3726641dd98ceb3eb2b35be3912a1e182ee04f6d;hb=refs%2Fheads%2Fmaster;hpb=485bc58764a5b2a1296dee25aadb42316e8defe0

diff --git a/DS18B20_VOC_DS2438_SHT/DS18B20_DS2438.c b/DS18B20_VOC_DS2438_SHT/DS18B20_DS2438.c
index 3726641..03d0e68 100644
--- a/DS18B20_VOC_DS2438_SHT/DS18B20_DS2438.c
+++ b/DS18B20_VOC_DS2438_SHT/DS18B20_DS2438.c
@@ -62,6 +62,7 @@ extern uint8_t mode;
 extern uint8_t gcontrol;
 extern uint8_t reset_indicator;
 extern uint8_t alarmflag;
+extern uint8_t cpsp;
 volatile uint8_t wdcounter=1;
 
 
@@ -108,8 +109,7 @@ typedef union {
 		uint8_t threshold; //8
 		
 		uint8_t page1[8]; //9
-		#if  defined(__AVR_ATtiny25__)
-		#else
+		
 		uint8_t page2[8]; //17
 		union{ 
 			uint8_t page3[8]; //25
@@ -130,11 +130,22 @@ typedef union {
 				uint16_t r_week_max;
 			};
 		};
-		uint8_t page5[8];  //41
-		uint8_t page6[8];  //49
+		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
 		
-		#endif
 	};
 } pack2_t;
 volatile pack2_t pack2;
@@ -157,7 +168,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) {
@@ -199,6 +210,12 @@ int testSW(void) {
 #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;
@@ -264,15 +281,20 @@ int main(void){
 	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++) {
+	for(uint8_t i=0;i<32;i++) {
 		weekmaxarr[i]=pack2.r_week_max;
 	}
 
+	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);
 	if (testSW()) {
 		config_info2[5]=12;
 	}else{
 		config_info2[5]=7;
 	}
+	
 
 	USI_TWI_Master_Initialise();
 	
@@ -285,46 +307,64 @@ int main(void){
 	sei();
 	//DDRB|=(1<<PINB1);
     while(1)   {
-		if (pack1.config==0x1F) {  //Reset R0
+		if ((cpsp&0x80)!=0) {
+			if ((cpsp&0x0F)==5) {
+				if (pack2.reset_code==0x01) {
+					pack1.config=0x7F;
+					R0=1;
+					pack2.R0=0;
+					writeEEPROM(EEPROM_R0,0);
+				} else if (pack2.reset_code==0x05) {
+					pack1.config=0x7F;
+					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<pack2.days_of_r0;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 (pack1.config==0x1F) {  //Reset R0
 			pack1.config=0x7F;
 			R0=1;
 			pack2.R0=0;
 			writeEEPROM(EEPROM_R0,0);
 		} 
 		if (pack1.config==0x05) {  //Reset all Data
-			pack1.config=0x7F;				
-			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;
-			}				
-		} 
+		} */
 		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;
 				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];
 				}
-				if (pack2.tol_d>7) {
+				if (pack2.tol_d>pack2.days_of_r0) {
 					pack2.R0=pack2.r_week_max;
 				} else {
 					pack2.R0=pack2.r_day_max;
 				}
 				//R0=//R0-0.5*(pack2.R0/100-R0);
-				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
@@ -401,14 +441,22 @@ 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)-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
+			//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*(double)pack2.corr_VOC_mult/(double)pack2.corr_VOC_div;
+			//l=pow(R0/l,1.8)*3-3;
+			if (l!=0) {
+				l=R0/l;
+				l=l*l*12-12;
+				l=l*(double)pack2.corr_VOC_mult/(double)pack2.corr_VOC_div;
+				l=l*8.0; //fuer DS18B20*/
+			}
+
+			//l=(l/R0*100.0); 
 			wdcounter=0;
 			
 		}
 	
-		if (gcontrol==1) {
+		if ((gcontrol&1)==1) {
 			uint16_t w=l;
 			uint8_t t8=w>>4;
 			uint8_t af=0;