andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 07:49:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix #2726

Browse Source
This commit is contained in:
MichaelDvP
2025-11-14 17:46:13 +01:00
parent 993e2fdc22
commit 83796341c5
3 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
interface/src/utils/binding.ts
View File

@@ -24,7 +24,7 @@ export const extractEventValue = (
const isIncomplete = const isIncomplete =
normalizedValue.endsWith('.') || normalizedValue.endsWith('.') ||
normalizedValue === '-' || normalizedValue === '-' ||
normalizedValue === '-.' || normalizedValue === '-0' ||
endsWithDecimalAndZeros; endsWithDecimalAndZeros;
if (isIncomplete) { if (isIncomplete) {

30
src/core/emsesp.cpp
View File

@@ -1183,7 +1183,7 @@ bool EMSESP::process_telegram(std::shared_ptr<const Telegram> telegram) {
uint8_t device_found = 0; uint8_t device_found = 0;
EMSdevice * found_device = nullptr; EMSdevice * found_device = nullptr;
// Combined loop: check all conditions in a single pass // check all conditions
for (const auto & emsdevice : emsdevices) { for (const auto & emsdevice : emsdevices) {
// broadcast or send to us // broadcast or send to us
if (emsdevice->is_device_id(telegram->src) && (telegram->dest == 0 || telegram->dest == EMSbus::ems_bus_id())) { if (emsdevice->is_device_id(telegram->src) && (telegram->dest == 0 || telegram->dest == EMSbus::ems_bus_id())) {
@@ -1191,17 +1191,25 @@ bool EMSESP::process_telegram(std::shared_ptr<const Telegram> telegram) {
found_device = emsdevice.get(); found_device = emsdevice.get();
break; break;
} }
// check for command to the device }
if (!telegram_found && emsdevice->is_device_id(telegram->dest) && telegram->src != EMSbus::ems_bus_id()) { if (!telegram_found) {
telegram_found = emsdevice->handle_telegram(telegram); for (const auto & emsdevice : emsdevices) {
found_device = emsdevice.get(); // check for command to the device
break; if (emsdevice->is_device_id(telegram->dest) && telegram->src != EMSbus::ems_bus_id()) {
telegram_found = emsdevice->handle_telegram(telegram);
found_device = emsdevice.get();
break;
}
} }
// check for sends to master thermostat }
if (!telegram_found && emsdevice->is_device_id(telegram->src) && telegram->dest == 0x10) { if (!telegram_found) {
telegram_found = emsdevice->handle_telegram(telegram); for (const auto & emsdevice : emsdevices) {
found_device = emsdevice.get(); // check for sends to master thermostat
break; if (emsdevice->is_device_id(telegram->src) && telegram->dest == 0x10) {
telegram_found = emsdevice->handle_telegram(telegram);
found_device = emsdevice.get();
break;
}
} }
} }

2
src/emsesp_version.h
View File

@@ -1 +1 @@
#define EMSESP_APP_VERSION "3.7.3-dev.28" #define EMSESP_APP_VERSION "3.7.3-dev.29"