jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-29 13:46:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

corrected ebus crc check (#20081)

Browse Source
This commit is contained in:
papax333 2023-11-22 11:57:10 +01:00 committed by GitHub
parent 7e2fbdea55
commit 77081ad92b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tasmota/tasmota_xsns_sensor/xsns_53_sml.ino
View File

@ -1337,6 +1337,19 @@ void ebus_esc(uint8_t *ebus_buffer, unsigned char len) {
} }
// check ebus escapes
uint8_t check_ebus_esc(uint8_t *ebus_buffer, unsigned char len) {
short count,count1;
count1 = 0;
for (count = 0; count < len; count++) {
if (ebus_buffer[count] == EBUS_ESC) {
//found escape
count1++;
}
}
return count1;
}
uint8_t ebus_crc8(uint8_t data, uint8_t crc_init) { uint8_t ebus_crc8(uint8_t data, uint8_t crc_init) {
uint8_t crc; uint8_t crc;
uint8_t polynom; uint8_t polynom;
@ -1568,16 +1581,16 @@ void sml_shift_in(uint32_t meters, uint32_t shard) {
if (iob == EBUS_SYNC) { if (iob == EBUS_SYNC) {
// should be end of telegramm // should be end of telegramm
// QQ,ZZ,PB,SB,NN ..... CRC, ACK SYNC // QQ,ZZ,PB,SB,NN ..... CRC, ACK SYNC
if (mp->spos > 4 + 5) { if (mp->spos > 5 && mp->spos > mp->sbuff[4] + 5) {
// get telegramm lenght // get telegramm lenght
uint16_t tlen = mp->sbuff[4] + 5; uint16_t tlen = mp->sbuff[4] + 5 + check_ebus_esc(mp->sbuff, mp->spos);
// test crc // test crc
if (mp->sbuff[tlen] = ebus_CalculateCRC(mp->sbuff, tlen)) { if (mp->sbuff[tlen] == ebus_CalculateCRC(mp->sbuff, tlen)) {
ebus_esc(mp->sbuff, tlen); ebus_esc(mp->sbuff, mp->spos);
SML_Decode(meters); SML_Decode(meters);
} else { } else {
// crc error // crc error
//AddLog(LOG_LEVEL_INFO, PSTR("ebus crc error")); AddLog(LOG_LEVEL_INFO, PSTR("ebus crc error"));
} }
} }
mp->spos = 0; mp->spos = 0;