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

typo, telegram name for pretty telegram

Browse Source
This commit is contained in:
MichaelDvP
2024-01-24 07:44:20 +01:00
parent 9266454f82
commit 6aca61deee
1 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/emsesp.cpp
View File

@@ -726,20 +726,25 @@ std::string EMSESP::pretty_telegram(std::shared_ptr<const Telegram> telegram) {
std::string dest_name(""); std::string dest_name("");
std::string type_name(""); std::string type_name("");
for (const auto & emsdevice : emsdevices) { for (const auto & emsdevice : emsdevices) {
if (emsdevice) { // get src & dest
// get src & dest if (emsdevice->is_device_id(src)) {
if (emsdevice->is_device_id(src)) { src_name = emsdevice->device_type_name();
src_name = emsdevice->device_type_name(); } else if (emsdevice->is_device_id(dest)) {
} else if (emsdevice->is_device_id(dest)) { dest_name = emsdevice->device_type_name();
dest_name = emsdevice->device_type_name(); }
// get the type name
if (type_name.empty()) {
if ((telegram->operation == Telegram::Operation::RX_READ && emsdevice->is_device_id(dest))
|| (telegram->operation != Telegram::Operation::RX_READ && dest == 0 && emsdevice->is_device_id(src))
|| (telegram->operation != Telegram::Operation::RX_READ && src == EMSbus::ems_bus_id() && emsdevice->is_device_id(dest))) {
type_name = emsdevice->telegram_type_name(telegram);
} }
// get the type name }
if (type_name.empty()) { }
if ((telegram->operation == Telegram::Operation::RX_READ && emsdevice->is_device_id(dest)) if (type_name.empty()) {
|| (telegram->operation != Telegram::Operation::RX_READ && dest == 0 && emsdevice->is_device_id(src)) for (const auto & emsdevice : emsdevices) {
|| (telegram->operation != Telegram::Operation::RX_READ && src == EMSbus::ems_bus_id() && emsdevice->is_device_id(dest))) { if (telegram->operation != Telegram::Operation::RX_READ && emsdevice->is_device_id(src)) {
type_name = emsdevice->telegram_type_name(telegram); type_name = emsdevice->telegram_type_name(telegram);
}
} }
} }
} }
@@ -946,7 +951,7 @@ bool EMSESP::process_telegram(std::shared_ptr<const Telegram> telegram) {
if (!telegram_found) { if (!telegram_found) {
// check for sends to master thermostat // check for sends to master thermostat
for (const auto & emsdevice : emsdevices) { for (const auto & emsdevice : emsdevices) {
if (emsdevice->is_device_id(telegram->src) && telegram->dest != 0x10) { if (emsdevice->is_device_id(telegram->src) && telegram->dest == 0x10) {
telegram_found = emsdevice->handle_telegram(telegram); telegram_found = emsdevice->handle_telegram(telegram);
device_found = emsdevice->unique_id(); device_found = emsdevice->unique_id();
break; break;