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=d490f732b249b452dada8986d6bc45ded7771965;hb=refs%2Fheads%2Fmaster;hpb=22b81b6c288ca56f58d064627c310e437f9453a4

diff --git a/DS18B20_VOC_DS2438_SHT direct/DS18B20_DS2438.c b/DS18B20_VOC_DS2438_SHT direct/DS18B20_DS2438.c
index d490f73..2522a0e 100644
--- a/DS18B20_VOC_DS2438_SHT direct/DS18B20_DS2438.c	
+++ b/DS18B20_VOC_DS2438_SHT direct/DS18B20_DS2438.c	
@@ -35,414 +35,396 @@
 #define F_CPU 8000000UL
 #include <avr/io.h>
 #include <avr/interrupt.h>
-#include <util/delay.h>  
+#include <util/delay.h>
 #include <avr/wdt.h>
 #include <avr/sleep.h>
 #include <avr/pgmspace.h>
 #include "../common/I2C/USI_TWI_Master.h"
-#include "../common/I2C/SHT2x.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
 
 
 
 volatile uint8_t owid1[8]={0x28, 0xA3, 0xD9, 0x84, 0x00, 0x16, 0x05, 0x18};/**/
 volatile uint8_t owid2[8]={0x26, 0xA3, 0xD9, 0x84, 0x00, 0x16, 0x05, 0x67};/**/
-volatile uint8_t config_info1[26]={0x08,0x01, 0x00,0x00, 0x00,0x00, 0x00,0x00, 0x02,17,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};	
-volatile uint8_t config_info2[26]={0x01,0x06, 0x05,0x08, 0x04,0x07, 11,0x08, 0x02,0x07,0x00,0x07,17,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};	
-	
-#if (owid>128) 
+                                        //18
+volatile uint8_t config_info1[26]={0x08,18, 0x00,0x00, 0x00,0x00, 0x00,0x00, 0x02,17,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+volatile uint8_t config_info2[26]={0x01,0x06, 0x05,0x08, 0x04,0x07, 11,0x08, 0x02,0x07,0x00,0x07,17,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+#if (owid>128)
 #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;
-
-
-#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;
-
-
-}
-
-
-typedef union {
-	volatile uint8_t bytes[8];
-	struct {
-		uint16_t temp;  //0
-		uint8_t TH;  //2
-		uint8_t TL;  //3
-		uint8_t config;  //4
-		uint8_t rrFF; //5
-		uint8_t rr00; //6
-		uint8_t rr10; //7
-	};
-} pack1_t;
-volatile pack1_t pack1;
-
-
-
-typedef union {
-	#if  defined(__AVR_ATtiny25__)
-	volatile uint8_t bytes[16];
-	#else
-	volatile uint8_t bytes[64];
-	#endif
-	struct {
-		uint8_t status;  //1
-		int16_t temp;  //2
-		uint16_t voltage;  //4
-		int16_t current;  //6
-		uint8_t threshold; //8
-		
-		uint8_t page1[8]; //9
+extern uint8_t cpsp;
+
+OWST_WDT_ISR
+
+
+
+
+	typedef union {
+		volatile uint8_t bytes[8];
+		struct {
+			uint16_t temp;  //0
+			uint8_t TH;  //2
+			uint8_t TL;  //3
+			uint8_t config;  //4
+			uint8_t rrFF; //5
+			uint8_t rr00; //6
+			uint8_t rr10; //7
+		};
+	} pack1_t;
+	volatile pack1_t pack1;
+
+
+
+	typedef union {
 		#if  defined(__AVR_ATtiny25__)
+		volatile uint8_t bytes[16];
 		#else
-		uint8_t page2[8]; //17
-		union{ 
-			uint8_t page3[8]; //25
-			struct {
-				uint16_t R0;
-				uint16_t VS;
-				uint8_t cmode;
-				int16_t ip;
-				uint8_t free;
+		volatile uint8_t bytes[64];
+		#endif
+		struct {
+			uint8_t status;  //1
+			int16_t temp;  //2
+			uint16_t voltage;  //4
+			int16_t current;  //6
+			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
+				struct {
+					uint8_t free;
+					uint16_t R0;
+					uint16_t VS;
+					uint8_t cmode;
+					int16_t ip;
+					
+				};
 			};
-		};
-		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 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];
+			};
+			uint8_t page6[8];  //49
+			uint8_t page7[8];  //57
+			
+			#endif
 		};
-		uint8_t page5[8];  //41
-		uint8_t page6[8];  //49
-		uint8_t page7[8];  //57
-		
-		#endif
-	};
-} pack2_t;
-volatile pack2_t pack2;
-
-
-
-
-volatile int16_t am2302_temp;
-volatile uint16_t am2302_hum;
-
-
-uint8_t userRegister[1];
-int16_t sRH,sT;
-double temperatureC,humidityRH,hhum;
-double l;
-
-
-uint16_t weekmaxarr[8];
-
-//Kompensieren der Abhänigkeit von RS/RO von Temperatur und Luftfeuchte
-inline double interp(double t, double h) {
-	double h2;
-	 double t2;
-	h2=h*h;
-	t2=t*t;
-	return 4.76111e-9*h2*t2-3.96956e-7*h2*t+0.0000408889*h2-1.07132e-6*h*t2+0.000115968*h*t-0.0101333*h+0.000163806*t2-0.0241179*t+1.80591;
-}
-
-double R0;
-uint16_t mr;
-uint8_t startup=10;
-double ip;
-
-
-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
-
-
-uint16_t readEEPROM(uint8_t addr,uint16_t def) {
-	uint16_t hr;
-	while(EECR & (1<<EEPE));
-	EEARL=addr+1;
-	EECR |= (1<<EERE);
-	hr=EEDR;
-	if (hr!=0xFF) {
-		hr=hr<<8;
-		while(EECR & (1<<EEPE));
-		EEARL=addr;
-		EECR |= (1<<EERE);
-		hr|=EEDR;
-		return hr;
+	} pack2_t;
+	volatile pack2_t pack2;
+
+
+
+
+	volatile int16_t DS2438_2_TEMP;
+	volatile uint16_t DS2438_2_VAD;
+	volatile uint16_t DS2438_2_VDD=0x01F4;
+
+	OWST_TESTSW
+
+
+	double temperatureC,humidityRH,hhum;
+	volatile double l;
+
+
+	uint16_t weekmaxarr[33];
+
+	//Kompensieren der Abhänigkeit von RS/RO von Temperatur und Luftfeuchte
+	inline double interp(double t, double h) {
+		double h2;
+		double t2;
+		h2=h*h;
+		t2=t*t;
+		return 4.76111e-9*h2*t2-3.96956e-7*h2*t+0.0000408889*h2-1.07132e-6*h*t2+0.000115968*h*t-0.0101333*h+0.000163806*t2-0.0241179*t+1.80591;
 	}
-	return def;
-}
-
-void writeEEPROM(uint8_t addr,uint16_t val) {
-	while(EECR & (1<<EEPE));
-	EECR = (0<<EEPM1)|(0<<EEPM0);
-	EEARL = addr;
-	EEDR = val&0xFF;
-	EECR |= (1<<EEMPE);
-	EECR |= (1<<EEPE);
-	while(EECR & (1<<EEPE));
-	EECR = (0<<EEPM1)|(0<<EEPM0);
-	EEARL = addr+1;
-	EEDR = val>>8;
-	EECR |= (1<<EEMPE);
-	EECR |= (1<<EEPE);
-}
-
-int main(void){
-	PORTA=0xFF;
-	PORTB=0xFF-(1<<PORTB0); //Schalter kann gegen Masse sein und zieht dann immer Strom
-	DDRB|=(1<<PORTB0); //Als Ausgang und 0
-	OWINIT();
-	DDRB|=(1<<PINB1);//Ausgang und 1
-	DDRA|=(1<<PINA0);
+
+	double R0;
+	uint16_t mr;
+	uint8_t startup=10;
+	double ip;
+	double la[4];
+	uint8_t lainit=1;
+
+
 	
-	WDTCSR |= ((1<<WDCE) );   // Enable the WD Change Bit//| (1<<WDE)
-	WDTCSR |=   (1<<WDIE) |              // Enable WDT Interrupt
-	//(1<<WDP0) |(1<<WDP2) | (1<<WDP1);    // Set Timeout to ~2 seconds
-	(1<<WDP3) | (1<<WDP0);    // Set Timeout to ~8 seconds
-
-	MCUSR=0;
-
-	ADMUX=0b00001110 //ADC1 +   ADC3 -
-	ADCSRA = (1<<ADEN)|
-
-	pack1.temp=0x0550;
-	pack1.config=0x7F;
-	pack1.TH=75;
-	pack1.TL=70;
-	pack1.rrFF=0xFF;
-	pack1.rr00=0;
-	pack1.rr10=0x10;
-
-	pack2.cmode=0;
-	pack2.R0=readEEPROM(EEPROM_R0,1);
-	R0=pack2.R0/100.0;
-		
-	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
-	for(uint8_t i=0;i<7;i++) {
-		weekmaxarr[i]=pack2.r_week_max;
+	#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;
+		while(EECR & (1<<EEPE));
+		EEARL=addr+1;
+		EECR |= (1<<EERE);
+		hr=EEDR;
+		if (hr!=0xFF) {
+			hr=hr<<8;
+			while(EECR & (1<<EEPE));
+			EEARL=addr;
+			EECR |= (1<<EERE);
+			hr|=EEDR;
+			return hr;
+		}
+		return def;
 	}
 
-	if (testSW()) {
-		config_info2[5]=8;
-	}else{
-		config_info2[5]=7;
+	void writeEEPROM(uint8_t addr,uint16_t val) {
+		while(EECR & (1<<EEPE));
+		EECR = (0<<EEPM1)|(0<<EEPM0);
+		EEARL = addr;
+		EEDR = val&0xFF;
+		EECR |= (1<<EEMPE);
+		EECR |= (1<<EEPE);
+		while(EECR & (1<<EEPE));
+		EECR = (0<<EEPM1)|(0<<EEPM0);
+		EEARL = addr+1;
+		EEDR = val>>8;
+		EECR |= (1<<EEMPE);
+		EECR |= (1<<EEPE);
 	}
 
-	USI_TWI_Master_Initialise();
-	
-	SHT2x_SoftReset();
-	SHT2x_ReadUserRegister(userRegister);
-	SHT2x_WriteUserRegister(userRegister); //write changed user reg
-	gcontrol=1;
-	sei();
-	//DDRB|=(1<<PINB1);
-    while(1)   {
-		if (pack1.config==0x1F) {
-			pack1.config=0x7F;
-			R0=1;
-			pack2.R0=0;
-			writeEEPROM(EEPROM_R0,0);
-		} 
-		if (pack1.config==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<7;i++) {
-				weekmaxarr[i]=1;
-			}				
-		} 
-		if (wdcounter>0) {
-			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[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) {
-					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	;
-				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--;
-			SHT2x_MeasurePoll(HUMIDITY, &sRH);
-			// --- measure temperature with "Polling Mode" (no hold master) ---
-			SHT2x_MeasurePoll(TEMP, &sT);
-			//-- calculate humidity and temperature --
-			temperatureC = SHT2x_CalcTemperatureC(sT);
-			humidityRH = SHT2x_CalcRH(sRH);
-			ip=interp(temperatureC,humidityRH);
-			pack2.ip=ip*1000;
-			humidityRH=calibr_hum(temperatureC,-0.2,humidityRH)*10.0;
-			//humidityRH=humidityRH*10.0;
-			temperatureC =temperatureC *10.0-2;
-
-
-			if (testSW()) {
-				 am2302_hum= humidityRH*10.0;
-				 am2302_temp=temperatureC*25.6;
-				 //am2302_temp=am2302_temp-45;
-				 config_info2[5]=8;	
+	int main(void){
+		PORTA=0xFF-(1<<PINA1);
+		PORTB=0xFF-(1<<PORTB0); //Schalter kann gegen Masse sein und zieht dann immer Strom
+		DDRB|=(1<<PORTB0); //Als Ausgang und 0
+		OWINIT();
+		DDRB|=(1<<PINB1);//Ausgang und 1
+		DDRA|=(1<<PINA0);
+		
+		WDTCSR |= ((1<<WDCE) );   // Enable the WD Change Bit//| (1<<WDE)
+		WDTCSR |=   (1<<WDIE) |              // Enable WDT Interrupt
+		//(1<<WDP0) |(1<<WDP2) | (1<<WDP1);    // Set Timeout to ~2 seconds
+		(1<<WDP3) | (1<<WDP0);    // Set Timeout to ~8 seconds
+
+		MCUSR=0;
+
+		//ADMUX=0b00001110; //ADC1 +   ADC3 -
+		ADMUX=0x01 ; //PA3 single and  3V
+		ADCSRA = (1<<ADEN)|(1<<ADPS1)|(1<<ADPS0);//|
+		pack1.temp=0x0550;
+		pack1.config=0x7F;
+		pack1.TH=75;
+		pack1.TL=70;
+		pack1.rrFF=0xFF;
+		pack1.rr00=0;
+		pack1.rr10=0x10;
+
+		pack2.page3[0]=0xF1;
+		pack2.cmode=0;
+		pack2.R0=readEEPROM(EEPROM_R0,1);
+		R0=pack2.R0/100.0;
+		
+		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);
+
+		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{
-				hhum=(1.0546-0.000216*temperatureC)*(humidityRH);
-				//am2302_hum=0.318*hhum +76.0;
-				am2302_hum=0.31*hhum +80;
-				am2302_temp=temperatureC*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
-			_delay_us(150);
-			_delay_us(150);
-			PORTB|=(1<<PINB1);
-//ENDE Kritische Sektion !______________________________
-			//l=mr/2.0*2.048/4096; 
-			// l maximal 2  mr max 4096  //mr 2V=8000 
+			config_info2[5]=7;
+		}
+
+		USI_TWI_Master_Initialise();
+		
+		initSHT2x();
+		_delay_ms(100);
+		gcontrol=1;
+		sei();
+		while(1)   {
 			
-			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 (pack2.cmode==0) {
-//					MAX1164x_config(MAX1164x_S_SEL2|MAX1164x_S_SEL0,CH0_CH1);
-					pack2.cmode=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 (l<1.6) {
-			if (mr<6400) {	
-				if (pack2.cmode==1) {
-	//				MAX1164x_config(MAX1164x_S_SEL2|MAX1164x_S_SEL0,CH0_M);
-					pack2.cmode=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;
+					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]>pack2.r_week_max) pack2.r_week_max=weekmaxarr[i];
+					}
+					if (pack2.tol_d>7) {
+						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	;
+					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);
+				pack2.ip=ip*1000;
+				//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()) {
+					DS2438_2_VAD=RH;
+					DS2438_2_TEMP=TC*25.6;
+					config_info2[5]=12;	//10V = 100%
+				}else{
+					hhum=(1.0546-0.000216*TC)*(RH);
+					DS2438_2_VAD=0.31*hhum +80;
+					DS2438_2_TEMP=TC*25.6;
+					config_info2[5]=7;
+				}
+				mr=0;
+				//Kritische Sektion !___Ein Breakpoint in dieser Section kann den TGS8100 zerstoeren!___________________________
+				PORTB&=~(1<<PINB1); //Auf 0 Ziehen
+				_delay_us(500);
+				for(uint8_t i=0;i<32;i++) {
+					ADCSRA|=(1<<ADSC);
+					while ((ADCSRA&(1<<ADSC)));
+					mr+=ADC;
+				 }
+				PORTB|=(1<<PINB1);
+				//ENDE Kritische Sektion !______________________________
+
+				pack2.VS=mr*3/128;  //VS in Volt = VS/256
+				l=mr*3.0/32768.0;  //Spannung in v
+				l=( 3/l- 1) *30; //l is resistance
+				if (lainit) {
+					la[0]=la[1]=la[2]=la[3]=l;  //smaller code
+					lainit=0;
+				} else {
+					la[0]=la[1];
+					la[1]=la[2];
+					la[2]=la[3];
+					la[3]=l;
+				}
+				double lasum=la[0]+la[1]+la[2]+la[3];
+				l=lasum/4.0;
 				
+				pack2.current=l*100;
+				
+				l=l/ip;
+				
+				if (startup==0){
+					if (l>R0) {
+						R0=l;
+						pack2.R0=R0*100;
+						writeEEPROM(EEPROM_R0,pack2.R0);
+
+					}
+					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=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;
+
 				
 			}
-			pack2.VS=mr*5/2;
-			l=mr/4000.0;
-			l=( 3/l- 1) *30;
-			pack2.current=l*100;
-			
-			l=l/ip;
 			
-			if (startup==0){
-				if (l>R0) {
-					R0=l;
-					pack2.R0=R0*100;
-					writeEEPROM(EEPROM_R0,pack2.R0);
+			if ((gcontrol&1)==1) {
+				uint16_t w=l;
+				uint8_t t8=w>>4;
+				uint8_t af=0;
+				if (t8>pack1.TH) af=1;
+				if (t8<=pack1.TL) af=1;
+				cli();
+				pack1.temp=w;
+				//pack.temp++;
+				alarmflag=af;
+				sei();
+				EXTERN_SLEEP();
+			}
+			if (gcontrol) {
+				gcontrol=0;
+				
+			}
 
-				}
-				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=R0/l;
-			l=log(l);
-			l=l*160*4; //fuer DS18B20
-			wdcounter=0;
-			
-		}
-	
-		if (gcontrol==1) {
-			uint16_t w=l;
-			uint8_t t8=w>>4;
-			uint8_t af=0;
-			if (t8>pack1.TH) af=1;
-			if (t8<=pack1.TL) af=1; 
-			cli();
-			pack1.temp=w;
-			//pack.temp++;
-			alarmflag=af;
-			sei();			
-			EXTERN_SLEEP();		
-		}
-		if ((gcontrol==2)||(gcontrol==3)) {
-			gcontrol=0;
 			
+			OWST_MAIN_END
 		}
 
-		
-#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");
-   }
-
-
-}
+	}