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

Sml fix (#17893) 

* fix compile with NO_USE_SML_DECRYPT

* dumplog info
This commit is contained in:
gemu 2023-02-06 09:42:09 +01:00 committed by GitHub
parent d23e598d6b
commit 6ccacb4af1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tasmota/tasmota_xsns_sensor/xsns_53_sml.ino
View File

@ -625,7 +625,7 @@ void dump2log(void) {
logsiz = mp->sbsiz; logsiz = mp->sbsiz;
} }
memmove(mp->sbuff, payload, logsiz); memmove(mp->sbuff, payload, logsiz);
AddLog(LOG_LEVEL_DEBUG, PSTR("SML: decrypted block: %d bytes"), logsiz); AddLog(LOG_LEVEL_INFO PSTR("SML: decrypted block: %d bytes"), logsiz);
uint16_t index = 0; uint16_t index = 0;
while (logsiz) { while (logsiz) {
sml_dump_start('>'); sml_dump_start('>');
@ -1448,6 +1448,7 @@ uint8_t *sml_find(uint8_t *src, uint16_t ssize, uint8_t *pattern, uint16_t psize
return 0; return 0;
} }
#ifdef USE_SML_DECRYPT
double sml_get_obis_value(uint8_t *data) { double sml_get_obis_value(uint8_t *data) {
double out = 0; double out = 0;
CosemData *item = (CosemData *)data; CosemData *item = (CosemData *)data;
@ -1479,7 +1480,7 @@ double sml_get_obis_value(uint8_t *data) {
} }
return out; return out;
} }
#endif // USE_SML_DECRYPT
@ -1701,6 +1702,7 @@ void SML_Decode(uint8_t index) {
// check auto type // check auto type
if (aflg & 1) { if (aflg & 1) {
// METER_ID_SIZE // METER_ID_SIZE
#ifdef USE_SML_DECRYPT
CosemData *item = (CosemData *)cp; CosemData *item = (CosemData *)cp;
switch (item->base.type) { switch (item->base.type) {
case CosemTypeString: case CosemTypeString:
@ -1714,6 +1716,7 @@ void SML_Decode(uint8_t index) {
default: default:
ebus_dval = sml_get_obis_value(cp); ebus_dval = sml_get_obis_value(cp);
} }
#endif
} }
} }
break; break;