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

Merge pull request #15174 from gemu2015/sml_bcd

Browse Source 
add bcd decoder
This commit is contained in:
Theo Arends 2022-03-19 12:09:34 +01:00 committed by GitHub
commit ee2f69036e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tasmota/xsns_53_sml.ino
View File

@ -1852,7 +1852,7 @@ void SML_Decode(uint8_t index) {
found=0; found=0;
} }
} else { } else {
// ebus mbus pzem vbus or raw // ebus modbus pzem vbus or raw
// XXHHHHSSUU // XXHHHHSSUU
if (*mp == 'x') { if (*mp == 'x') {
if (*(mp + 1) == 'x') { if (*(mp + 1) == 'x') {
@ -1976,6 +1976,22 @@ void SML_Decode(uint8_t index) {
mbus_dval = (float)((cp[0]<<8) | cp[1]); mbus_dval = (float)((cp[0]<<8) | cp[1]);
mp += 4; mp += 4;
cp += 2; cp += 2;
} else if (!strncmp(mp, "bcd", 3)) {
mp += 3;
uint8_t digits = strtol((char*)mp, (char**)&mp, 10);
if (digits < 2) digits = 2;
if (digits > 12) digits = 12;
uint64_t bcdval = 0;
uint64_t mfac = 1;
for (uint32_t cnt = 0; cnt < digits; cnt += 2) {
uint8_t iob = *cp++;
bcdval += (iob & 0xf) * mfac;
mfac *= 10;
bcdval += (iob >> 4) * mfac;
mfac *= 10;
}
mbus_dval = bcdval;
ebus_dval = bcdval;
} else if (*mp == 'v') { } else if (*mp == 'v') {
// vbus values vul, vsl, vuwh, vuwl, wswh, vswl, vswh // vbus values vul, vsl, vuwh, vuwl, wswh, vswl, vswh
// vub3, vsb3 etc // vub3, vsb3 etc