andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 00:09:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

use device names from flash

Browse Source
This commit is contained in:
MichaelDvP
2021-09-28 13:08:56 +02:00
parent da5b4aa79d
commit 91005876eb
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/system.cpp
View File

@@ -69,16 +69,16 @@ bool System::command_fetch(const char * value, const int8_t id) {
LOG_INFO(F("Requesting data from EMS devices")); LOG_INFO(F("Requesting data from EMS devices"));
EMSESP::fetch_device_values(); EMSESP::fetch_device_values();
return true; return true;
} else if (value_s == "boiler") { } else if (value_s == read_flash_string(F_(boiler))) {
EMSESP::fetch_device_values_type(EMSdevice::DeviceType::BOILER); EMSESP::fetch_device_values_type(EMSdevice::DeviceType::BOILER);
return true; return true;
} else if (value_s == "thermostat") { } else if (value_s == read_flash_string(F_(thermostat))) {
EMSESP::fetch_device_values_type(EMSdevice::DeviceType::THERMOSTAT); EMSESP::fetch_device_values_type(EMSdevice::DeviceType::THERMOSTAT);
return true; return true;
} else if (value_s == "solar") { } else if (value_s == read_flash_string(F_(solar))) {
EMSESP::fetch_device_values_type(EMSdevice::DeviceType::SOLAR); EMSESP::fetch_device_values_type(EMSdevice::DeviceType::SOLAR);
return true; return true;
} else if (value_s == "mixer") { } else if (value_s == read_flash_string(F_(mixer))) {
EMSESP::fetch_device_values_type(EMSdevice::DeviceType::MIXER); EMSESP::fetch_device_values_type(EMSdevice::DeviceType::MIXER);
return true; return true;
} }
@@ -96,22 +96,22 @@ bool System::command_publish(const char * value, const int8_t id) {
EMSESP::publish_all(true); // includes HA EMSESP::publish_all(true); // includes HA
LOG_INFO(F("Publishing all data to MQTT, including HA configs")); LOG_INFO(F("Publishing all data to MQTT, including HA configs"));
return true; return true;
} else if (value_s == "boiler") { } else if (value_s == read_flash_string(F_(boiler))) {
EMSESP::publish_device_values(EMSdevice::DeviceType::BOILER); EMSESP::publish_device_values(EMSdevice::DeviceType::BOILER);
return true; return true;
} else if (value_s == "thermostat") { } else if (value_s == read_flash_string(F_(thermostat))) {
EMSESP::publish_device_values(EMSdevice::DeviceType::THERMOSTAT); EMSESP::publish_device_values(EMSdevice::DeviceType::THERMOSTAT);
return true; return true;
} else if (value_s == "solar") { } else if (value_s == read_flash_string(F_(solar))) {
EMSESP::publish_device_values(EMSdevice::DeviceType::SOLAR); EMSESP::publish_device_values(EMSdevice::DeviceType::SOLAR);
return true; return true;
} else if (value_s == "mixer") { } else if (value_s == read_flash_string(F_(mixer))) {
EMSESP::publish_device_values(EMSdevice::DeviceType::MIXER); EMSESP::publish_device_values(EMSdevice::DeviceType::MIXER);
return true; return true;
} else if (value_s == "other") { } else if (value_s == "other") {
EMSESP::publish_other_values(); EMSESP::publish_other_values();
return true; return true;
} else if (value_s == "dallassensor") { } else if (value_s == read_flash_string(F_(dallassensor))) {
EMSESP::publish_sensor_values(true); EMSESP::publish_sensor_values(true);
return true; return true;
} }