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

Improved parsing of accumulation data from HRG-15 rain sensor #19485

Merged
merged 2 commits into from
Sep 10, 2023
Merged

Improved parsing of accumulation data from HRG-15 rain sensor #19485

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f96511
fix: more robust parsing of accumulation data
blacknell Sep 9, 2023
b4cab50
fix: further parsing checks
blacknell Sep 10, 2023
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
59 changes: 48 additions & 11 deletions tasmota/tasmota_xsns_sensor/xsns_90_hrg15.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ const char HTTP_RG15[] PROGMEM =
TasmotaSerial *HydreonSerial = nullptr;

struct RG15 {
float acc;
float event;
float total;
float rate;
float acc = NAN;
float event = NAN;
float total = NAN;
float rate = NAN;
uint16_t time = RG15_EVENT_TIMEOUT;
uint8_t init_step;
} Rg15;
Expand Down Expand Up @@ -109,11 +109,37 @@ bool Rg15Process(char* buffer) {
// Acc 0.01 mm, EventAcc 2.07 mm, TotalAcc 54.85 mm, RInt 2.89 mmph
// Acc 0.001 in, EventAcc 0.002 in, TotalAcc 0.003 in, RInt 0.004 iph
// Acc 0.001 mm, EventAcc 0.002 mm, TotalAcc 0.003 mm, RInt 0.004 mmph, XTBTips 0, XTBAcc 0.01 mm, XTBEventAcc 0.02 mm, XTBTotalAcc 0.03 mm
if (buffer[0] == 'A' && buffer[1] == 'c' && buffer[2] == 'c') {
Rg15Parse(buffer, "Acc", &Rg15.acc);
Rg15Parse(buffer, "EventAcc", &Rg15.event);
Rg15Parse(buffer, "TotalAcc", &Rg15.total);
Rg15Parse(buffer, "RInt", &Rg15.rate);

// check for the expected data elements
// Acc should be a position 0 but note if missing we don't want to mistake it for EventAcc
if (strstr(buffer, "Acc")==buffer && strstr(buffer, "EventAcc") != nullptr && strstr(buffer, "TotalAcc") != nullptr && strstr(buffer, "RInt") != nullptr) {
Rg15.acc = NAN;
Rg15.event = NAN;
Rg15.total = NAN;
Rg15.rate = NAN;

float tmp;

if (Rg15Parse(buffer, "Acc", &tmp)) {
Rg15.acc=tmp;
} else {
AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("HRG: Unable to parse 'Acc' from accumulation data"));
}
if (Rg15Parse(buffer, "EventAcc", &tmp)) {
Rg15.event=tmp;
} else {
AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("HRG: Unable to parse 'EventAcc' from accumulation data"));
}
if (Rg15Parse(buffer, "TotalAcc", &tmp)) {
Rg15.total=tmp;
} else {
AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("HRG: Unable to parse 'TotalAcc' from accumulation data"));
}
if (Rg15Parse(buffer, "RInt", &tmp)) {
Rg15.rate=tmp;
} else {
AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("HRG: Unable to parse 'RInt' from accumulation data"));
}

if (Rg15.acc > 0.0f) {
Rg15.time = RG15_EVENT_TIMEOUT; // We have some data, so the rain event is on-going
Expand Down Expand Up @@ -146,6 +172,7 @@ void Rg15Poll(void) {
if (Rg15.time) { // Check if the rain event has timed out, reset rate to 0
Rg15.time--;
if (!Rg15.time) {
AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("HRG: Rg15Poll - rain event has timed out, reset acc & rate to 0 "));
Rg15.acc = 0;
Rg15.rate = 0;
publish = true;
Expand Down Expand Up @@ -183,8 +210,15 @@ void Rg15Poll(void) {

void Rg15Show(bool json) {
if (json) {
ResponseAppend_P(PSTR(",\"" RG15_NAME "\":{\"" D_JSON_ACTIVE "\":%2_f,\"" D_JSON_EVENT "\":%2_f,\"" D_JSON_TOTAL "\":%2_f,\"" D_JSON_FLOWRATE "\":%2_f}"),
&Rg15.acc, &Rg15.event, &Rg15.total, &Rg15.rate);
// if the parsing wasn't completely successful then skip the update
if( isfinite(Rg15.acc) && isfinite(Rg15.event) && isfinite(Rg15.total) && isfinite(Rg15.rate) ) {
ResponseAppend_P(PSTR(",\"" RG15_NAME "\":{"));
ResponseAppend_P(PSTR("\"%s\":%.2f, "), D_JSON_ACTIVE, Rg15.acc);
ResponseAppend_P(PSTR("\"%s\":%.2f, "), D_JSON_EVENT, Rg15.event);
ResponseAppend_P(PSTR("\"%s\":%.2f, "), D_JSON_TOTAL, Rg15.total);
ResponseAppend_P(PSTR("\"%s\":%.2f"), D_JSON_FLOWRATE, Rg15.rate);
ResponseAppend_P(PSTR("}"));
}
#ifdef USE_WEBSERVER
} else {
WSContentSend_PD(HTTP_RG15, &Rg15.acc, &Rg15.event, &Rg15.total, &Rg15.rate);
Expand Down Expand Up @@ -227,6 +261,9 @@ bool Xsns90(uint32_t function) {
else if (HydreonSerial) {
switch (function) {
case FUNC_EVERY_SECOND:
if((TasmotaGlobal.uptime % 60) == 0) { // every minute
ExecuteCommand("Sensor90 R", SRC_SENSOR);
}
Rg15Poll();
break;
case FUNC_COMMAND_SENSOR:
Expand Down