andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-09 01:09:51 +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
2023-10-20 16:51:45 +02:00
parent 161f782904 1fded64f2e
commit 0ed46679e2
19 changed files with 120 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/emsdevicevalue.cpp
View File

@@ -243,7 +243,7 @@ bool DeviceValue::hasValue() const {
has_value = Helpers::hasValue(*(uint32_t *)(value_p));
break;
case DeviceValueType::CMD:
has_value = false; // commands don't have values!
has_value = true; // we count command as an actual entity
break;
default:
break;

2
src/version.h
View File

@@ -1 +1 @@
#define EMSESP_APP_VERSION "3.6.3-dev.3b"
#define EMSESP_APP_VERSION "3.6.3-dev.4a"

2
src/web/WebDataService.cpp
View File

@@ -88,6 +88,7 @@ void WebDataService::core_data(AsyncWebServerRequest * request) {
obj["d"] = emsdevice->device_id(); // deviceid
obj["p"] = emsdevice->product_id(); // productid
obj["v"] = emsdevice->version(); // version
obj["e"] = emsdevice->count_entities(); // number of entities
}
}
@@ -102,6 +103,7 @@ void WebDataService::core_data(AsyncWebServerRequest * request) {
obj["d"] = 0; // deviceid
obj["p"] = 0; // productid
obj["v"] = 0; // version
obj["e"] = EMSESP::webCustomEntityService.count_entities(); // number of custom entities
}
root["connected"] = EMSESP::bus_status() != 2;