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

only add entities who's mask has changed to list

Browse Source
This commit is contained in:
Proddy
2022-04-03 13:43:08 +02:00
parent 4a56726f61
commit 77f583f91f
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/web/WebCustomizationService.cpp
View File

@@ -172,11 +172,10 @@ void WebCustomizationService::devices(AsyncWebServerRequest * request) {
obj["i"] = emsdevice->unique_id(); // a unique id obj["i"] = emsdevice->unique_id(); // a unique id
/* /*
// shortname - we prefix the count to make it unique
uint8_t device_index = EMSESP::device_index(emsdevice->device_type(), emsdevice->unique_id()); uint8_t device_index = EMSESP::device_index(emsdevice->device_type(), emsdevice->unique_id());
if (device_index) { if (device_index) {
char s[10]; char s[10];
obj["s"] = emsdevice->device_type_name() + Helpers::smallitoa(s, device_index) + " (" + emsdevice->name() + ")"; obj["s"] = emsdevice->device_type_name() + Helpers::smallitoa(s, device_index) + " (" + emsdevice->name() + ")"; // shortname - we prefix the count to make it unique
} else { } else {
obj["s"] = emsdevice->device_type_name() + " (" + emsdevice->name() + ")"; obj["s"] = emsdevice->device_type_name() + " (" + emsdevice->name() + ")";
} }
@@ -221,17 +220,17 @@ void WebCustomizationService::masked_entities(AsyncWebServerRequest * request, J
if (emsdevice) { if (emsdevice) {
uint8_t unique_device_id = json["id"]; uint8_t unique_device_id = json["id"];
if (emsdevice->unique_id() == unique_device_id) { if (emsdevice->unique_id() == unique_device_id) {
// first reset all the entity ids
emsdevice->reset_entity_masks();
// build a list of entities // build a list of entities
JsonArray entity_ids_json = json["entity_ids"]; JsonArray entity_ids_json = json["entity_ids"];
std::vector<std::string> entity_ids; std::vector<std::string> entity_ids;
for (JsonVariant id : entity_ids_json) { for (const JsonVariant id : entity_ids_json) {
std::string entity_id = id.as<std::string>(); std::string entity_id = id.as<std::string>();
emsdevice->mask_entity(entity_id); // this will have immediate affect // handle the mask change and add to the list of customized entities
// if the value is different from the default (mask == 0)
if (emsdevice->mask_entity(entity_id)) {
entity_ids.push_back(entity_id); entity_ids.push_back(entity_id);
} }
}
// Save the list to the customization file // Save the list to the customization file
uint8_t product_id = emsdevice->product_id(); uint8_t product_id = emsdevice->product_id();