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

/api/custom show {} if no Custom Entities configured instead of an error #1297

Browse Source
This commit is contained in:
Proddy
2023-09-17 14:27:33 +02:00
parent 0ab573225d
commit a3f05cb08b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/command.cpp
View File

@@ -300,7 +300,7 @@ uint8_t Command::call(const uint8_t device_type, const char * cmd, const char *
// see if there is a command registered // see if there is a command registered
auto cf = find_command(device_type, device_id, cmd); auto cf = find_command(device_type, device_id, cmd);
// check if its a call to and end-point to a device // check if its a call to an end-point of a device
// this is used to fetch the attributes of the device entity, or call a command directly // this is used to fetch the attributes of the device entity, or call a command directly
bool single_command = (!value || !strlen(value)); bool single_command = (!value || !strlen(value));
if (single_command) { if (single_command) {
@@ -545,7 +545,9 @@ bool Command::device_has_commands(const uint8_t device_type) {
} }
if (device_type == EMSdevice::DeviceType::CUSTOM) { if (device_type == EMSdevice::DeviceType::CUSTOM) {
return (EMSESP::webEntityService.count_entities() != 0); // if there are no custom entities, don't error but return a message
return true;
// return (EMSESP::webCustomEntityService.count_entities() != 0);
} }
if (device_type == EMSdevice::DeviceType::TEMPERATURESENSOR) { if (device_type == EMSdevice::DeviceType::TEMPERATURESENSOR) {
@@ -608,7 +610,7 @@ void Command::show_all(uuid::console::Shell & shell) {
show(shell, EMSdevice::DeviceType::SYSTEM, true); show(shell, EMSdevice::DeviceType::SYSTEM, true);
// show Custom // show Custom
if (EMSESP::webEntityService.has_commands()) { if (EMSESP::webCustomEntityService.has_commands()) {
shell.print(COLOR_BOLD_ON); shell.print(COLOR_BOLD_ON);
shell.print(COLOR_YELLOW); shell.print(COLOR_YELLOW);
shell.printf(" %s: ", EMSdevice::device_type_2_device_name(EMSdevice::DeviceType::CUSTOM)); shell.printf(" %s: ", EMSdevice::device_type_2_device_name(EMSdevice::DeviceType::CUSTOM));