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

fix overlapping 0xC2 and overflow of offset

Browse Source
This commit is contained in:
pswid
2021-12-03 11:50:52 +01:00
parent 92da61376b
commit 1343bbf6ea
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG_LATEST.md
View File

@@ -6,6 +6,8 @@
## Fixed ## Fixed
- lastcode broke MQTT JSON structure [#228] - lastcode broke MQTT JSON structure [#228]
- overlapping while reading 0xC2 from Boiler
- redundant telegram readings (because of offset overflow)
## Changed ## Changed

14
src/telegram.cpp
View File

@@ -613,7 +613,19 @@ uint16_t TxService::read_next_tx(uint8_t offset) {
if (telegram_last_->offset != offset) { if (telegram_last_->offset != offset) {
return 0; return 0;
} }
add(Telegram::Operation::TX_READ, telegram_last_->dest, telegram_last_->type_id, telegram_last_->offset + 25, message_data, 1, 0, true);
uint8_t add_offset;
if (telegram_last_->dest == 0x08 && telegram_last_->type_id == 0xC2) { //fix for overlapping 0xC2 telegrams from Boiler. Are other telegrams also affected?
add_offset = 27;
} else {
add_offset = 25;
}
if (UINT8_MAX - telegram_last_->offset < add_offset) { //stop if new offset would overflow
return 0;
}
add(Telegram::Operation::TX_READ, telegram_last_->dest, telegram_last_->type_id, telegram_last_->offset + add_offset, message_data, 1, 0, true);
return telegram_last_->type_id; return telegram_last_->type_id;
} }