From 6aca61deee8196a31ca25cd38cb95ea399cb2730 Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Wed, 24 Jan 2024 07:44:20 +0100 Subject: [PATCH] typo, telegram name for pretty telegram --- src/emsesp.cpp | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/src/emsesp.cpp b/src/emsesp.cpp index 163f537f3..3ecc78982 100644 --- a/src/emsesp.cpp +++ b/src/emsesp.cpp @@ -726,20 +726,25 @@ std::string EMSESP::pretty_telegram(std::shared_ptr telegram) { std::string dest_name(""); std::string type_name(""); for (const auto & emsdevice : emsdevices) { - if (emsdevice) { - // get src & dest - if (emsdevice->is_device_id(src)) { - src_name = emsdevice->device_type_name(); - } else if (emsdevice->is_device_id(dest)) { - dest_name = emsdevice->device_type_name(); + // get src & dest + if (emsdevice->is_device_id(src)) { + src_name = emsdevice->device_type_name(); + } else if (emsdevice->is_device_id(dest)) { + 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)) - || (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); - } + } + } + if (type_name.empty()) { + for (const auto & emsdevice : emsdevices) { + if (telegram->operation != Telegram::Operation::RX_READ && emsdevice->is_device_id(src)) { + type_name = emsdevice->telegram_type_name(telegram); } } } @@ -946,7 +951,7 @@ bool EMSESP::process_telegram(std::shared_ptr telegram) { if (!telegram_found) { // check for sends to master thermostat 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); device_found = emsdevice->unique_id(); break;