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

allow call system allvalues [values|info|entities], increase TCP stack

Browse Source
This commit is contained in:
MichaelDvP
2024-07-31 14:15:46 +02:00
parent a33733484c
commit 49b7f99e81
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platformio.ini
View File

@@ -30,7 +30,7 @@ build_flags =
-D ONEWIRE_CRC16=0 -D ONEWIRE_CRC16=0
-D CONFIG_ETH_ENABLED -D CONFIG_ETH_ENABLED
-D CONFIG_UART_ISR_IN_IRAM -D CONFIG_UART_ISR_IN_IRAM
-D CONFIG_ASYNC_TCP_STACK_SIZE=5120 -D CONFIG_ASYNC_TCP_STACK_SIZE=6144
-D CONFIG_ASYNC_TCP_QUEUE=32 -D CONFIG_ASYNC_TCP_QUEUE=32
-D CONFIG_ASYNC_TCP_TASK_PRIORITY=10 -D CONFIG_ASYNC_TCP_TASK_PRIORITY=10

18
src/system.cpp
View File

@@ -113,33 +113,37 @@ bool System::command_response(const char * value, const int8_t id, JsonObject ou
bool System::command_allvalues(const char * value, const int8_t id, JsonObject output) { bool System::command_allvalues(const char * value, const int8_t id, JsonObject output) {
JsonDocument doc; JsonDocument doc;
JsonObject device_output; JsonObject device_output;
// default to values
if (value == nullptr || strlen(value) == 0) {
value = F_(values);
}
// System Entities // System Entities
// device_output = output["System"].to<JsonObject>(); // device_output = output["System"].to<JsonObject>();
// get_value_info(device_output, F_(values)); // get_value_info(device_output, value);
// EMS-Device Entities // EMS-Device Entities
for (const auto & emsdevice : EMSESP::emsdevices) { for (const auto & emsdevice : EMSESP::emsdevices) {
std::string title = emsdevice->device_type_2_device_name_translated() + std::string(" ") + emsdevice->to_string(); std::string title = emsdevice->device_type_2_device_name_translated() + std::string(" ") + emsdevice->to_string();
device_output = output[title].to<JsonObject>(); device_output = output[title].to<JsonObject>();
emsdevice->get_value_info(device_output, F_(values), DeviceValueTAG::TAG_NONE); emsdevice->get_value_info(device_output, value, DeviceValueTAG::TAG_NONE);
} }
// Custom Entities // Custom Entities
device_output = output["Custom Entities"].to<JsonObject>(); device_output = output["Custom Entities"].to<JsonObject>();
EMSESP::webCustomEntityService.get_value_info(device_output, F_(values)); EMSESP::webCustomEntityService.get_value_info(device_output, value);
// Scheduler // Scheduler
device_output = output["Scheduler"].to<JsonObject>(); device_output = output["Scheduler"].to<JsonObject>();
EMSESP::webSchedulerService.get_value_info(device_output, F_(values)); EMSESP::webSchedulerService.get_value_info(device_output, value);
// Sensors // Sensors
device_output = output["Analog Sensors"].to<JsonObject>(); device_output = output["Analog Sensors"].to<JsonObject>();
EMSESP::analogsensor_.get_value_info(device_output, F_(values)); EMSESP::analogsensor_.get_value_info(device_output, value);
device_output = output["Temperature Sensors"].to<JsonObject>(); device_output = output["Temperature Sensors"].to<JsonObject>();
EMSESP::temperaturesensor_.get_value_info(device_output, F_(values)); EMSESP::temperaturesensor_.get_value_info(device_output, value);
return device_output.size() > 0; return true;
} }
// fetch device values // fetch device values