andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-08 16:59:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/MichaelDvP/EMS-ESP32 into dev

Browse Source
This commit is contained in:
MichaelDvP
2024-01-28 11:31:42 +01:00
parent 6155645436 85a839e86b
commit 9e423d9769
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/device_library.h
View File

@@ -179,8 +179,9 @@
// Gateways - 0x48 // Gateways - 0x48
{189, DeviceType::GATEWAY, "KM200/MB LAN 2", DeviceFlags::EMS_DEVICE_FLAG_NONE}, {189, DeviceType::GATEWAY, "KM200/MB LAN 2", DeviceFlags::EMS_DEVICE_FLAG_NONE},
{252, DeviceType::GATEWAY, "MX300", DeviceFlags::EMS_DEVICE_FLAG_NONE},
// Generic - 0x40 or other with no product-id and no version // Generic - 0x40 or other with no product-id and no version
{0, DeviceType::GENERIC, "unknown", DeviceFlags::EMS_DEVICE_FLAG_NONE} {0, DeviceType::GENERIC, "unknown", DeviceFlags::EMS_DEVICE_FLAG_NONE}
// clang-format on // clang-format on

3
src/emsesp.cpp
View File

@@ -960,9 +960,6 @@ bool EMSESP::process_telegram(std::shared_ptr<const Telegram> telegram) {
if (telegram->message_length > 0) { if (telegram->message_length > 0) {
emsdevice->add_handlers_ignored(telegram->type_id); emsdevice->add_handlers_ignored(telegram->type_id);
} }
if (telegram->dest == 0 && telegram->offset == 0 && telegram->message_length > 0) {
emsdevice->add_handlers_broadcasted(telegram->type_id);
}
if (Mqtt::connected() && telegram_found if (Mqtt::connected() && telegram_found
&& ((mqtt_.get_publish_onchange(emsdevice->device_type()) && emsdevice->has_update()) && ((mqtt_.get_publish_onchange(emsdevice->device_type()) && emsdevice->has_update())
|| (telegram->type_id == publish_id_ && telegram->dest == EMSbus::ems_bus_id()))) { || (telegram->type_id == publish_id_ && telegram->dest == EMSbus::ems_bus_id()))) {