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

Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2

Browse Source
This commit is contained in:
MichaelDvP
2024-02-10 17:25:50 +01:00
parent c2be9b210e 57296e55f2
commit ce33fa6535
192 changed files with 594 additions and 1187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/web/WebCustomEntityService.cpp
View File

@@ -441,6 +441,8 @@ void WebCustomEntityService::publish(const bool force) {
}
}
Mqtt::add_ha_uom(config.as<JsonObject>(), entityItem.value_type, entityItem.uom); // add uom
Mqtt::add_ha_sections_to_doc("custom", stat_t, config, !ha_created, val_cond);
ha_created |= Mqtt::queue_ha(topic, config.as<JsonObject>());

2
src/web/WebCustomEntityService.h
View File

@@ -32,7 +32,7 @@ class CustomEntityItem {
uint16_t type_id;
uint8_t offset;
int8_t value_type;
uint8_t uom;
uint8_t uom; // DeviceValueUOM
std::string name;
double factor;
bool writeable;

2
src/web/WebCustomizationService.cpp
View File

@@ -186,7 +186,7 @@ void WebCustomizationService::device_entities(AsyncWebServerRequest * request) {
if (request->hasParam(F_(id))) {
id = Helpers::atoint(request->getParam(F_(id))->value().c_str()); // get id from url
auto * response = new MsgpackAsyncJsonResponse(true);
auto * response = new AsyncJsonResponse(true, true); // array and msgpack
// while (!response) {
// delete response;

2
src/web/WebDataService.cpp
View File

@@ -179,7 +179,7 @@ void WebDataService::device_data(AsyncWebServerRequest * request) {
if (request->hasParam(F_(id))) {
id = Helpers::atoint(request->getParam(F_(id))->value().c_str()); // get id from url
auto * response = new MsgpackAsyncJsonResponse(false);
auto * response = new AsyncJsonResponse(false, true); // use msgPack
// check size
// while (!response) {