Merge pull request emsesp#1257 from MichaelDvP/dev

proddy · Aug 11, 2023 · faec42a · faec42a
2 parents ac889d9 + 86737fb
commit faec42a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/devices/mixer.cpp b/src/devices/mixer.cpp
@@ -347,7 +347,9 @@ bool Mixer::set_pump(const char * value, const int8_t id) {
         return false;
     }
     if (flags() == EMSdevice::EMS_DEVICE_FLAG_MM10) {
-        write_command(0xAC, 1, b ? 0x64 : 0, 0xAB);
+        // AC telegram can only be written with offset 0
+        uint8_t dat[2] = {flowSetTemp_, b ? (uint8_t)0x64 : (uint8_t)0};
+        write_command(0xAC, 0, dat, sizeof(dat), 0xAB);
         return true;
     }
     if (flags() == EMSdevice::EMS_DEVICE_FLAG_IPM) {

diff --git a/src/system.cpp b/src/system.cpp
@@ -1016,12 +1016,13 @@ bool System::check_restore() {
             std::string settings_type = input["type"];
             if (settings_type == "settings") {
                 // It's a settings file. Parse each section separately. If it's system related it will require a reboot
-                reboot_required = saveSettings(NETWORK_SETTINGS_FILE, "Network Settings", input);
-                reboot_required |= saveSettings(AP_SETTINGS_FILE, "AP Settings", input);
-                reboot_required |= saveSettings(MQTT_SETTINGS_FILE, "MQTT Settings", input);
-                reboot_required |= saveSettings(NTP_SETTINGS_FILE, "NTP Settings", input);
-                reboot_required |= saveSettings(SECURITY_SETTINGS_FILE, "Security Settings", input);
+                reboot_required = saveSettings(NETWORK_SETTINGS_FILE, "Network", input);
+                reboot_required |= saveSettings(AP_SETTINGS_FILE, "AP", input);
+                reboot_required |= saveSettings(MQTT_SETTINGS_FILE, "MQTT", input);
+                reboot_required |= saveSettings(NTP_SETTINGS_FILE, "NTP", input);
+                reboot_required |= saveSettings(SECURITY_SETTINGS_FILE, "Security", input);
                 reboot_required |= saveSettings(EMSESP_SETTINGS_FILE, "Settings", input);
+                reboot_required |= saveSettings(OTA_SETTINGS_FILE, "OTA", input);
             } else if (settings_type == "customizations") {
                 // it's a customization file, just replace it and there's no need to reboot
                 saveSettings(EMSESP_CUSTOMIZATION_FILE, "Customizations", input);