diff --git a/include/flow.h b/include/flow.h index 7fe5e7f..4a2aa8e 100644 --- a/include/flow.h +++ b/include/flow.h @@ -7,7 +7,7 @@ mqttValueTiming timing_flow; uint16_t flow_counter=0; //maximum counts/s measured with Eden 128 Pump was 171 void IRAM_ATTR isr_flow(); unsigned long last_read_flow=0; -#define READINTERVAL_FLOW 2000 +#define READINTERVAL_FLOW 10000 float flow_factor=7.5; //F=7.5*flowrate[L/min] float flow; @@ -18,8 +18,8 @@ uint32_t flow_counter_sum=0; void flow_setup() { timing_flow.minchange=0.0; - timing_flow.maxchange=0.5; - timing_flow.mintime=1*000; + timing_flow.maxchange=0.3; + timing_flow.mintime=10*000; timing_flow.maxtime=30*60*1000; pinMode(FLOW_PIN, INPUT_PULLUP); diff --git a/include/temperature.h b/include/temperature.h index c7e47d5..b063c10 100644 --- a/include/temperature.h +++ b/include/temperature.h @@ -4,6 +4,7 @@ mqttValueTiming timing_temperature_reservoir; mqttValueTiming timing_temperature_air; +mqttValueTiming timing_temperature_case; #include #include @@ -39,6 +40,13 @@ float tempC_air; //last reading float tempCmean_air_array[TEMPMEAN_SIZE]; float tempCmean_air=DEVICE_DISCONNECTED_C; +DeviceAddress thermometerCase={0x10,0x7E,0x22,0x99,0x01,0x08,0x00,0xA4}; +float tempC_case; //last reading +float tempCmean_case_array[TEMPMEAN_SIZE]; +float tempCmean_case=DEVICE_DISCONNECTED_C; + + + void temperature_setup() { timing_temperature_reservoir.minchange=0.0; @@ -51,10 +59,16 @@ void temperature_setup() { timing_temperature_air.mintime=2*1000; timing_temperature_air.maxtime=60*60*1000; + timing_temperature_case.minchange=0.0; + timing_temperature_case.maxchange=0.5; + timing_temperature_case.mintime=2*1000; + timing_temperature_case.maxtime=60*60*1000; + //initialize mean array for (uint16_t i=0;i