#include <avr/pgmspace.h>\r
#include "../common/I2C/USI_TWI_Master.h"\r
#include "../common/I2C/MAX1164x.h"\r
-#include "../common/I2C/SHT2x.h"\r
+#include "../common/I2C/SHT2xV2.h"\r
#include "../common/calibr.h"\r
\r
extern void OWINIT(void);\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_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
extern uint8_t gcontrol;\r
extern uint8_t reset_indicator;\r
extern uint8_t alarmflag;\r
+extern uint8_t cpsp;\r
volatile uint8_t wdcounter=1;\r
\r
\r
uint8_t threshold; //8\r
\r
uint8_t page1[8]; //9\r
- #if defined(__AVR_ATtiny25__)\r
- #else\r
+ \r
uint8_t page2[8]; //17\r
union{ \r
uint8_t page3[8]; //25\r
uint16_t r_week_max;\r
};\r
};\r
- uint8_t page5[8]; //41\r
- uint8_t page6[8]; //49\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
} pack2_t;\r
volatile pack2_t pack2;\r
#define CH0_CH1 MAX1164x_C_SCAN0\r
//|MAX1164x_C_CS0\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
#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
+\r
\r
uint16_t readEEPROM(uint8_t addr,uint16_t def) {\r
uint16_t hr;\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
+ for(uint8_t i=0;i<32;i++) {\r
weekmaxarr[i]=pack2.r_week_max;\r
}\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
if (testSW()) {\r
- config_info2[5]=8;\r
+ config_info2[5]=12;\r
}else{\r
config_info2[5]=7;\r
}\r
+ \r
\r
USI_TWI_Master_Initialise();\r
\r
- SHT2x_SoftReset();\r
- SHT2x_ReadUserRegister(userRegister);\r
- SHT2x_WriteUserRegister(userRegister); //write changed user reg\r
+ initSHT2x();\r
+ _delay_ms(100);\r
MAX1164x_config(MAX1164x_S_SEL2|MAX1164x_S_SEL0,CH0_M);//#define MAX1164x_C_CS0\r
_delay_ms(30); //Internal Referenz start\r
//2970 -> 1,5V \r
sei();\r
//DDRB|=(1<<PINB1);\r
while(1) {\r
- if (pack1.config==0x1F) {\r
+ if ((cpsp&0x80)!=0) {\r
+ if ((cpsp&0x0F)==5) {\r
+ if (pack2.reset_code==0x01) {\r
+ pack1.config=0x7F;\r
+ R0=1;\r
+ pack2.R0=0;\r
+ writeEEPROM(EEPROM_R0,0);\r
+ } else if (pack2.reset_code==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<pack2.days_of_r0;i++) {\r
+ weekmaxarr[i]=1;\r
+ }\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 (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) {\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
+ if (pack1.config==0x05) { //Reset all Data\r
+ } */\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[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
}\r
- if (pack2.tol_d>7) {\r
+ if (pack2.tol_d>pack2.days_of_r0) {\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
+ R0=pack2.R0/100.0;\r
pack2.R0=R0*100;\r
writeEEPROM(EEPROM_R0,pack2.R0);\r
writeEEPROM(EEPROM_R0d,pack2.r_day_max); //Maximum des Tages\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
+ getSHT2xHumTemp(&temperatureC,&humidityRH);\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
+ double RH=calibr_hum(temperatureC,-0.2,humidityRH)*10.0;\r
+ double TC =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
+ am2302_hum=RH;\r
+ am2302_temp=TC*25.6;\r
+ config_info2[5]=12; //10V = 100%\r
}else{\r
- hhum=(1.0546-0.000216*temperatureC)*(humidityRH);\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=temperatureC*25.6;\r
+ am2302_temp=TC*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
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
+ //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*(double)pack2.corr_VOC_mult/(double)pack2.corr_VOC_div;\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=l*(double)pack2.corr_VOC_mult/(double)pack2.corr_VOC_div;\r
+ l=l*8.0; //fuer DS18B20*/\r
+ }\r
+\r
+ //l=(l/R0*100.0); \r
wdcounter=0;\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
tm3d / owSlave2.git / blobdiff