X-Git-Url: https://git.smho.de/gw/?p=owSlave2.git;a=blobdiff_plain;f=DS18B20_VOC_DS2438_SHT%20direct%2FDS18B20_DS2438.c;h=2522a0ee013d948722ba6acc08e974506eaba1e6;hp=4448c39b6fc5a4f6ccec50189d80f99db43e4c7c;hb=refs%2Fheads%2Fmaster;hpb=485bc58764a5b2a1296dee25aadb42316e8defe0

diff --git a/DS18B20_VOC_DS2438_SHT direct/DS18B20_DS2438.c b/DS18B20_VOC_DS2438_SHT direct/DS18B20_DS2438.c
index 4448c39..2522a0e 100644
--- a/DS18B20_VOC_DS2438_SHT direct/DS18B20_DS2438.c	
+++ b/DS18B20_VOC_DS2438_SHT direct/DS18B20_DS2438.c	
@@ -42,9 +42,9 @@
 #include "../common/I2C/USI_TWI_Master.h"
 #include "../common/I2C/SHT2xV2.h"
 #include "../common/calibr.h"
+#include "../common/owSlave_tools.h"
 
-extern void OWINIT(void);
-extern void EXTERN_SLEEP(void);
+OWST_EXTERN_VARS
 
 
 
@@ -58,24 +58,11 @@ volatile uint8_t config_info2[26]={0x01,0x06, 0x05,0x08, 0x04,0x07, 11,0x08, 0x0
 #error "Variable not correct"
 #endif
 
-extern uint8_t mode;
-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__)
-ISR(WATCHDOG_vect) {
-	#else
-	ISR(WDT_vect) {
-		#endif
-		wdcounter++;
-		if (reset_indicator==1) reset_indicator++;
-		else if (reset_indicator==2) mode=0;
+OWST_WDT_ISR
 
 
-	}
 
 
 	typedef union {
@@ -114,11 +101,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 +118,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
 			
@@ -142,17 +142,18 @@ ISR(WATCHDOG_vect) {
 
 
 
-	volatile int16_t am2302_temp;
-	volatile uint16_t am2302_hum;
+	volatile int16_t DS2438_2_TEMP;
+	volatile uint16_t DS2438_2_VAD;
+	volatile uint16_t DS2438_2_VDD=0x01F4;
+
+	OWST_TESTSW
 
 
-	uint8_t userRegister[1];
-	int16_t sRH,sT;
 	double temperatureC,humidityRH,hhum;
 	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) {
@@ -170,31 +171,16 @@ ISR(WATCHDOG_vect) {
 	double la[4];
 	uint8_t lainit=1;
 
-	int testSW(void) {
-		uint8_t r;
-		DDRB&=~(1<<PORTB0);  //Eingang
-		__asm__ __volatile__ ("nop");
-		PORTB|=(1<<PORTB0); //Pullup
-		__asm__ __volatile__ ("nop");
-		__asm__ __volatile__ ("nop");
-		__asm__ __volatile__ ("nop");
-		__asm__ __volatile__ ("nop");
-		__asm__ __volatile__ ("nop");
-		r=PINB&(1<<PORTB0);
-		__asm__ __volatile__ ("nop");
-		PORTB&=~(1<<PORTB0);
-		__asm__ __volatile__ ("nop");
-		DDRB|=(1<<PORTB0);  //Eingang
-		return (r==0);  //Offen mal HIH4030
-		
-		
-	}
 
+	
 	#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 +240,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 +249,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;
 		}
 
+		for(uint8_t i=0;i<8;i++) pack2.page6[i]=owid1[i];
 		if (testSW()) {
 			config_info2[5]=12;
 			}else{
@@ -279,26 +273,34 @@ ISR(WATCHDOG_vect) {
 		gcontrol=1;
 		sei();
 		while(1)   {
-			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 ((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 +308,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,19 +332,20 @@ 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()) {
-					am2302_hum=RH;
-					am2302_temp=TC*25.6;
+					DS2438_2_VAD=RH;
+					DS2438_2_TEMP=TC*25.6;
 					config_info2[5]=12;	//10V = 100%
 				}else{
 					hhum=(1.0546-0.000216*TC)*(RH);
-					//am2302_hum=0.318*hhum +76.0;
-					am2302_hum=0.31*hhum +80;
-					am2302_temp=TC*25.6;
+					DS2438_2_VAD=0.31*hhum +80;
+					DS2438_2_TEMP=TC*25.6;
 					config_info2[5]=7;
 				}
 				mr=0;
@@ -387,13 +390,21 @@ 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;
+
 				
 			}
 			
-			if (gcontrol==1) {
+			if ((gcontrol&1)==1) {
 				uint16_t w=l;
 				uint8_t t8=w>>4;
 				uint8_t af=0;
@@ -406,27 +417,13 @@ ISR(WATCHDOG_vect) {
 				sei();
 				EXTERN_SLEEP();
 			}
-			if ((gcontrol==2)||(gcontrol==3)) {
+			if (gcontrol) {
 				gcontrol=0;
 				
 			}
 
 			
-			#if  defined(__AVR_ATtiny25__)||defined(__AVR_ATtiny45__)  || defined(__AVR_ATtiny85__)
-			if (((TIMSK & (1<<TOIE0))==0)&& (mode==0))
-			#endif
-			#if  defined(__AVR_ATtiny24__)||defined(__AVR_ATtiny44__)  || defined(__AVR_ATtiny84__) ||defined(__AVR_ATtiny24A__)||defined(__AVR_ATtiny44A__)  || defined(__AVR_ATtiny84A__)
-			if (((TIMSK0 & (1<<TOIE0))==0)&& (mode==0))
-			#endif
-			{
-
-				MCUCR|=(1<<SE)|(1<<SM1);
-				MCUCR&=~(1<<ISC01);
-			} else {
-				MCUCR|=(1<<SE);
-				MCUCR&=~(1<<SM1);
-			}
-			asm("SLEEP");
+			OWST_MAIN_END
 		}