kenjreno
/
esphome-ratgdo
mirror of https://github.com/ratgdo/esphome-ratgdo.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Drop an incomplete packet if the missing bytes are lost (#144) 

Co-authored-by: J. Nick Koston <nick@koston.org>
This commit is contained in:
Marius Muja 2023-12-16 09:50:51 -08:00 committed by GitHub
parent 892c4e2872
commit 53752d588c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
components/ratgdo/ratgdo.cpp
View File

@ -318,8 +318,7 @@ namespace ratgdo {
void RATGDOComponent::print_packet(const WirePacket& packet) const void RATGDOComponent::print_packet(const WirePacket& packet) const
{ {
ESP_LOGV(TAG, "Counter: %d Send code: [%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X]", ESP_LOG2(TAG, "Packet: [%02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X]",
*this->rolling_code_counter,
packet[0], packet[0],
packet[1], packet[1],
packet[2], packet[2],
@ -390,12 +389,15 @@ namespace ratgdo {
static uint32_t msg_start = 0; static uint32_t msg_start = 0;
static uint16_t byte_count = 0; static uint16_t byte_count = 0;
static WirePacket rx_packet; static WirePacket rx_packet;
static uint32_t last_read = 0;
if (!reading_msg) { if (!reading_msg) {
while (this->sw_serial_.available()) { while (this->sw_serial_.available()) {
uint8_t ser_byte = this->sw_serial_.read(); uint8_t ser_byte = this->sw_serial_.read();
last_read = millis();
if (ser_byte != 0x55 && ser_byte != 0x01 && ser_byte != 0x00) { if (ser_byte != 0x55 && ser_byte != 0x01 && ser_byte != 0x00) {
ESP_LOG2(TAG, "Ignoring byte: %02X, baud: %d", ser_byte, this->sw_serial_.baudRate()); ESP_LOG2(TAG, "Ignoring byte (%d): %02X, baud: %d", byte_count, ser_byte, this->sw_serial_.baudRate());
byte_count = 0; byte_count = 0;
continue; continue;
} }
@ -417,16 +419,28 @@ namespace ratgdo {
if (reading_msg) { if (reading_msg) {
while (this->sw_serial_.available()) { while (this->sw_serial_.available()) {
uint8_t ser_byte = this->sw_serial_.read(); uint8_t ser_byte = this->sw_serial_.read();
last_read = millis();
rx_packet[byte_count] = ser_byte; rx_packet[byte_count] = ser_byte;
byte_count++; byte_count++;
// ESP_LOG2(TAG, "Received byte (%d): %02X, baud: %d", byte_count, ser_byte, this->sw_serial_.baudRate());
if (byte_count == PACKET_LENGTH) { if (byte_count == PACKET_LENGTH) {
reading_msg = false; reading_msg = false;
byte_count = 0; byte_count = 0;
this->print_packet(rx_packet);
this->decode_packet(rx_packet); this->decode_packet(rx_packet);
return; return;
} }
} }
if (millis() - last_read > 100) {
// if we have a partial packet and it's been over 100ms since last byte was read,
// the rest is not coming (a full packet should be received in ~20ms),
// discard it so we can read the following packet correctly
ESP_LOGW(TAG, "Discard incomplete packet, length: %d", byte_count);
reading_msg = false;
byte_count = 0;
}
} }
} }