From 9c68142a0d14f6459b72129ca2e5d6785d1120c1 Mon Sep 17 00:00:00 2001
From: MichaelDvP <github@mdvp.de>
Date: Fri, 8 Apr 2022 11:50:09 +0200
Subject: [PATCH] mqtt HA uses only json, disable single

---
 .../src/framework/mqtt/MqttSettingsForm.tsx   | 68 ++++++++++---------
 lib/framework/MqttSettingsService.cpp         | 11 +++
 src/system.cpp                                |  1 +
 3 files changed, 48 insertions(+), 32 deletions(-)

diff --git a/interface/src/framework/mqtt/MqttSettingsForm.tsx b/interface/src/framework/mqtt/MqttSettingsForm.tsx
index fda328a59..5e41ddfe0 100644
--- a/interface/src/framework/mqtt/MqttSettingsForm.tsx
+++ b/interface/src/framework/mqtt/MqttSettingsForm.tsx
@@ -183,45 +183,49 @@ const MqttSettingsForm: FC = () => {
           control={<Checkbox name="send_response" checked={data.send_response} onChange={updateFormValue} />}
           label="Publish command output to a 'response' topic"
         />
-        <Grid container spacing={1} direction="row" justifyContent="flex-start" alignItems="flex-start">
-          <Grid item>
-            <BlockFormControlLabel
-              control={<Checkbox name="publish_single" checked={data.publish_single} onChange={updateFormValue} />}
-              label="Publish single value topics on change"
-            />
-          </Grid>
-          {data.publish_single && (
+        {!data.ha_enabled && (
+          <Grid container spacing={1} direction="row" justifyContent="flex-start" alignItems="flex-start">
             <Grid item>
               <BlockFormControlLabel
-                control={
-                  <Checkbox name="publish_single2cmd" checked={data.publish_single2cmd} onChange={updateFormValue} />
-                }
-                label="Publish to command topics (ioBroker)"
+                control={<Checkbox name="publish_single" checked={data.publish_single} onChange={updateFormValue} />}
+                label="Publish single value topics on change"
               />
             </Grid>
-          )}
-        </Grid>
-        <Grid container spacing={1} direction="row" justifyContent="flex-start" alignItems="flex-start">
-          <Grid item>
-            <BlockFormControlLabel
-              control={<Checkbox name="ha_enabled" checked={data.ha_enabled} onChange={updateFormValue} />}
-              label="Enable MQTT Discovery (Home Assistant, Domoticz)"
-            />
+            {data.publish_single && (
+              <Grid item>
+                <BlockFormControlLabel
+                  control={
+                    <Checkbox name="publish_single2cmd" checked={data.publish_single2cmd} onChange={updateFormValue} />
+                  }
+                  label="Publish to command topics (ioBroker)"
+                />
+              </Grid>
+            )}
           </Grid>
-          {data.ha_enabled && (
-            <Grid item xs={6}>
-              <ValidatedTextField
-                name="discovery_prefix"
-                label="Prefix for the Discovery topics"
-                fullWidth
-                variant="outlined"
-                value={data.discovery_prefix}
-                onChange={updateFormValue}
-                margin="normal"
+        )}
+        {!data.publish_single && (
+          <Grid container spacing={1} direction="row" justifyContent="flex-start" alignItems="flex-start">
+            <Grid item>
+              <BlockFormControlLabel
+                control={<Checkbox name="ha_enabled" checked={data.ha_enabled} onChange={updateFormValue} />}
+                label="Enable MQTT Discovery (Home Assistant, Domoticz)"
               />
             </Grid>
-          )}
-        </Grid>
+            {data.ha_enabled && (
+              <Grid item xs={6}>
+                <ValidatedTextField
+                  name="discovery_prefix"
+                  label="Prefix for the Discovery topics"
+                  fullWidth
+                  variant="outlined"
+                  value={data.discovery_prefix}
+                  onChange={updateFormValue}
+                  margin="normal"
+                />
+              </Grid>
+            )}
+          </Grid>
+        )}
         <Typography sx={{ pt: 2 }} variant="h6" color="primary">
           Publish Intervals (in seconds, 0=automatic)
         </Typography>
diff --git a/lib/framework/MqttSettingsService.cpp b/lib/framework/MqttSettingsService.cpp
index 561d7926d..6b4fef288 100644
--- a/lib/framework/MqttSettingsService.cpp
+++ b/lib/framework/MqttSettingsService.cpp
@@ -228,7 +228,15 @@ StateUpdateResult MqttSettings::update(JsonObject & root, MqttSettings & setting
         changed = true;
     }
 
+    //  if both settings are stored from older version, HA has priority
+    if (newSettings.ha_enabled && newSettings.publish_single) {
+        newSettings.publish_single = false;
+    }
+
     if (newSettings.publish_single != settings.publish_single) {
+        if (newSettings.publish_single) {
+            newSettings.ha_enabled = false;
+        }
         changed = true;
     }
 
@@ -242,6 +250,9 @@ StateUpdateResult MqttSettings::update(JsonObject & root, MqttSettings & setting
 
     if (newSettings.ha_enabled != settings.ha_enabled) {
         emsesp::EMSESP::mqtt_.ha_enabled(newSettings.ha_enabled);
+        if (newSettings.ha_enabled) {
+            newSettings.publish_single = false;
+        }
         changed = true;
     }
 
diff --git a/src/system.cpp b/src/system.cpp
index 74503cd3a..edb65a7f2 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -961,6 +961,7 @@ bool System::command_settings(const char * value, const int8_t id, JsonObject &
         node["publish_time_other"]      = settings.publish_time_other;
         node["publish_time_sensor"]     = settings.publish_time_sensor;
         node["publish_single"]          = settings.publish_single;
+        node["publish_2_command"]       = settings.publish_single2cmd;
         node["send_response"]           = settings.send_response;
     });