mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10659 from gemu2015/sml_obis 

Sml obis fix
This commit is contained in:
Theo Arends 2021-01-22 09:05:14 +01:00 committed by GitHub
parent 5284d5f4f7 152aabdc8b
commit 2abe0f39b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tasmota/xsns_53_sml.ino
View File

@ -1539,16 +1539,16 @@ void SML_Decode(uint8_t index) {
#ifdef ED300L
g_mindex=mindex;
#endif
if (*mp=='#') {
if (*mp == '#') {
// get string value
mp++;
if (meter_desc_p[mindex].type=='o') {
for (uint8_t p=0;p<METER_ID_SIZE;p++) {
if (*cp==*mp) {
meter_id[mindex][p]=0;
if (meter_desc_p[mindex].type == 'o') {
for (uint8_t p=0; p<METER_ID_SIZE; p++) {
if (*cp == *mp) {
meter_id[mindex][p] = 0;
break;
}
meter_id[mindex][p]=*cp++;
meter_id[mindex][p] = *cp++;
}
} else {
sml_getvalue(cp,mindex);
@ -1558,9 +1558,19 @@ void SML_Decode(uint8_t index) {
if (meter_desc_p[mindex].type!='e' && meter_desc_p[mindex].type!='r' && meter_desc_p[mindex].type!='m' && meter_desc_p[mindex].type!='M' && meter_desc_p[mindex].type!='p') {
// get numeric values
if (meter_desc_p[mindex].type=='o' || meter_desc_p[mindex].type=='c') {
dval=CharToDouble((char*)cp);
if (*mp == '(') {
mp++;
// skip this bracket
char *bp = strchr((char*)cp, '(');
if (bp) {
cp = (uint8_t*) (bp + 1);
}
dval=CharToDouble((char*)cp);
} else {
dval=CharToDouble((char*)cp);
}
} else {
dval=sml_getvalue(cp,mindex);
dval = sml_getvalue(cp,mindex);
}
} else {
// ebus pzem or mbus or raw