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

code optimizations

Browse Source
This commit is contained in:
proddy
2022-03-27 22:47:16 +02:00
parent 3853c6ca18
commit ac7c7cee84
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/emsdevice.cpp
View File

@@ -638,7 +638,7 @@ void EMSdevice::generate_values_web(JsonObject & output) {
JsonArray data = output.createNestedArray("data"); JsonArray data = output.createNestedArray("data");
// sort the device values // sort the device values
std::sort(devicevalues_.begin(), devicevalues_.end(), [](const emsesp::DeviceValue & a, const emsesp::DeviceValue & b) { std::sort(devicevalues_.begin(), devicevalues_.end(), [](const emsesp::DeviceValue & a, const emsesp::DeviceValue & b __attribute__((unused))) {
return a.has_state(DeviceValueState::DV_FAVORITE); return a.has_state(DeviceValueState::DV_FAVORITE);
}); });
@@ -858,7 +858,7 @@ void EMSdevice::reset_entity_masks() {
} }
// disable/exclude/mask_out a device entity based on the id // disable/exclude/mask_out a device entity based on the id
void EMSdevice::mask_entity(std::string entity_id) { void EMSdevice::mask_entity(std::string & entity_id) {
// first character contains mask flags // first character contains mask flags
uint8_t flag = Helpers::hextoint(entity_id.substr(0, 2).c_str()); uint8_t flag = Helpers::hextoint(entity_id.substr(0, 2).c_str());
for (auto & dv : devicevalues_) { for (auto & dv : devicevalues_) {

2
src/emsdevice.h
View File

@@ -183,7 +183,7 @@ class EMSdevice {
char * show_telegram_handlers(char * result, const size_t len, const uint8_t handlers); char * show_telegram_handlers(char * result, const size_t len, const uint8_t handlers);
void show_mqtt_handlers(uuid::console::Shell & shell) const; void show_mqtt_handlers(uuid::console::Shell & shell) const;
void list_device_entries(JsonObject & output) const; void list_device_entries(JsonObject & output) const;
void mask_entity(std::string entity_id); void mask_entity(std::string & entity_id);
void reset_entity_masks(); void reset_entity_masks();
using process_function_p = std::function<void(std::shared_ptr<const Telegram>)>; using process_function_p = std::function<void(std::shared_ptr<const Telegram>)>;

3
src/test/test.cpp
View File

@@ -609,7 +609,8 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
// toggle mode // toggle mode
for (const auto & emsdevice : EMSESP::emsdevices) { for (const auto & emsdevice : EMSESP::emsdevices) {
if (emsdevice->unique_id() == 1) { // boiler if (emsdevice->unique_id() == 1) { // boiler
emsdevice->mask_entity("07wwseltemp"); std::string a = "07wwseltemp";
emsdevice->mask_entity(a);
break; break;
} }
} }