andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-01-26 08:39:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'emsesp:dev' into dev

Browse Source
This commit is contained in:
Proddy
2026-01-10 18:39:48 +01:00
committed by GitHub
parent 43b3e74c08 fad82c8c68
commit 3f5163c1e4
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/mqtt.cpp
View File

@@ -1167,6 +1167,8 @@ void Mqtt::add_ha_classes(JsonObject doc, const uint8_t device_type, const uint8
doc[uom_ha] = "L/min";
} else if (uom == DeviceValueUOM::LH) {
doc[uom_ha] = "L/h";
} else if (uom == DeviceValueUOM::L) {
doc[uom_ha] = "L";
} else if (uom != DeviceValueUOM::NONE) {
doc[uom_ha] = EMSdevice::uom_to_string(uom); // use default
} else if (discovery_type() != discoveryType::HOMEASSISTANT) {

6
src/web/WebSettingsService.cpp
View File

@@ -308,9 +308,9 @@ StateUpdateResult WebSettings::update(JsonObject root, WebSettings & settings) {
}
// save the settings if changed from the webUI
// if we encountered an invalid GPIO, rollback changes and don't save settings, and report the error to WebUI
// without a restart
if (!have_valid_gpios) {
// if we encountered an invalid GPIO on same boardprofile, rollback changes and don't save settings,
// and report the error to WebUI without a restart
if (!have_valid_gpios && original_settings.board_profile == settings.board_profile) {
// replace settings with original settings
settings = original_settings;
EMSESP::system_.restore_snapshot_gpios(used_gpios, system_gpios);