#include "../common/I2C/USI_TWI_Master.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
#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
+extern uint8_t cpsp;\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
+OWST_WDT_ISR\r
\r
\r
- }\r
\r
\r
typedef union {\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
- uint8_t free;\r
+ \r
};\r
};\r
union{\r
uint16_t r_week_max;\r
};\r
};\r
- uint8_t page5[8]; //41\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
\r
\r
\r
- volatile int16_t am2302_temp;\r
- volatile uint16_t am2302_hum;\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
- uint8_t userRegister[1];\r
- int16_t sRH,sT;\r
double temperatureC,humidityRH,hhum;\r
volatile double l;\r
\r
\r
- uint16_t weekmaxarr[8];\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 la[4];\r
uint8_t lainit=1;\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
+ \r
#define EEPROM_R0 0\r
#define EEPROM_R0d 2\r
#define EEPROM_R0w 4\r
#define EEPROM_dol 6\r
-\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
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
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
+\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
gcontrol=1;\r
sei();\r
while(1) {\r
- if (pack1.config==0x1F) { //Reset R0\r
- pack1.config=0x7F;\r
- R0=1;\r
- pack2.R0=0;\r
- writeEEPROM(EEPROM_R0,0);\r
- }\r
- if (pack1.config==0x05) { //Reset all Data\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
+ 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 (wdcounter>0) { //8s\r
pack2.tol_s8++;\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[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
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=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
- am2302_hum=RH;\r
- am2302_temp=TC*25.6;\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
- //am2302_hum=0.318*hhum +76.0;\r
- am2302_hum=0.31*hhum +80;\r
- am2302_temp=TC*25.6;\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
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=l*8.0; //fuer DS18B20*/\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
\r
- if (gcontrol==1) {\r
+ if ((gcontrol&1)==1) {\r
uint16_t w=l;\r
uint8_t t8=w>>4;\r
uint8_t af=0;\r
sei();\r
EXTERN_SLEEP();\r
}\r
- if ((gcontrol==2)||(gcontrol==3)) {\r
+ if (gcontrol) {\r
gcontrol=0;\r
\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
+ OWST_MAIN_END\r
}\r
\r
\r
tm3d / owSlave2.git / blobdiff