jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-23 18:56:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes (#23391)

Browse Source
This commit is contained in:
gemu 2025-05-08 08:56:57 +02:00 committed by GitHub
parent c25b9827e8
commit 2d16798263
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 41 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
tasmota/tasmota_xsns_sensor/xsns_53_sml.ino
View File

@ -466,6 +466,8 @@ typedef union {
uint8_t SO_OBIS_LINE : 1; uint8_t SO_OBIS_LINE : 1;
uint8_t SO_TRX_INVERT : 1; uint8_t SO_TRX_INVERT : 1;
uint8_t SO_DISS_PULL : 1; uint8_t SO_DISS_PULL : 1;
uint8_t SO_NU : 1;
uint8_t SO_NOPAR : 1;
}; };
} SO_FLAGS; } SO_FLAGS;
@ -1081,8 +1083,9 @@ void dump2log(void) {
} }
} }
void Hexdump(uint8_t *sbuff, uint32_t slen) { void Hexdump(uint8_t *sbuff, int32_t slen) {
char cbuff[slen*3+10]; if (slen > 0) {
char cbuff[slen * 3 + 10];
char *cp = cbuff; char *cp = cbuff;
*cp++ = '>'; *cp++ = '>';
*cp++ = ' '; *cp++ = ' ';
@ -1091,6 +1094,13 @@ void Hexdump(uint8_t *sbuff, uint32_t slen) {
cp += 3; cp += 3;
} }
AddLogData(LOG_LEVEL_INFO, cbuff); AddLogData(LOG_LEVEL_INFO, cbuff);
} else {
slen = -slen;
char cbuff[slen + 3];
cbuff[slen] = 0;
sprintf_P(cbuff, PSTR("%s"), sbuff);
AddLogData(LOG_LEVEL_INFO, cbuff);
}
} }
#define DOUBLE2CHAR dtostrfd #define DOUBLE2CHAR dtostrfd
@ -1335,17 +1345,6 @@ double dval;
return dval; return dval;
} }
uint8_t hexnibble(char chr) {
uint8_t rVal = 0;
if (isdigit(chr)) {
rVal = chr - '0';
} else {
chr=toupper(chr);
if (chr >= 'A' && chr <= 'F') rVal = chr + 10 - 'A';
}
return rVal;
}
uint8_t sb_counter; uint8_t sb_counter;
// need double precision in this driver // need double precision in this driver
@ -2128,8 +2127,8 @@ void SML_Decode(uint8_t index) {
} else { } else {
if (sml_globs.mp[mindex].type == 's') { if (sml_globs.mp[mindex].type == 's') {
// sml // sml
uint8_t val = hexnibble(*mp++) << 4; uint8_t val = sml_hexnibble(*mp++) << 4;
val |= hexnibble(*mp++); val |= sml_hexnibble(*mp++);
if (val != *cp++) { if (val != *cp++) {
found = 0; found = 0;
} }
@ -2196,8 +2195,8 @@ void SML_Decode(uint8_t index) {
dp++; dp++;
} }
} else { } else {
iob = hexnibble(*mp++) << 4; iob = sml_hexnibble(*mp++) << 4;
iob |= hexnibble(*mp++); iob |= sml_hexnibble(*mp++);
} }
pattern[cnt] = iob; pattern[cnt] = iob;
} }
@ -2495,8 +2494,8 @@ void SML_Decode(uint8_t index) {
cp += 6; cp += 6;
} }
else { else {
uint8_t val = hexnibble(*mp++) << 4; uint8_t val = sml_hexnibble(*mp++) << 4;
val |= hexnibble(*mp++); val |= sml_hexnibble(*mp++);
if (val != *cp++) { if (val != *cp++) {
found = 0; found = 0;
} }
@ -3998,8 +3997,12 @@ uint32_t SML_Write(int32_t meter, char *hstr) {
if (meter < 1 || meter > sml_globs.meters_used) return 0; if (meter < 1 || meter > sml_globs.meters_used) return 0;
meter--; meter--;
if (meter_desc[meter].type != 'C') { if (meter_desc[meter].type != 'C') {
if (meter_desc[meter].srcpin == TCP_MODE_FLG) {
if (!meter_desc[meter].client) return 0;
} else {
if (!meter_desc[meter].meter_ss) return 0; if (!meter_desc[meter].meter_ss) return 0;
} }
}
if (flag > 0) { if (flag > 0) {
SML_Send_Seq(meter, hstr); SML_Send_Seq(meter, hstr);
} else { } else {
@ -4097,6 +4100,9 @@ uint32_t SML_Shift_Num(uint32_t meter, uint32_t shift) {
double SML_GetVal(uint32_t index) { double SML_GetVal(uint32_t index) {
if (sml_globs.ready == false) return 0; if (sml_globs.ready == false) return 0;
if (index == 0) {
return sml_globs.maxvars;
}
if (index < 1 || index > sml_globs.maxvars) { index = 1;} if (index < 1 || index > sml_globs.maxvars) { index = 1;}
return sml_globs.meter_vars[index - 1]; return sml_globs.meter_vars[index - 1];
} }
@ -4112,8 +4118,12 @@ int32_t SML_Set_WStr(uint32_t meter, char *hstr) {
if (meter < 1 || meter > sml_globs.meters_used) return -1; if (meter < 1 || meter > sml_globs.meters_used) return -1;
meter--; meter--;
if (meter_desc[meter].type != 'C') { if (meter_desc[meter].type != 'C') {
if (meter_desc[meter].srcpin == TCP_MODE_FLG) {
if (!meter_desc[meter].client) return -2;
} else {
if (!meter_desc[meter].meter_ss) return -2; if (!meter_desc[meter].meter_ss) return -2;
} }
}
meter_desc[meter].script_str = hstr; meter_desc[meter].script_str = hstr;
return 0; return 0;
} }
@ -4409,7 +4419,6 @@ void sml_hex_asci(uint32_t mindex, char *tpowstr) {
*tpowstr = 0; *tpowstr = 0;
} }
uint8_t sml_hexnibble(char chr) { uint8_t sml_hexnibble(char chr) {
uint8_t rVal = 0; uint8_t rVal = 0;
if (isdigit(chr)) { if (isdigit(chr)) {
@ -4597,7 +4606,8 @@ void SML_Send_Seq(uint32_t meter, char *seq) {
} }
} }
if (mp->type == 'o') { if (mp->type == 'o' && !mp->so_flags.SO_NOPAR) {
// insert even parity for obis mode
for (uint32_t cnt = 0; cnt < slen; cnt++) { for (uint32_t cnt = 0; cnt < slen; cnt++) {
sbuff[cnt] |= (CalcEvenParity(sbuff[cnt]) << 7); sbuff[cnt] |= (CalcEvenParity(sbuff[cnt]) << 7);
} }