Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SML: FastExit for binary SML parsing #21497

Merged
merged 4 commits into from
May 30, 2024
Merged

SML: FastExit for binary SML parsing #21497

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cb64792
SML: FastExit for binary SML parsing
May 25, 2024
9b6efe8
moved the fast-exit in the SML-shift-in
May 26, 2024
361ab9f
Merge branch 'development' into imp-sml-parsing
May 28, 2024
eb012fd
Using constants for flags
May 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions tasmota/tasmota_xsns_sensor/xsns_53_sml.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,6 +554,12 @@ struct METER_DESC {

#define TCP_MODE_FLG 0x7f

// Meter flags
#define PULLUP_FLG 0x01
#define ANALOG_FLG 0x02
#define MEDIAN_FILTER_FLG 0x10
#define NO_SYNC_FLG 0x20

struct METER_DESC meter_desc[MAX_METERS];


Expand Down Expand Up @@ -1480,6 +1486,11 @@ void sml_shift_in(uint32_t meters, uint32_t shard) {
case 's':
// binary obis = sml
mp->sbuff[mp->sbsiz - 1] = iob;
if (mp->sbuff[0] != SML_SYNC && ((mp->flag & NO_SYNC_FLG) == 0)) {
// Skip decoding, when buffer does not start with sync byte (0x77)
sb_counter++;
return;
}
break;
case 'r':
// raw with shift
Expand Down Expand Up @@ -1892,7 +1903,7 @@ void SML_Decode(uint8_t index) {
// differece is only valid after 2. calculation
sml_globs.dvalid[vindex] = 2;
#ifdef USE_SML_MEDIAN_FILTER
if (sml_globs.mp[mindex].flag & 16) {
if (sml_globs.mp[mindex].flag & MEDIAN_FILTER_FLG) {
sml_globs.meter_vars[vindex] = sml_median(&sml_globs.sml_mf[vindex], dres);
} else {
sml_globs.meter_vars[vindex] = dres;
Expand Down Expand Up @@ -2439,7 +2450,7 @@ void SML_Decode(uint8_t index) {
}
}
#ifdef USE_SML_MEDIAN_FILTER
if (sml_globs.mp[mindex].flag & 16) {
if (sml_globs.mp[mindex].flag & MEDIAN_FILTER_FLG) {
sml_globs.meter_vars[vindex] = sml_median(&sml_globs.sml_mf[vindex], dval);
} else {
sml_globs.meter_vars[vindex] = dval;
Expand Down Expand Up @@ -3390,11 +3401,11 @@ next_line:
for (uint8_t meters = 0; meters < sml_globs.meters_used; meters++) {
METER_DESC *mp = &meter_desc[meters];
if (mp->type == 'c') {
if (mp->flag & 2) {
if (mp->flag & ANALOG_FLG) {

} else {
// counters, set to input with pullup
if (mp->flag & 1) {
if (mp->flag & PULLUP_FLG) {
pinMode(mp->srcpin, INPUT_PULLUP);
} else {
pinMode(mp->srcpin, INPUT);
Expand Down Expand Up @@ -3877,7 +3888,7 @@ uint32_t ctime = millis();
if (ctime - sml_counters[cindex].sml_cnt_last_ts > sml_globs.mp[meters].params) {
sml_counters[cindex].sml_cnt_last_ts = ctime;

if (sml_globs.mp[meters].flag & 2) {
if (sml_globs.mp[meters].flag & ANALOG_FLG) {
// analog mode, get next value
} else {
// poll digital input
Expand Down