home/esphome
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sec+2 parser work with overlapping packets

Browse Source
This commit is contained in:
artem
2026-05-22 22:19:31 +00:00
parent eea9f8438d
commit 553c6d2dcb
1 changed files with 26 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/ratgdo/secplus2.cpp
+26 -38
View File
@@ -191,59 +191,47 @@ namespace secplus2 {
optional<Command> Secplus2::read_command() optional<Command> Secplus2::read_command()
{ {
if (!this->flags_.rx_reading_msg) { while (this->uart_.available()) {
while (this->uart_.available()) { uint8_t ser_byte = this->uart_.read();
uint8_t ser_byte = this->uart_.read(); this->rx_last_read_ = millis();
this->rx_last_read_ = millis();
if (ser_byte != 0x55 && ser_byte != 0x01 && ser_byte != 0x00) { // Shift byte into preamble window
{ this->rx_msg_start_ = ((this->rx_msg_start_ << 8) | ser_byte) & 0xffffff;
char hex[format_hex_pretty_size(1)];
ESP_LOG2(TAG, "Ignoring byte (%d): %s, baud: %d", this->rx_byte_count_, format_hex_pretty_to(hex, &ser_byte, 1), this->uart_.baudRate());
}
this->rx_byte_count_ = 0;
continue;
}
this->rx_msg_start_ = ((this->rx_msg_start_ << 8) | ser_byte) & 0xffffff;
this->rx_byte_count_++;
// if we are at the start of a message, capture the next 16 bytes if (this->rx_msg_start_ == 0x550100) {
if (this->rx_msg_start_ == 0x550100) { // Found a preamble! Reset buffer and start fresh.
ESP_LOG1(TAG, "Baud: %d", this->uart_.baudRate()); if (this->flags_.rx_reading_msg) {
this->rx_packet_[0] = 0x55; ESP_LOGV(TAG, "Preamble detected inside message, resetting...");
this->rx_packet_[1] = 0x01;
this->rx_packet_[2] = 0x00;
this->rx_byte_count_ = 3;
this->flags_.rx_reading_msg = true;
break;
} }
this->rx_packet_[0] = 0x55;
this->rx_packet_[1] = 0x01;
this->rx_packet_[2] = 0x00;
this->rx_byte_count_ = 3;
this->flags_.rx_reading_msg = true;
continue;
} }
}
if (this->flags_.rx_reading_msg) { if (this->flags_.rx_reading_msg) {
while (this->uart_.available()) {
uint8_t ser_byte = this->uart_.read();
this->rx_last_read_ = millis();
this->rx_packet_[this->rx_byte_count_] = ser_byte; this->rx_packet_[this->rx_byte_count_] = ser_byte;
this->rx_byte_count_++; this->rx_byte_count_++;
// ESP_LOG2(TAG, "Received byte (%d): %02X, baud: %d", this->rx_byte_count_, ser_byte, this->uart_.baudRate());
if (this->rx_byte_count_ == PACKET_LENGTH) { if (this->rx_byte_count_ == PACKET_LENGTH) {
this->flags_.rx_reading_msg = false; this->flags_.rx_reading_msg = false;
this->rx_byte_count_ = 0; this->rx_byte_count_ = 0;
this->rx_msg_start_ = 0; // clear window to prevent immediate re-trigger
this->print_packet(LOG_STR("Received packet"), this->rx_packet_); this->print_packet(LOG_STR("Received packet"), this->rx_packet_);
return this->decode_packet(this->rx_packet_); return this->decode_packet(this->rx_packet_);
} }
} }
}
if (millis() - this->rx_last_read_ > 100) { if (this->flags_.rx_reading_msg && (millis() - this->rx_last_read_ > 100)) {
// if we have a partial packet and it's been over 100ms since last byte was read, // 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), // the rest is not coming, discard it.
// discard it so we can read the following packet correctly ESP_LOGW(TAG, "Discard incomplete packet, length: %d", this->rx_byte_count_);
ESP_LOGW(TAG, "Discard incomplete packet, length: %d", this->rx_byte_count_); this->flags_.rx_reading_msg = false;
this->flags_.rx_reading_msg = false; this->rx_byte_count_ = 0;
this->rx_byte_count_ = 0; this->rx_msg_start_ = 0;
}
} }
return { }; return { };