#define F_CPU 8000000UL\r
#include <avr/io.h>\r
#include <avr/interrupt.h>\r
-#include <util/delay.h> \r
+#include <util/delay.h>\r
#include <avr/wdt.h>\r
#include <avr/sleep.h>\r
#include <avr/pgmspace.h>\r
#include "../common/I2C/USI_TWI_Master.h"\r
-#include "../common/I2C/SHT2x.h"\r
+#include "../common/I2C/SHT2xV2.h"\r
#include "../common/calibr.h"\r
+#include "../common/owSlave_tools.h"\r
\r
-extern void OWINIT(void);\r
-extern void EXTERN_SLEEP(void);\r
+OWST_EXTERN_VARS\r
\r
\r
\r
volatile uint8_t owid1[8]={0x28, 0xA3, 0xD9, 0x84, 0x00, 0x16, 0x05, 0x18};/**/\r
volatile uint8_t owid2[8]={0x26, 0xA3, 0xD9, 0x84, 0x00, 0x16, 0x05, 0x67};/**/\r
-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}; \r
-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}; \r
- \r
-#if (owid>128) \r
+ //18\r
+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};\r
+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};\r
+\r
+#if (owid>128)\r
#error "Variable not correct"\r
#endif\r
\r
-extern uint8_t mode;\r
-extern uint8_t gcontrol;\r
-extern uint8_t reset_indicator;\r
-extern uint8_t alarmflag;\r
-volatile uint8_t wdcounter=1;\r
-\r
-\r
-#if defined(__AVR_ATtiny24__)||defined(__AVR_ATtiny44__) || defined(__AVR_ATtiny84__) || defined(__AVR_ATtiny24A__)||defined(__AVR_ATtiny44A__) || defined(__AVR_ATtiny84A__)\r
-ISR(WATCHDOG_vect) {\r
-#else\r
-ISR(WDT_vect) {\r
-#endif \r
- wdcounter++;\r
- if (reset_indicator==1) reset_indicator++;\r
- else if (reset_indicator==2) mode=0;\r
-\r
-\r
-}\r
-\r
-\r
-typedef union {\r
- volatile uint8_t bytes[8];\r
- struct {\r
- uint16_t temp; //0\r
- uint8_t TH; //2\r
- uint8_t TL; //3\r
- uint8_t config; //4\r
- uint8_t rrFF; //5\r
- uint8_t rr00; //6\r
- uint8_t rr10; //7\r
- };\r
-} pack1_t;\r
-volatile pack1_t pack1;\r
-\r
-\r
-\r
-typedef union {\r
- #if defined(__AVR_ATtiny25__)\r
- volatile uint8_t bytes[16];\r
- #else\r
- volatile uint8_t bytes[64];\r
- #endif\r
- struct {\r
- uint8_t status; //1\r
- int16_t temp; //2\r
- uint16_t voltage; //4\r
- int16_t current; //6\r
- uint8_t threshold; //8\r
- \r
- uint8_t page1[8]; //9\r
+extern uint8_t cpsp;\r
+\r
+OWST_WDT_ISR\r
+\r
+\r
+\r
+\r
+ typedef union {\r
+ volatile uint8_t bytes[8];\r
+ struct {\r
+ uint16_t temp; //0\r
+ uint8_t TH; //2\r
+ uint8_t TL; //3\r
+ uint8_t config; //4\r
+ uint8_t rrFF; //5\r
+ uint8_t rr00; //6\r
+ uint8_t rr10; //7\r
+ };\r
+ } pack1_t;\r
+ volatile pack1_t pack1;\r
+\r
+\r
+\r
+ typedef union {\r
#if defined(__AVR_ATtiny25__)\r
+ volatile uint8_t bytes[16];\r
#else\r
- uint8_t page2[8]; //17\r
- union{ \r
- uint8_t page3[8]; //25\r
- struct {\r
- uint16_t R0;\r
- uint16_t VS;\r
- uint8_t cmode;\r
- int16_t ip;\r
- uint8_t free;\r
+ volatile uint8_t bytes[64];\r
+ #endif\r
+ struct {\r
+ uint8_t status; //1\r
+ int16_t temp; //2\r
+ uint16_t voltage; //4\r
+ int16_t current; //6\r
+ uint8_t threshold; //8\r
+ \r
+ uint8_t page1[8]; //9\r
+ #if defined(__AVR_ATtiny25__)\r
+ #else\r
+ uint8_t page2[8]; //17\r
+ union{\r
+ uint8_t page3[8]; //25\r
+ struct {\r
+ uint8_t free;\r
+ uint16_t R0;\r
+ uint16_t VS;\r
+ uint8_t cmode;\r
+ int16_t ip;\r
+ \r
+ };\r
};\r
- };\r
- union{ \r
- uint8_t page4[8]; //33\r
- struct {\r
- uint16_t tol_s8;\r
- uint16_t tol_d;\r
- uint16_t r_day_max;\r
- uint16_t r_week_max;\r
+ union{\r
+ uint8_t page4[8]; //33\r
+ struct {\r
+ uint16_t tol_s8;\r
+ uint16_t tol_d;\r
+ uint16_t r_day_max;\r
+ uint16_t r_week_max;\r
+ };\r
};\r
+ union{\r
+ uint8_t page5[8]; //41\r
+ struct {\r
+ uint8_t codeVOC; // immer 0x37 nach Neustart\r
+ uint8_t days_of_r0; //Anzahl der Tage fuer die r0 ermittelt wird\r
+ int8_t corr_VOC_mult; //r0 corr\r
+ int8_t corr_VOC_div;\r
+ uint16_t vv3;\r
+ uint8_t time_corr; //Wiregate;\r
+ uint8_t reset_code;\r
+ };\r
+ uint16_t page5d[4];\r
+ };\r
+ uint8_t page6[8]; //49\r
+ uint8_t page7[8]; //57\r
+ \r
+ #endif\r
};\r
- uint8_t page5[8]; //41\r
- uint8_t page6[8]; //49\r
- uint8_t page7[8]; //57\r
- \r
- #endif\r
- };\r
-} pack2_t;\r
-volatile pack2_t pack2;\r
-\r
-\r
-\r
-\r
-volatile int16_t am2302_temp;\r
-volatile uint16_t am2302_hum;\r
-\r
-\r
-uint8_t userRegister[1];\r
-int16_t sRH,sT;\r
-double temperatureC,humidityRH,hhum;\r
-double l;\r
-\r
-\r
-uint16_t weekmaxarr[8];\r
-\r
-//Kompensieren der Abhänigkeit von RS/RO von Temperatur und Luftfeuchte\r
-inline double interp(double t, double h) {\r
- double h2;\r
- double t2;\r
- h2=h*h;\r
- t2=t*t;\r
- 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;\r
-}\r
-\r
-double R0;\r
-uint16_t mr;\r
-uint8_t startup=10;\r
-double ip;\r
-\r
-\r
-int testSW(void) {\r
- uint8_t r;\r
- DDRB&=~(1<<PORTB0); //Eingang\r
- __asm__ __volatile__ ("nop"); \r
- PORTB|=(1<<PORTB0); //Pullup\r
- __asm__ __volatile__ ("nop"); \r
- __asm__ __volatile__ ("nop"); \r
- __asm__ __volatile__ ("nop"); \r
- __asm__ __volatile__ ("nop"); \r
- __asm__ __volatile__ ("nop"); \r
- r=PINB&(1<<PORTB0);\r
- __asm__ __volatile__ ("nop"); \r
- PORTB&=~(1<<PORTB0); \r
- __asm__ __volatile__ ("nop"); \r
- DDRB|=(1<<PORTB0); //Eingang\r
- return (r==0); //Offen mal HIH4030\r
- \r
- \r
-}\r
-\r
-#define EEPROM_R0 0\r
-#define EEPROM_R0d 2\r
-#define EEPROM_R0w 4\r
-#define EEPROM_dol 6\r
-\r
-\r
-uint16_t readEEPROM(uint8_t addr,uint16_t def) {\r
- uint16_t hr;\r
- while(EECR & (1<<EEPE));\r
- EEARL=addr+1;\r
- EECR |= (1<<EERE);\r
- hr=EEDR;\r
- if (hr!=0xFF) {\r
- hr=hr<<8;\r
- while(EECR & (1<<EEPE));\r
- EEARL=addr;\r
- EECR |= (1<<EERE);\r
- hr|=EEDR;\r
- return hr;\r
+ } pack2_t;\r
+ volatile pack2_t pack2;\r
+\r
+\r
+\r
+\r
+ volatile int16_t DS2438_2_TEMP;\r
+ volatile uint16_t DS2438_2_VAD;\r
+ volatile uint16_t DS2438_2_VDD=0x01F4;\r
+\r
+ OWST_TESTSW\r
+\r
+\r
+ double temperatureC,humidityRH,hhum;\r
+ volatile double l;\r
+\r
+\r
+ uint16_t weekmaxarr[33];\r
+\r
+ //Kompensieren der Abhänigkeit von RS/RO von Temperatur und Luftfeuchte\r
+ inline double interp(double t, double h) {\r
+ double h2;\r
+ double t2;\r
+ h2=h*h;\r
+ t2=t*t;\r
+ 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;\r
}\r
- return def;\r
-}\r
-\r
-void writeEEPROM(uint8_t addr,uint16_t val) {\r
- while(EECR & (1<<EEPE));\r
- EECR = (0<<EEPM1)|(0<<EEPM0);\r
- EEARL = addr;\r
- EEDR = val&0xFF;\r
- EECR |= (1<<EEMPE);\r
- EECR |= (1<<EEPE);\r
- while(EECR & (1<<EEPE));\r
- EECR = (0<<EEPM1)|(0<<EEPM0);\r
- EEARL = addr+1;\r
- EEDR = val>>8;\r
- EECR |= (1<<EEMPE);\r
- EECR |= (1<<EEPE);\r
-}\r
-\r
-int main(void){\r
- PORTA=0xFF;\r
- PORTB=0xFF-(1<<PORTB0); //Schalter kann gegen Masse sein und zieht dann immer Strom\r
- DDRB|=(1<<PORTB0); //Als Ausgang und 0\r
- OWINIT();\r
- DDRB|=(1<<PINB1);//Ausgang und 1\r
- DDRA|=(1<<PINA0);\r
+\r
+ double R0;\r
+ uint16_t mr;\r
+ uint8_t startup=10;\r
+ double ip;\r
+ double la[4];\r
+ uint8_t lainit=1;\r
+\r
+\r
\r
- WDTCSR |= ((1<<WDCE) ); // Enable the WD Change Bit//| (1<<WDE)\r
- WDTCSR |= (1<<WDIE) | // Enable WDT Interrupt\r
- //(1<<WDP0) |(1<<WDP2) | (1<<WDP1); // Set Timeout to ~2 seconds\r
- (1<<WDP3) | (1<<WDP0); // Set Timeout to ~8 seconds\r
-\r
- MCUSR=0;\r
-\r
- ADMUX=0b00001110 //ADC1 + ADC3 -\r
- ADCSRA = (1<<ADEN)|\r
-\r
- pack1.temp=0x0550;\r
- pack1.config=0x7F;\r
- pack1.TH=75;\r
- pack1.TL=70;\r
- pack1.rrFF=0xFF;\r
- pack1.rr00=0;\r
- pack1.rr10=0x10;\r
-\r
- pack2.cmode=0;\r
- pack2.R0=readEEPROM(EEPROM_R0,1);\r
- R0=pack2.R0/100.0;\r
- \r
- pack2.r_day_max=readEEPROM(EEPROM_R0d,1);\r
- pack2.r_week_max=readEEPROM(EEPROM_R0w,1);\r
- pack2.tol_d=readEEPROM(EEPROM_dol,0); \r
- pack2.tol_s8=0; //Tag faengt mit Einschalten an\r
- for(uint8_t i=0;i<7;i++) {\r
- weekmaxarr[i]=pack2.r_week_max;\r
+ #define EEPROM_R0 0\r
+ #define EEPROM_R0d 2\r
+ #define EEPROM_R0w 4\r
+ #define EEPROM_dol 6\r
+ #define EEPROM_CODE_DAYOFR0 8\r
+ #define EEPROM_CORR 10\r
+ #define EEPROM_FREE 12\r
+ #define EEPROM_TCORR_RESET 14\r
+\r
+ uint16_t readEEPROM(uint8_t addr,uint16_t def) {\r
+ uint16_t hr;\r
+ while(EECR & (1<<EEPE));\r
+ EEARL=addr+1;\r
+ EECR |= (1<<EERE);\r
+ hr=EEDR;\r
+ if (hr!=0xFF) {\r
+ hr=hr<<8;\r
+ while(EECR & (1<<EEPE));\r
+ EEARL=addr;\r
+ EECR |= (1<<EERE);\r
+ hr|=EEDR;\r
+ return hr;\r
+ }\r
+ return def;\r
}\r
\r
- if (testSW()) {\r
- config_info2[5]=8;\r
- }else{\r
- config_info2[5]=7;\r
+ void writeEEPROM(uint8_t addr,uint16_t val) {\r
+ while(EECR & (1<<EEPE));\r
+ EECR = (0<<EEPM1)|(0<<EEPM0);\r
+ EEARL = addr;\r
+ EEDR = val&0xFF;\r
+ EECR |= (1<<EEMPE);\r
+ EECR |= (1<<EEPE);\r
+ while(EECR & (1<<EEPE));\r
+ EECR = (0<<EEPM1)|(0<<EEPM0);\r
+ EEARL = addr+1;\r
+ EEDR = val>>8;\r
+ EECR |= (1<<EEMPE);\r
+ EECR |= (1<<EEPE);\r
}\r
\r
- USI_TWI_Master_Initialise();\r
- \r
- SHT2x_SoftReset();\r
- SHT2x_ReadUserRegister(userRegister);\r
- SHT2x_WriteUserRegister(userRegister); //write changed user reg\r
- gcontrol=1;\r
- sei();\r
- //DDRB|=(1<<PINB1);\r
- while(1) {\r
- if (pack1.config==0x1F) {\r
- pack1.config=0x7F;\r
- R0=1;\r
- pack2.R0=0;\r
- writeEEPROM(EEPROM_R0,0);\r
- } \r
- if (pack1.config==0x05) {\r
- pack1.config=0x7F; \r
- pack2.r_day_max=1;\r
- pack2.r_week_max=1;\r
- pack2.tol_d=0;\r
- pack2.tol_s8=0; //Tag faengt mit Einschalten an \r
- R0=1; \r
- writeEEPROM(EEPROM_R0,0xFF);\r
- writeEEPROM(EEPROM_R0d,0xFF); //Maximum des Tages\r
- writeEEPROM(EEPROM_R0w,0xFF); //Maximum der Letzten 7 Tage\r
- writeEEPROM(EEPROM_dol,0xFF); //Anzahl der Betriebstage \r
- for(uint8_t i=0;i<7;i++) {\r
- weekmaxarr[i]=1;\r
- } \r
- } \r
- if (wdcounter>0) {\r
- pack2.tol_s8++;\r
- if (pack2.tol_s8>(10000)) {//10800 ist theortisch der Tag aber meistens zu lang\r
- pack2.tol_s8=0;\r
- pack2.tol_d++; //rund 180 Jahre :-)\r
- pack2.r_week_max=0;\r
- weekmaxarr[7]=pack2.r_day_max;\r
- for(uint8_t i=0;i<7;i++) {\r
- weekmaxarr[i]=weekmaxarr[i+1];\r
- //maximum of week\r
- if (weekmaxarr[i]>pack2.r_week_max) pack2.r_week_max=weekmaxarr[i];\r
- }\r
- if (pack2.tol_d>7) {\r
- pack2.R0=pack2.r_week_max;\r
- } else {\r
- pack2.R0=pack2.r_day_max;\r
- }\r
- //R0=//R0-0.5*(pack2.R0/100-R0);\r
- R0=R0-(R0-pack2.R0/100.0)*0.5 ;\r
- pack2.R0=R0*100;\r
- writeEEPROM(EEPROM_R0,pack2.R0);\r
- writeEEPROM(EEPROM_R0d,pack2.r_day_max); //Maximum des Tages\r
- writeEEPROM(EEPROM_R0w,pack2.r_week_max); //Maximum der Letzten 7 Tage\r
- writeEEPROM(EEPROM_dol,pack2.tol_d); //Anzahl der Betriebstage\r
- pack2.r_day_max=0;\r
- }\r
- if (startup!=0) startup--;\r
- SHT2x_MeasurePoll(HUMIDITY, &sRH);\r
- // --- measure temperature with "Polling Mode" (no hold master) ---\r
- SHT2x_MeasurePoll(TEMP, &sT);\r
- //-- calculate humidity and temperature --\r
- temperatureC = SHT2x_CalcTemperatureC(sT);\r
- humidityRH = SHT2x_CalcRH(sRH);\r
- ip=interp(temperatureC,humidityRH);\r
- pack2.ip=ip*1000;\r
- humidityRH=calibr_hum(temperatureC,-0.2,humidityRH)*10.0;\r
- //humidityRH=humidityRH*10.0;\r
- temperatureC =temperatureC *10.0-2;\r
-\r
-\r
- if (testSW()) {\r
- am2302_hum= humidityRH*10.0;\r
- am2302_temp=temperatureC*25.6;\r
- //am2302_temp=am2302_temp-45;\r
- config_info2[5]=8; \r
+ int main(void){\r
+ PORTA=0xFF-(1<<PINA1);\r
+ PORTB=0xFF-(1<<PORTB0); //Schalter kann gegen Masse sein und zieht dann immer Strom\r
+ DDRB|=(1<<PORTB0); //Als Ausgang und 0\r
+ OWINIT();\r
+ DDRB|=(1<<PINB1);//Ausgang und 1\r
+ DDRA|=(1<<PINA0);\r
+ \r
+ WDTCSR |= ((1<<WDCE) ); // Enable the WD Change Bit//| (1<<WDE)\r
+ WDTCSR |= (1<<WDIE) | // Enable WDT Interrupt\r
+ //(1<<WDP0) |(1<<WDP2) | (1<<WDP1); // Set Timeout to ~2 seconds\r
+ (1<<WDP3) | (1<<WDP0); // Set Timeout to ~8 seconds\r
+\r
+ MCUSR=0;\r
+\r
+ //ADMUX=0b00001110; //ADC1 + ADC3 -\r
+ ADMUX=0x01 ; //PA3 single and 3V\r
+ ADCSRA = (1<<ADEN)|(1<<ADPS1)|(1<<ADPS0);//|\r
+ pack1.temp=0x0550;\r
+ pack1.config=0x7F;\r
+ pack1.TH=75;\r
+ pack1.TL=70;\r
+ pack1.rrFF=0xFF;\r
+ pack1.rr00=0;\r
+ pack1.rr10=0x10;\r
+\r
+ pack2.page3[0]=0xF1;\r
+ pack2.cmode=0;\r
+ pack2.R0=readEEPROM(EEPROM_R0,1);\r
+ R0=pack2.R0/100.0;\r
+ \r
+ pack2.r_day_max=readEEPROM(EEPROM_R0d,1);\r
+ pack2.r_week_max=readEEPROM(EEPROM_R0w,1);\r
+ pack2.tol_d=readEEPROM(EEPROM_dol,0);\r
+ pack2.tol_s8=0; //Tag faengt mit Einschalten an\r
+\r
+ pack2.page5d[0]=readEEPROM(EEPROM_CODE_DAYOFR0,0x0437);\r
+ pack2.page5d[1]=readEEPROM(EEPROM_CORR,0x0101);\r
+ pack2.page5d[2]=readEEPROM(EEPROM_FREE,0x0);\r
+ pack2.page5d[3]=readEEPROM( EEPROM_TCORR_RESET,0x0005);\r
+\r
+ for(uint8_t i=0;i<pack2.days_of_r0;i++) {\r
+ weekmaxarr[i]=pack2.r_week_max;\r
+ }\r
+\r
+ for(uint8_t i=0;i<8;i++) pack2.page6[i]=owid1[i];\r
+ if (testSW()) {\r
+ config_info2[5]=12;\r
}else{\r
- hhum=(1.0546-0.000216*temperatureC)*(humidityRH);\r
- //am2302_hum=0.318*hhum +76.0;\r
- am2302_hum=0.31*hhum +80;\r
- am2302_temp=temperatureC*25.6;\r
- config_info2[5]=7;\r
- }\r
- //PORTB&=~(1<<PINB1);\r
- mr=0;\r
-//Kritische Sektion !___Ein Breakpoint in dieser Section kann den TGS8100 zerstoeren!___________________________\r
- PORTB&=~(1<<PINB1); //Auf 0 Ziehen\r
- _delay_us(150);\r
- _delay_us(150);\r
- PORTB|=(1<<PINB1);\r
-//ENDE Kritische Sektion !______________________________\r
- //l=mr/2.0*2.048/4096; \r
- // l maximal 2 mr max 4096 //mr 2V=8000 \r
+ config_info2[5]=7;\r
+ }\r
+\r
+ USI_TWI_Master_Initialise();\r
+ \r
+ initSHT2x();\r
+ _delay_ms(100);\r
+ gcontrol=1;\r
+ sei();\r
+ while(1) {\r
\r
- if (pack2.cmode) { //cmode=0 V 0..2 V cmode=1 V 1.5..3.5V\r
- //l+=1.5; //Spannung real\r
- mr+=6000;\r
- } \r
- //if (l>1.8) {\r
- if (mr>7200) { \r
- if (pack2.cmode==0) {\r
-// MAX1164x_config(MAX1164x_S_SEL2|MAX1164x_S_SEL0,CH0_CH1);\r
- pack2.cmode=1;\r
+ if ((cpsp&0x80)!=0) {\r
+ if ((cpsp&0x0F)==5) {\r
+ if (pack2.reset_code==0x01) {\r
+ R0=1;\r
+ pack2.R0=0;\r
+ writeEEPROM(EEPROM_R0,0);\r
+ } else if (pack2.reset_code==0x05) {\r
+ pack2.r_day_max=1;\r
+ pack2.r_week_max=1;\r
+ pack2.tol_d=0;\r
+ pack2.tol_s8=0; //Tag faengt mit Einschalten an\r
+ R0=1;\r
+ writeEEPROM(EEPROM_R0,0xFF);\r
+ writeEEPROM(EEPROM_R0d,0xFF); //Maximum des Tages\r
+ writeEEPROM(EEPROM_R0w,0xFF); //Maximum der Letzten 7 Tage\r
+ writeEEPROM(EEPROM_dol,0xFF); //Anzahl der Betriebstage\r
+ for(uint8_t i=0;i<7;i++) {\r
+ weekmaxarr[i]=1;\r
+ }\r
+ } else {\r
+ writeEEPROM(EEPROM_CODE_DAYOFR0,0x0037|(pack2.days_of_r0<<8));\r
+ writeEEPROM(EEPROM_CORR,pack2.page5d[1]);\r
+ writeEEPROM(EEPROM_FREE,pack2.page5d[2]);\r
+ writeEEPROM(EEPROM_TCORR_RESET,pack2.time_corr);\r
+ }\r
}\r
+ cpsp=0;\r
}\r
- //if (l<1.6) {\r
- if (mr<6400) { \r
- if (pack2.cmode==1) {\r
- // MAX1164x_config(MAX1164x_S_SEL2|MAX1164x_S_SEL0,CH0_M);\r
- pack2.cmode=0;\r
+ if (wdcounter>0) { //8s\r
+ pack2.tol_s8++;\r
+ if (pack2.tol_s8>(10000)) {//10800 ist theortisch der Tag aber meistens zu lang\r
+ pack2.tol_s8=0;\r
+ pack2.tol_d++; //rund 180 Jahre :-)\r
+ pack2.r_week_max=0;\r
+ weekmaxarr[pack2.days_of_r0]=pack2.r_day_max;\r
+ for(uint8_t i=0;i<pack2.days_of_r0;i++) {\r
+ weekmaxarr[i]=weekmaxarr[i+1];\r
+ //maximum of week\r
+ if (weekmaxarr[i]>pack2.r_week_max) pack2.r_week_max=weekmaxarr[i];\r
+ }\r
+ if (pack2.tol_d>7) {\r
+ pack2.R0=pack2.r_week_max;\r
+ } else {\r
+ pack2.R0=pack2.r_day_max;\r
+ }\r
+ //R0=//R0-0.5*(pack2.R0/100-R0);\r
+ R0=R0-(R0-pack2.R0/100.0)*0.5 ;\r
+ pack2.R0=R0*100;\r
+ writeEEPROM(EEPROM_R0,pack2.R0);\r
+ writeEEPROM(EEPROM_R0d,pack2.r_day_max); //Maximum des Tages\r
+ writeEEPROM(EEPROM_R0w,pack2.r_week_max); //Maximum der Letzten 7 Tage\r
+ writeEEPROM(EEPROM_dol,pack2.tol_d); //Anzahl der Betriebstage\r
+ pack2.r_day_max=0;\r
}\r
+ if (startup!=0) startup--;\r
+ getSHT2xHumTemp(&temperatureC,&humidityRH);\r
+ ip=interp(temperatureC,humidityRH);\r
+ pack2.ip=ip*1000;\r
+ //double RH=calibr_hum(temperatureC,-0.2,humidityRH)*10.0;\r
+ //double TC =temperatureC *10.0-2;\r
+ double RH=humidityRH*10.0;\r
+ double TC=temperatureC*10.0;\r
+\r
+\r
+ if (testSW()) {\r
+ DS2438_2_VAD=RH;\r
+ DS2438_2_TEMP=TC*25.6;\r
+ config_info2[5]=12; //10V = 100%\r
+ }else{\r
+ hhum=(1.0546-0.000216*TC)*(RH);\r
+ DS2438_2_VAD=0.31*hhum +80;\r
+ DS2438_2_TEMP=TC*25.6;\r
+ config_info2[5]=7;\r
+ }\r
+ mr=0;\r
+ //Kritische Sektion !___Ein Breakpoint in dieser Section kann den TGS8100 zerstoeren!___________________________\r
+ PORTB&=~(1<<PINB1); //Auf 0 Ziehen\r
+ _delay_us(500);\r
+ for(uint8_t i=0;i<32;i++) {\r
+ ADCSRA|=(1<<ADSC);\r
+ while ((ADCSRA&(1<<ADSC)));\r
+ mr+=ADC;\r
+ }\r
+ PORTB|=(1<<PINB1);\r
+ //ENDE Kritische Sektion !______________________________\r
+\r
+ pack2.VS=mr*3/128; //VS in Volt = VS/256\r
+ l=mr*3.0/32768.0; //Spannung in v\r
+ l=( 3/l- 1) *30; //l is resistance\r
+ if (lainit) {\r
+ la[0]=la[1]=la[2]=la[3]=l; //smaller code\r
+ lainit=0;\r
+ } else {\r
+ la[0]=la[1];\r
+ la[1]=la[2];\r
+ la[2]=la[3];\r
+ la[3]=l;\r
+ }\r
+ double lasum=la[0]+la[1]+la[2]+la[3];\r
+ l=lasum/4.0;\r
\r
+ pack2.current=l*100;\r
+ \r
+ l=l/ip;\r
+ \r
+ if (startup==0){\r
+ if (l>R0) {\r
+ R0=l;\r
+ pack2.R0=R0*100;\r
+ writeEEPROM(EEPROM_R0,pack2.R0);\r
+\r
+ }\r
+ if (l*100>pack2.r_day_max) {\r
+ pack2.r_day_max=l*100;\r
+ }\r
+ } else if (l<R0) l=R0; //negative Werte am Anfang verhintern\r
+ //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)\r
+ //l=pow(R0/l,1.8)*3-3; \r
+ if (l!=0) {\r
+ l=R0/l;\r
+ //l=l*l*12-12;\r
+ l=exp((1-(1/l))*6.05)-1;\r
+ l=l*(double)pack2.corr_VOC_mult/(double)pack2.corr_VOC_div;\r
+ l=l*8.0; //fuer DS18B20*/\r
+ } \r
+ wdcounter=0;\r
+\r
\r
}\r
- pack2.VS=mr*5/2;\r
- l=mr/4000.0;\r
- l=( 3/l- 1) *30;\r
- pack2.current=l*100;\r
- \r
- l=l/ip;\r
\r
- if (startup==0){\r
- if (l>R0) {\r
- R0=l;\r
- pack2.R0=R0*100;\r
- writeEEPROM(EEPROM_R0,pack2.R0);\r
+ if ((gcontrol&1)==1) {\r
+ uint16_t w=l;\r
+ uint8_t t8=w>>4;\r
+ uint8_t af=0;\r
+ if (t8>pack1.TH) af=1;\r
+ if (t8<=pack1.TL) af=1;\r
+ cli();\r
+ pack1.temp=w;\r
+ //pack.temp++;\r
+ alarmflag=af;\r
+ sei();\r
+ EXTERN_SLEEP();\r
+ }\r
+ if (gcontrol) {\r
+ gcontrol=0;\r
+ \r
+ }\r
\r
- }\r
- if (l*100>pack2.r_day_max) {\r
- pack2.r_day_max=l*100;\r
- }\r
- } else if (l<R0) l=R0; //negative Werte am Anfang verhintern\r
- l=R0/l;\r
- l=log(l);\r
- l=l*160*4; //fuer DS18B20\r
- wdcounter=0;\r
- \r
- }\r
- \r
- if (gcontrol==1) {\r
- uint16_t w=l;\r
- uint8_t t8=w>>4;\r
- uint8_t af=0;\r
- if (t8>pack1.TH) af=1;\r
- if (t8<=pack1.TL) af=1; \r
- cli();\r
- pack1.temp=w;\r
- //pack.temp++;\r
- alarmflag=af;\r
- sei(); \r
- EXTERN_SLEEP(); \r
- }\r
- if ((gcontrol==2)||(gcontrol==3)) {\r
- gcontrol=0;\r
\r
+ OWST_MAIN_END\r
}\r
\r
- \r
-#if defined(__AVR_ATtiny25__)||defined(__AVR_ATtiny45__) || defined(__AVR_ATtiny85__)\r
- if (((TIMSK & (1<<TOIE0))==0)&& (mode==0))\r
-#endif \r
-#if defined(__AVR_ATtiny24__)||defined(__AVR_ATtiny44__) || defined(__AVR_ATtiny84__) ||defined(__AVR_ATtiny24A__)||defined(__AVR_ATtiny44A__) || defined(__AVR_ATtiny84A__)\r
- if (((TIMSK0 & (1<<TOIE0))==0)&& (mode==0))\r
-#endif\r
- {\r
\r
- MCUCR|=(1<<SE)|(1<<SM1);\r
- MCUCR&=~(1<<ISC01);\r
- } else {\r
- MCUCR|=(1<<SE);\r
- MCUCR&=~(1<<SM1);\r
- }\r
- asm("SLEEP");\r
- }\r
-\r
-\r
-}\r
+ }\r
tm3d / owSlave2.git / blobdiff