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

calculate length of telegram next part

Browse Source
This commit is contained in:
MichaelDvP
2022-09-13 07:27:41 +02:00
parent 702af4b1c8
commit df8a36c695
3 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/emsesp.cpp
View File

@@ -1216,7 +1216,7 @@ void EMSESP::incoming_telegram(uint8_t * data, const uint8_t length) {
tx_successful = true; tx_successful = true;
// if telegram is longer read next part with offset +25 for ems+ or +27 for ems1.0 // if telegram is longer read next part with offset +25 for ems+ or +27 for ems1.0
if ((length == 32) && (txservice_.read_next_tx(data[3]) == read_id_)) { if ((length >= 31) && (txservice_.read_next_tx(data[3], length) == read_id_)) {
read_next_ = true; read_next_ = true;
} }
} }

29
src/telegram.cpp
View File

@@ -625,24 +625,19 @@ void TxService::retry_tx(const uint8_t operation, const uint8_t * data, const ui
} }
// send a request to read the next block of data from longer telegrams // send a request to read the next block of data from longer telegrams
uint16_t TxService::read_next_tx(uint8_t offset) { // send a request to read the next block of data from longer telegrams
// add to the top/front of the queue uint16_t TxService::read_next_tx(const uint8_t offset, const uint8_t length) {
uint8_t message_data[1] = {EMS_MAX_TELEGRAM_LENGTH}; // request all data, 32 bytes uint8_t old_length = telegram_last_->type_id > 0xFF ? length - 7 : length - 5;
if (telegram_last_->offset != offset) { uint8_t next_length = telegram_last_->type_id > 0xFF ? EMS_MAX_TELEGRAM_MESSAGE_LENGTH - 2 : EMS_MAX_TELEGRAM_MESSAGE_LENGTH;
return 0; uint8_t next_offset = telegram_last_->offset + old_length;
uint8_t message_data = (UINT8_MAX - next_offset) >= next_length ? next_length : UINT8_MAX - next_offset;
// check telegram, offset and overflow
// some telegrams only reply with one byte less, but have higher offsets (0x10)
if (old_length >= (next_length - 1) && telegram_last_->offset == offset) {
add(Telegram::Operation::TX_READ, telegram_last_->dest, telegram_last_->type_id, next_offset, &message_data, 1, 0, true);
return telegram_last_->type_id;
} }
return 0;
uint8_t add_offset = 25; // for EMS+ telegram increase offset by 25
if (telegram_last_->type_id < 0x100) { // but for EMS1.0 by 27
add_offset = 27;
}
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;
} }
// checks if a telegram is sent to us matches the last Tx request // checks if a telegram is sent to us matches the last Tx request

2
src/telegram.h
View File

@@ -309,7 +309,7 @@ class TxService : public EMSbus {
void retry_tx(const uint8_t operation, const uint8_t * data, const uint8_t length); void retry_tx(const uint8_t operation, const uint8_t * data, const uint8_t length);
bool is_last_tx(const uint8_t src, const uint8_t dest) const; bool is_last_tx(const uint8_t src, const uint8_t dest) const;
uint16_t post_send_query(); uint16_t post_send_query();
uint16_t read_next_tx(uint8_t offset); uint16_t read_next_tx(const uint8_t offset, const uint8_t length);
uint8_t retry_count() const { uint8_t retry_count() const {
return retry_count_; return retry_count_;