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
commit 2abe0f39b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1558,7 +1558,17 @@ 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') { 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 // get numeric values
if (meter_desc_p[mindex].type=='o' || meter_desc_p[mindex].type=='c') { if (meter_desc_p[mindex].type=='o' || meter_desc_p[mindex].type=='c') {
if (*mp == '(') {
mp++;
// skip this bracket
char *bp = strchr((char*)cp, '(');
if (bp) {
cp = (uint8_t*) (bp + 1);
}
dval=CharToDouble((char*)cp); dval=CharToDouble((char*)cp);
} else {
dval=CharToDouble((char*)cp);
}
} else { } else {
dval = sml_getvalue(cp,mindex); dval = sml_getvalue(cp,mindex);
} }