From c556c38cbcc02c4d5f69dac4d8430dd53386ab69 Mon Sep 17 00:00:00 2001
From: Yurii <laxilef@gmail.com>
Date: Wed, 22 Nov 2023 23:07:02 +0300
Subject: [PATCH] small fix settings

---
 src/HaHelper.h | 44 ++++++++++++++++++++++----------------------
 src/MqttTask.h |  2 +-
 src/Settings.h |  2 +-
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/HaHelper.h b/src/HaHelper.h
index f85436f..3928421 100644
--- a/src/HaHelper.h
+++ b/src/HaHelper.h
@@ -257,28 +257,6 @@ public:
     return publish(getTopic("number", "heating_hysteresis").c_str(), doc);
   }
 
-  bool publishNumberHeatingMaxModulation(bool enabledByDefault = true) {
-    StaticJsonDocument<1536> doc;
-    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = devicePrefix + F("_heating_max_modulation");
-    doc[FPSTR(HA_OBJECT_ID)] = devicePrefix + F("_heating_max_modulation");
-    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("config");
-    doc[FPSTR(HA_DEVICE_CLASS)] = F("power_factor");
-    doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("%");
-    doc[FPSTR(HA_NAME)] = F("Max modulation");
-    doc[FPSTR(HA_ICON)] = F("mdi:speedometer");
-    doc[FPSTR(HA_STATE_TOPIC)] = devicePrefix + F("/settings");
-    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.heating.maxModulation|int(1) }}");
-    doc[FPSTR(HA_COMMAND_TOPIC)] = devicePrefix + F("/settings/set");
-    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"heating\": {\"maxModulation\" : {{ value }}}}");
-    doc[FPSTR(HA_MIN)] = 1;
-    doc[FPSTR(HA_MAX)] = 100;
-    doc[FPSTR(HA_STEP)] = 1;
-    doc[FPSTR(HA_MODE)] = "box";
-
-    return publish(getTopic("number", "heating_max_modulation").c_str(), doc);
-  }
-
   bool publishSensorHeatingSetpoint(bool enabledByDefault = true) {
     StaticJsonDocument<1536> doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = devicePrefix + F("/status");
@@ -377,6 +355,28 @@ public:
     return publish(getTopic("number", "heating_max_temp").c_str(), doc);
   }
 
+  bool publishNumberHeatingMaxModulation(bool enabledByDefault = true) {
+    StaticJsonDocument<1536> doc;
+    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
+    doc[FPSTR(HA_UNIQUE_ID)] = devicePrefix + F("_heating_max_modulation");
+    doc[FPSTR(HA_OBJECT_ID)] = devicePrefix + F("_heating_max_modulation");
+    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("config");
+    doc[FPSTR(HA_DEVICE_CLASS)] = F("power_factor");
+    doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("%");
+    doc[FPSTR(HA_NAME)] = F("Max modulation");
+    doc[FPSTR(HA_ICON)] = F("mdi:speedometer");
+    doc[FPSTR(HA_STATE_TOPIC)] = devicePrefix + F("/settings");
+    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.heating.maxModulation|int(1) }}");
+    doc[FPSTR(HA_COMMAND_TOPIC)] = devicePrefix + F("/settings/set");
+    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"heating\": {\"maxModulation\" : {{ value }}}}");
+    doc[FPSTR(HA_MIN)] = 1;
+    doc[FPSTR(HA_MAX)] = 100;
+    doc[FPSTR(HA_STEP)] = 1;
+    doc[FPSTR(HA_MODE)] = "box";
+
+    return publish(getTopic("number", "heating_max_modulation").c_str(), doc);
+  }
+
 
   bool publishSwitchDHW(bool enabledByDefault = true) {
     StaticJsonDocument<1536> doc;
diff --git a/src/MqttTask.h b/src/MqttTask.h
index ee9a9bf..aa257b0 100644
--- a/src/MqttTask.h
+++ b/src/MqttTask.h
@@ -394,12 +394,12 @@ protected:
     haHelper.publishSwitchHeatingTurbo();
     //haHelper.publishNumberHeatingTarget(false);
     haHelper.publishNumberHeatingHysteresis();
-    haHelper.publishNumberHeatingMaxModulation(false);
     haHelper.publishSensorHeatingSetpoint(false);
     haHelper.publishSensorCurrentHeatingMinTemp(false);
     haHelper.publishSensorCurrentHeatingMaxTemp(false);
     haHelper.publishNumberHeatingMinTemp(false);
     haHelper.publishNumberHeatingMaxTemp(false);
+    haHelper.publishNumberHeatingMaxModulation(false);
 
     // pid
     haHelper.publishSwitchPID();
diff --git a/src/Settings.h b/src/Settings.h
index caa49d6..34d1870 100644
--- a/src/Settings.h
+++ b/src/Settings.h
@@ -32,9 +32,9 @@ struct Settings {
     bool turbo = false;
     float target = 40.0f;
     float hysteresis = 0.5f;
-    byte maxModulation = 100;
     byte minTemp = 20.0f;
     byte maxTemp = 90.0f;
+    byte maxModulation = 100;
   } heating;
 
   struct {