From 89b7eaac1cbf5e393ef2501a19fffea61b563093 Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Fri, 11 Aug 2023 19:14:23 +0200 Subject: [PATCH 1/3] fix MM10 pump command --- src/devices/mixer.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/devices/mixer.cpp b/src/devices/mixer.cpp index 182e6b703..b0ef46318 100644 --- 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) { From c8e64668e9cfc45a2e11c1e55b5fcf9d50d84c24 Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Fri, 11 Aug 2023 19:14:52 +0200 Subject: [PATCH 2/3] fix upload settings file #1256 --- src/system.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/system.cpp b/src/system.cpp index da51825a8..f8a55a4c2 100644 --- a/src/system.cpp +++ b/src/system.cpp @@ -1017,11 +1017,12 @@ bool System::check_restore() { 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(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); From 86737fb38a193c35f63bf969bcbdb2a4cc659172 Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Fri, 11 Aug 2023 19:33:06 +0200 Subject: [PATCH 3/3] also Network --- src/system.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/system.cpp b/src/system.cpp index f8a55a4c2..818cc215e 100644 --- a/src/system.cpp +++ b/src/system.cpp @@ -1016,7 +1016,7 @@ 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(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);