Merge branch 'rancilio-pid:master' into master

rancilio-pid · Oct 19, 2023 · 94d7f56 · 94d7f56
2 parents 2f889c5 + 5f128b2
commit 94d7f56
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/MQTT.h b/src/MQTT.h
@@ -447,6 +447,7 @@ int sendHASSIODiscoveryMsg() {
   // Sensor Devices 
   DiscoveryObject actual_temperature = GenerateSensorDevice("temperature", "Boiler Temperature"); 
   DiscoveryObject heaterPower = GenerateSensorDevice("heaterPower", "Heater Power", "ms", "power_factor"); 
+  DiscoveryObject machineStateDevice = GenerateSensorDevice("machineState", "Machine State", "null", "enum"); 
   // Switch Devices 
   DiscoveryObject pidOn = GenerateSwitchDevice("pidON", "Use PID"); 
   DiscoveryObject steamON = GenerateSwitchDevice("steamON", "Steam"); 
@@ -469,6 +470,7 @@ int sendHASSIODiscoveryMsg() {
     aggIMax,
     actual_temperature,
     heaterPower,
+    machineStateDevice,
     brewtime,
     pidOn,
     steamON,

diff --git a/src/main.cpp b/src/main.cpp
@@ -1985,6 +1985,7 @@ void setup() {
     mqttSensors["currentKp"] = []{ return bPID.GetKp(); };
     mqttSensors["currentKi"] = []{ return bPID.GetKi(); };
     mqttSensors["currentKd"] = []{ return bPID.GetKd(); };
+    mqttSensors["machineState"] = []{ return machineState; };
 
     Serial.begin(115200);