\r
-// Copyright (c) 2015, Tobias Mueller tm(at)tm3d.de\r
+// Copyright (c) 2017, Tobias Mueller tm(at)tm3d.de\r
// All rights reserved.\r
//\r
// Redistribution and use in source and binary forms, with or without\r
\r
uint8_t owid1[8]={0x28, 0xA3, 0xD9, 0x84, 0x00, 0x16, 0x05, 0x18};/**/\r
uint8_t owid2[8]={0x26, 0xA3, 0xD9, 0x84, 0x00, 0x16, 0x05, 0x67};/**/\r
-uint8_t config_info1[16]={0x03,0x04, 0x00,0x00, 0x00,0x00, 0x00,0x00, 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00}; \r
-uint8_t config_info2[16]={0x01,0x06, 0x05,0x08, 0x04,0x07, 0x00,0x00, 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00}; \r
+uint8_t config_info1[26]={0x03,0x04, 0x00,0x00, 0x00,0x00, 0x00,0x00, 0x02,15,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};\r
+uint8_t config_info2[26]={0x01,0x06, 0x05,0x08, 0x04,0x07, 0x00,0x00, 0x02,7,0x00,7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};\r
+\r
+\r
\r
#if (owid>128) \r
#error "Variable not correct"\r
config_info2[5]=7;\r
}\r
MCUSR=0;\r
+ sei();\r
USI_TWI_Master_Initialise();\r
if (checkMAX44009(0)) max_adr=0; else max_adr=1 ;\r
SHT2x_SoftReset();\r
sei();\r
//DDRB|=(1<<PINB1);\r
while(1) {\r
- if ((gcontrol==2)||(gcontrol==3)) {\r
+ if ((gcontrol&2)==2){\r
wdcounter=3;\r
- gcontrol=0;\r
+ \r
\r
}\r
\r
// --- measure temperature with "Polling Mode" (no hold master) ---\r
SHT2x_MeasurePoll(TEMP, &sT);\r
//-- calculate humidity and temperature --\r
- temperatureC = SHT2x_CalcTemperatureC(sT)*10.0-4;\r
+ temperatureC = SHT2x_CalcTemperatureC(sT)*10.0-2;\r
humidityRH = SHT2x_CalcRH(sRH)*10.0+5;\r
if (humidityRH>1000) humidityRH=1000;\r
if (testSW()) {\r
wdcounter=0;\r
}\r
\r
- if (gcontrol==1) {\r
+ if ((gcontrol&1)==1) {\r
gcontrol=0;\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