From 4efee74fb1a8661cff57f121cdd50914b19c2404 Mon Sep 17 00:00:00 2001 From: Mark Jessop Date: Wed, 20 Sep 2023 07:50:44 +0930 Subject: [PATCH] Rebase WxR301D decoder for additional SN verification --- auto_rx/autorx/__init__.py | 2 +- weathex/weathex301d.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/auto_rx/autorx/__init__.py b/auto_rx/autorx/__init__.py index 92f713a..3baf637 100644 --- a/auto_rx/autorx/__init__.py +++ b/auto_rx/autorx/__init__.py @@ -12,7 +12,7 @@ from queue import Queue # MINOR - New sonde type support, other fairly big changes that may result in telemetry or config file incompatability issus. # PATCH - Small changes, or minor feature additions. -__version__ = "1.6.3-beta6" +__version__ = "1.6.3-beta7" # Global Variables diff --git a/weathex/weathex301d.c b/weathex/weathex301d.c index cdd8107..ff210b9 100644 --- a/weathex/weathex301d.c +++ b/weathex/weathex301d.c @@ -481,6 +481,8 @@ int print_frame() { // JSON if (option_json && gpx.chk2ok) { + if (gpx.chk1ok && gpx.sn2 == gpx.sn1 && gpx.cnt2 == gpx.cnt1) // double check, unreliable checksums + { char *ver_jsn = NULL; fprintf(stdout, "{ \"type\": \"%s\"", "WXR301"); fprintf(stdout, ", \"frame\": %u", gpx.cnt2); @@ -506,6 +508,7 @@ int print_frame() { if (ver_jsn && *ver_jsn != '\0') fprintf(stdout, ", \"version\": \"%s\"", ver_jsn); fprintf(stdout, " }\n"); fprintf(stdout, "\n"); + } } }