#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/I2C/BMP280.h"\r
#include "../common/I2C/MAX44009.h"\r
-extern void OWINIT();\r
-extern void EXTERN_SLEEP();\r
+#include "../common/owSlave_tools.h"\r
+#include "../common/calibr.h"\r
+\r
+OWST_EXTERN_VARS\r
\r
uint8_t owid[8]={0x20, 0xA2, 0xD9, 0x84, 0x00, 0x16, 0x02, 0x5D};/**/\r
uint8_t config_info[26]={0x01,14,0x04,0x08, 0x03,15, 0x02,16,0x02,7,7,15,14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};\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=10;\r
-\r
+OWST_WDT_ISR\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
typedef union {\r
volatile uint8_t bytes[0x20];\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
-volatile double temperatureC,humidityRH;\r
-volatile double l;\r
+ double temperatureC,humidityRH;\r
+ double l;\r
uint32_t P;\r
int32_t t;\r
uint8_t max_adr=0;\r
\r
\r
int main(void){\r
+ OWST_INIT_USI_ON\r
pack.A=0;\r
pack.B=0;\r
pack.C=0;\r
pack.HD=0xFF;\r
pack.LD=0x00;\r
pack.VCCP=0;\r
- PORTB=0xFF-(1<<PORTB0); //Schalter kann gegen Masse sein und zieht dann immer Strom\r
- DDRB|=(1<<PORTB0); //Als Ausgang und 0\r
- PORTA=0xFF; //All Pull up;\r
- PRR|=(1<<PRADC); // adc for save Power\r
\r
- ACSR|=(1<<ACD); //Disable Comparator\r
OWINIT();\r
\r
- MCUCR &=~(1<<PUD); //All Pins Pullup...\r
- MCUCR |=(1<<BODS);\r
- WDTCSR |= ((1<<WDCE) ); // Enable the WD Change Bit//| (1<<WDE)\r
- WDTCSR |= (1<<WDIE) | // Enable WDT Interrupt\r
- (1<<WDP3) | (1<<WDP0); // Set Timeout to ~8 seconds\r
+ OWST_WDR_CONFIG8\r
+ OWST_EN_PULLUP\r
\r
gcontrol=1;\r
\r
- USI_TWI_Master_Initialise();\r
+ initSHT2x();\r
+ _delay_ms(10);\r
bmp280Init();\r
- SHT2x_SoftReset();\r
- SHT2x_ReadUserRegister(userRegister);\r
- //(userRegister & ~SHT2x_RES_MASK) | SHT2x_RES_10_13BIT;\r
- SHT2x_WriteUserRegister(userRegister); //write changed user reg\r
- // --- measure humidity with "Hold Master Mode (HM)" ---\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
if (checkMAX44009(0)) max_adr=0; else max_adr=1 ;\r
\r
sei();\r
while(1) {\r
\r
if (wdcounter>3) { \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
+ humidityRH=calibr_hum(temperatureC,-0.2,humidityRH);\r
+ temperatureC =temperatureC -0.2;\r
bmp280ConvertInt(&t,&P,1);\r
l=MAX44009getlux(max_adr);\r
if (l<0.030) l=0.030; //Darf nicht 0 sein. minimum -35°C Sensor minimum 0.045\r
while ((ADCSRA&(1<<ADSC)));\r
cli();pack.B=ADC;sei();*/\r
wdcounter=10;\r
- cli();pack.B=humidityRH*100;sei();\r
+ uint16_t hb=humidityRH*100;\r
+ cli();pack.B=hb;sei();\r
if (pack.CSB2&0x08) //AEH\r
if (pack.bytes[1]>pack.HB) {alarmflag=1;pack.CSB2|=0x20;}\r
if (pack.CSB2&0x04) //AEL\r
while ((ADCSRA&(1<<ADSC)));\r
cli();pack.D=ADC;sei();*/\r
wdcounter=10;\r
- cli();pack.D=P/100.0*32.0;sei();\r
+ uint16_t hd=P/100.0*32.0;\r
+ cli();pack.D=hd;sei();\r
if (pack.CSD2&0x08) //AEH\r
if (pack.bytes[1]>pack.HD) {alarmflag=1;pack.CSD2|=0x20;}\r
if (pack.CSD2&0x04) //AEL\r
bb=bb*2;\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