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

allow raw telegram sending with other src-id

Browse Source
This commit is contained in:
MichaelDvP
2022-11-29 17:04:05 +01:00
parent 7144c746c6
commit 7bad0e04b1
3 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/emsesp.cpp
View File

@@ -1255,7 +1255,7 @@ void EMSESP::incoming_telegram(uint8_t * data, const uint8_t length) {
} }
#endif #endif
// check for poll to us, if so send top message from Tx queue immediately and quit // check for poll to us, if so send top message from Tx queue immediately and quit
if (poll_id == txservice_.ems_bus_id()) { if (poll_id == txservice_.get_send_id()) {
txservice_.send(); txservice_.send();
} }
// send remote room temperature if active // send remote room temperature if active

25
src/telegram.cpp
View File

@@ -268,6 +268,21 @@ void TxService::send_poll() const {
} }
} }
// get src id from next telegram to check poll in emsesp::incoming_telegram
uint8_t TxService::get_send_id() {
static uint32_t count = 0;
if (!tx_telegrams_.empty() && tx_telegrams_.front().telegram_->src != ems_bus_id()) {
if (++count > 500) { // after 500 polls (~3-10 sec) there will be no master poll for this id
tx_telegrams_.pop_front();
count = 0;
return tx_telegrams_.empty() ? ems_bus_id() : tx_telegrams_.front().telegram_->src;
}
return tx_telegrams_.front().telegram_->src;
}
count = 0;
return ems_bus_id();
}
// Process the next telegram on the Tx queue // Process the next telegram on the Tx queue
// This is sent when we receive a poll request // This is sent when we receive a poll request
void TxService::send() { void TxService::send() {
@@ -463,7 +478,7 @@ void TxService::add(uint8_t operation, const uint8_t * data, const uint8_t lengt
} }
// build header. src, dest and offset have fixed positions // build header. src, dest and offset have fixed positions
uint8_t src = ems_bus_id(); // data[0]; we can only send data with own bus_id. uint8_t src = operation == Telegram::Operation::TX_RAW ? data[0] : ems_bus_id();
uint8_t dest = data[1]; uint8_t dest = data[1];
uint8_t offset = data[3]; uint8_t offset = data[3];
@@ -499,7 +514,9 @@ void TxService::add(uint8_t operation, const uint8_t * data, const uint8_t lengt
} }
if (operation == Telegram::Operation::TX_RAW) { if (operation == Telegram::Operation::TX_RAW) {
if (dest & 0x80) { if (src != ems_bus_id()) {
operation = Telegram::Operation::NONE; // do not check reply/ack for other ids
} else if (dest & 0x80) {
operation = Telegram::Operation::TX_READ; operation = Telegram::Operation::TX_READ;
} else { } else {
operation = Telegram::Operation::TX_WRITE; operation = Telegram::Operation::TX_WRITE;
@@ -585,8 +602,8 @@ bool TxService::send_raw(const char * telegram_data) {
} }
} }
// check valid length and src // check valid length
if ((count < 4) || ((data[0] & 0x7F) != ems_bus_id())) { if (count < 4) {
return false; return false;
} }

1
src/telegram.h
View File

@@ -290,6 +290,7 @@ class TxService : public EMSbus {
void start(); void start();
void send(); void send();
uint8_t get_send_id();
void add(const uint8_t operation, void add(const uint8_t operation,
const uint8_t dest, const uint8_t dest,
const uint16_t type_id, const uint16_t type_id,