Publish telemetry when valve state changes

kivancsikert · Feb 1, 2024 · f12b883 · f12b883
1 parent 6c71e60
commit f12b883
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/src/peripherals/flow_control/FlowControl.hpp b/src/peripherals/flow_control/FlowControl.hpp
@@ -29,7 +29,9 @@ class FlowControl : public Peripheral<FlowControlConfig> {
         PwmMotorDriver& controller, ValveControlStrategy& strategy,
         gpio_num_t pin, double qFactor, milliseconds measurementFrequency)
         : Peripheral<FlowControlConfig>(name, mqttRoot)
-        , valve(name, controller, strategy, mqttRoot)
+        , valve(name, controller, strategy, mqttRoot, [this]() {
+            publishTelemetry();
+        })
         , flowMeter(name, mqttRoot, pin, qFactor, measurementFrequency) {
     }
 

diff --git a/src/peripherals/valve/Valve.hpp b/src/peripherals/valve/Valve.hpp
@@ -34,7 +34,9 @@ class Valve
 public:
     Valve(const String& name, PwmMotorDriver& controller, ValveControlStrategy& strategy, shared_ptr<MqttDriver::MqttRoot> mqttRoot)
         : Peripheral<ValveConfig>(name, mqttRoot)
-        , valve(name, controller, strategy, mqttRoot) {
+        , valve(name, controller, strategy, mqttRoot, [this]() {
+            publishTelemetry();
+        }) {
     }
 
     void configure(const ValveConfig& config) override {

diff --git a/src/peripherals/valve/ValveComponent.hpp b/src/peripherals/valve/ValveComponent.hpp
@@ -16,6 +16,7 @@
 #include <kernel/Concurrent.hpp>
 #include <kernel/Service.hpp>
 #include <kernel/Task.hpp>
+#include <kernel/Time.hpp>
 #include <kernel/Telemetry.hpp>
 #include <kernel/drivers/MotorDriver.hpp>
 
@@ -153,10 +154,11 @@ class LatchingValveControlStrategy
 
 class ValveComponent : public Component {
 public:
-    ValveComponent(const String& name, PwmMotorDriver& controller, ValveControlStrategy& strategy, shared_ptr<MqttDriver::MqttRoot> mqttRoot)
+    ValveComponent(const String& name, PwmMotorDriver& controller, ValveControlStrategy& strategy, shared_ptr<MqttDriver::MqttRoot> mqttRoot, std::function<void()> publishTelemetry)
         : Component(name, mqttRoot)
         , controller(controller)
-        , strategy(strategy) {
+        , strategy(strategy)
+        , publishTelemetry(publishTelemetry) {
         Log.infoln("Creating valve '%s' with strategy %s",
             name.c_str(), strategy.describe().c_str());
 
@@ -269,10 +271,12 @@ class ValveComponent : public Component {
         mqttRoot->publish("events/state", [=](JsonObject& json) {
             json["state"] = state;
         });
+        publishTelemetry();
     }
 
     PwmMotorDriver& controller;
     ValveControlStrategy& strategy;
+    std::function<void()> publishTelemetry;
 
     ValveState state = ValveState::NONE;