refactor: imporved updating OT sensors

src/OpenThermTask.h

@@ -249,8 +249,8 @@ protected:
 
     if (vars.master.dhw.enabled != vars.slave.dhw.enabled) {
       this->prevUpdateNonEssentialVars = 0;
-      vars.slave.dhw.enabled = vars.master.heating.enabled;
+      vars.slave.dhw.enabled = vars.master.dhw.enabled;
-      Log.sinfoln(FPSTR(L_OT_DHW), vars.master.heating.enabled ? F("Enabled") : F("Disabled"));
+      Log.sinfoln(FPSTR(L_OT_DHW), vars.master.dhw.enabled ? F("Enabled") : F("Disabled"));
     }
 
     vars.slave.heating.active = CustomOpenTherm::isCentralHeatingActive(response);
@@ -471,13 +471,24 @@ protected:
             vars.slave.modulation.current, power, settings.opentherm.maxPower, settings.opentherm.minPower
           );
 
+          // Modulation level sensors
+          Sensors::setValueByType(
+            Sensors::Type::OT_MODULATION_LEVEL, vars.slave.modulation.current,
+            Sensors::ValueType::PRIMARY, true, true
+          );
+
+          // Power sensors
+          Sensors::setValueByType(
+            Sensors::Type::OT_CURRENT_POWER, power,
+            Sensors::ValueType::PRIMARY, true, true
+          );
+
         } else {
           Log.swarningln(FPSTR(L_OT), F("Failed receive modulation level"));
         }
 
       } else if (vars.slave.modulation.current > 0) {
         vars.slave.modulation.current = 0;
-      }
 
         // Modulation level sensors
         Sensors::setValueByType(
@@ -491,6 +502,7 @@ protected:
           Sensors::ValueType::PRIMARY, true, true
         );
       }
+    }
 
     // Update DHW temp
     if (Sensors::getAmountByType(Sensors::Type::OT_DHW_TEMP)) {
@@ -512,15 +524,15 @@ protected:
             vars.slave.dhw.currentTemp, convertedDhwTemp
           );
 
-        } else {
-          Log.swarningln(FPSTR(L_OT_DHW), F("Failed receive temp"));
-        }
-      }
-
           Sensors::setValueByType(
             Sensors::Type::OT_DHW_TEMP, convertedDhwTemp,
             Sensors::ValueType::PRIMARY, true, true
           );
+
+        } else {
+          Log.swarningln(FPSTR(L_OT_DHW), F("Failed receive temp"));
+        }
+      }
     }
 
     // Update DHW temp 2
@@ -543,15 +555,15 @@ protected:
             vars.slave.dhw.currentTemp2, convertedDhwTemp2
           );
 
-        } else {
-          Log.swarningln(FPSTR(L_OT_DHW), F("Failed receive temp 2"));
-        }
-      }
-
           Sensors::setValueByType(
             Sensors::Type::OT_DHW_TEMP2, convertedDhwTemp2,
             Sensors::ValueType::PRIMARY, true, true
           );
+
+        } else {
+          Log.swarningln(FPSTR(L_OT_DHW), F("Failed receive temp 2"));
+        }
+      }
     }
 
     // Update DHW flow rate
@@ -574,15 +586,15 @@ protected:
             vars.slave.dhw.flowRate, convertedDhwFlowRate
           );
 
-        } else {
-          Log.swarningln(FPSTR(L_OT_DHW), F("Failed receive flow rate"));
-        }
-      }
-
           Sensors::setValueByType(
             Sensors::Type::OT_DHW_FLOW_RATE, convertedDhwFlowRate,
             Sensors::ValueType::PRIMARY, true, true
           );
+
+        } else {
+          Log.swarningln(FPSTR(L_OT_DHW), F("Failed receive flow rate"));
+        }
+      }
     }
 
     // Update heating temp
@@ -602,14 +614,14 @@ protected:
           vars.slave.heating.currentTemp, convertedHeatingTemp
         );
 
-      } else {
-        Log.swarningln(FPSTR(L_OT_HEATING), F("Failed receive temp"));
-      }
-
         Sensors::setValueByType(
           Sensors::Type::OT_HEATING_TEMP, convertedHeatingTemp,
           Sensors::ValueType::PRIMARY, true, true
         );
+
+      } else {
+        Log.swarningln(FPSTR(L_OT_HEATING), F("Failed receive temp"));
+      }
     }
 
     // Update heating return temp
@@ -629,14 +641,14 @@ protected:
           vars.slave.heating.returnTemp, convertedHeatingReturnTemp
         );
 
-      } else {
-        Log.swarningln(FPSTR(L_OT_HEATING), F("Failed receive return temp"));
-      }
-
         Sensors::setValueByType(
           Sensors::Type::OT_HEATING_RETURN_TEMP, convertedHeatingReturnTemp,
           Sensors::ValueType::PRIMARY, true, true
         );
+
+      } else {
+        Log.swarningln(FPSTR(L_OT_HEATING), F("Failed receive return temp"));
+      }
     }
 
     // Update CH2 temp
@@ -659,15 +671,15 @@ protected:
             vars.slave.ch2.currentTemp, convertedCh2Temp
           );
 
-        } else {
-          Log.swarningln(FPSTR(L_OT_CH2), F("Failed receive temp"));
-        }
-      }
-
           Sensors::setValueByType(
             Sensors::Type::OT_CH2_TEMP, convertedCh2Temp,
             Sensors::ValueType::PRIMARY, true, true
           );
+
+        } else {
+          Log.swarningln(FPSTR(L_OT_CH2), F("Failed receive temp"));
+        }
+      }
     }
 
     // Update exhaust temp
@@ -687,14 +699,14 @@ protected:
           vars.slave.exhaustTemp, convertedExhaustTemp
         );
 
-      } else {
-        Log.swarningln(FPSTR(L_OT), F("Failed receive exhaust temp"));
-      }
-
         Sensors::setValueByType(
           Sensors::Type::OT_EXHAUST_TEMP, convertedExhaustTemp,
           Sensors::ValueType::PRIMARY, true, true
         );
+
+      } else {
+        Log.swarningln(FPSTR(L_OT), F("Failed receive exhaust temp"));
+      }
     }
 
     // Update heat exchanger temp
@@ -714,14 +726,14 @@ protected:
           vars.slave.heatExchangerTemp, convertedHeatExchTemp
         );
 
-      } else {
-        Log.swarningln(FPSTR(L_OT), F("Failed receive heat exchanger temp"));
-      }
-
         Sensors::setValueByType(
           Sensors::Type::OT_HEAT_EXCHANGER_TEMP, convertedHeatExchTemp,
           Sensors::ValueType::PRIMARY, true, true
         );
+
+      } else {
+        Log.swarningln(FPSTR(L_OT), F("Failed receive heat exchanger temp"));
+      }
     }
 
     // Update outdoor temp
@@ -741,14 +753,14 @@ protected:
           vars.slave.heating.outdoorTemp, convertedOutdoorTemp
         );
 
-      } else {
-        Log.swarningln(FPSTR(L_OT), F("Failed receive outdoor temp"));
-      }
-
         Sensors::setValueByType(
           Sensors::Type::OT_OUTDOOR_TEMP, convertedOutdoorTemp,
           Sensors::ValueType::PRIMARY, true, true
         );
+
+      } else {
+        Log.swarningln(FPSTR(L_OT), F("Failed receive outdoor temp"));
+      }
     }
     
     // Update pressure
@@ -768,14 +780,14 @@ protected:
           vars.slave.pressure, convertedPressure
         );
 
-      } else {
-        Log.swarningln(FPSTR(L_OT), F("Failed receive pressure"));
-      }
-
         Sensors::setValueByType(
           Sensors::Type::OT_PRESSURE, convertedPressure,
           Sensors::ValueType::PRIMARY, true, true
         );
+
+      } else {
+        Log.swarningln(FPSTR(L_OT), F("Failed receive pressure"));
+      }
     }
 
 

src/Sensors.h

@@ -190,7 +190,7 @@ public:
         }
       }
 
-      if (sSensor.filtering && fabs(rSensor.values[valueId]) >= 0.1f) {
+      if (sSensor.filtering && fabsf(rSensor.values[valueId]) >= 0.1f) {
         rSensor.values[valueId] += (compensatedValue - rSensor.values[valueId]) * sSensor.filteringFactor;
         
       } else {
@@ -202,8 +202,7 @@ public:
       rSensor.activityTime = millis();
     }
 
-    if (markConnected) {
+    if (markConnected && !rSensor.connected) {
-      if (!rSensor.connected) {        
       rSensor.connected = true;
 
       Log.snoticeln(
@@ -211,7 +210,6 @@ public:
         sensorId, sSensor.name
       );
     }
-    }
 
     Log.snoticeln(
       FPSTR(L_SENSORS), F("#%hhu '%s' new value %hhu: %.2f, compensated: %.2f, raw: %.2f"),