From a4b299129e946fd22e079032486531ff90d857af Mon Sep 17 00:00:00 2001 From: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Sun, 19 Sep 2021 12:19:35 +1000 Subject: [PATCH 1/4] Include burst timer not tested --- RX_FSK/RX_FSK.ino | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/RX_FSK/RX_FSK.ino b/RX_FSK/RX_FSK.ino index 6c51388..a95e85c 100644 --- a/RX_FSK/RX_FSK.ino +++ b/RX_FSK/RX_FSK.ino @@ -3693,27 +3693,25 @@ void sondehub_send_data(WiFiClient * client, SondeInfo * s, struct st_sondehub * // Only send temp if provided if ((int)s->temperature != 0) { - sprintf(w, - "\"temp\": %.3f,", - float(s->temperature) - ); + sprintf(w, "\"temp\": %.3f,", float(s->temperature)); w += strlen(w); } // Only send humidity if provided if ((int)s->relativeHumidity != 0) { - sprintf(w, - "\"humidity\": %.3f,", - float(s->relativeHumidity) - ); + sprintf(w, "\"humidity\": %.3f,", float(s->relativeHumidity)); + w += strlen(w); + } + + // Only send burst timer if provided + if ((int)s->burstKT < 30600) { + sprintf(w, "\"burst_timer\": %d,", (int)s->burstKT); w += strlen(w); } // Only send antenna if provided if (strlen(conf->antenna) != 0) { - sprintf(w, - "\"uploader_antenna\": \"%s\",", - conf->antenna); + sprintf(w, "\"uploader_antenna\": \"%s\",", conf->antenna); w += strlen(w); } From e4e89a29d0a50faf98c1408631462580d78cf6d2 Mon Sep 17 00:00:00 2001 From: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Sun, 19 Sep 2021 12:23:22 +1000 Subject: [PATCH 2/4] tidy up SH --- RX_FSK/RX_FSK.ino | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/RX_FSK/RX_FSK.ino b/RX_FSK/RX_FSK.ino index a95e85c..6bd0083 100644 --- a/RX_FSK/RX_FSK.ino +++ b/RX_FSK/RX_FSK.ino @@ -3410,17 +3410,13 @@ void sondehub_station_update(WiFiClient *client, struct st_sondehub *conf) { // Only send email if provided if (strlen(conf->email) != 0) { - sprintf(w, - "\"uploader_contact_email\": \"%s\",", - conf->email); + sprintf(w, "\"uploader_contact_email\": \"%s\",", conf->email); w += strlen(w); } // Only send antenna if provided if (strlen(conf->antenna) != 0) { - sprintf(w, - "\"uploader_antenna\": \"%s\",", - conf->antenna); + sprintf(w, "\"uploader_antenna\": \"%s\",", conf->antenna); w += strlen(w); } @@ -3718,9 +3714,7 @@ void sondehub_send_data(WiFiClient * client, SondeInfo * s, struct st_sondehub * // We send GPS position: (a) in CHASE mode, (b) in AUTO mode if no fixed location has been specified in config if (chase == SH_LOC_CHASE) { if (gpsPos.valid && gpsPos.lat != 0 && gpsPos.lon != 0) { - sprintf(w, - "\"uploader_position\": [%.6f,%.6f,%d]", - gpsPos.lat, gpsPos.lon, gpsPos.alt); + sprintf(w, "\"uploader_position\": [%.6f,%.6f,%d]", gpsPos.lat, gpsPos.lon, gpsPos.alt); } else { sprintf(w, "\"uploader_position\": [null,null,null]"); } From b5456d84d1c4faa4cc18c9ccf4cc98c1ba85e94d Mon Sep 17 00:00:00 2001 From: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Sun, 19 Sep 2021 20:17:22 +1000 Subject: [PATCH 3/4] Always send for RS41 --- RX_FSK/RX_FSK.ino | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RX_FSK/RX_FSK.ino b/RX_FSK/RX_FSK.ino index 6bd0083..d3a05c0 100644 --- a/RX_FSK/RX_FSK.ino +++ b/RX_FSK/RX_FSK.ino @@ -3699,8 +3699,8 @@ void sondehub_send_data(WiFiClient * client, SondeInfo * s, struct st_sondehub * w += strlen(w); } - // Only send burst timer if provided - if ((int)s->burstKT < 30600) { + // Only send burst timer if RS41 + if (realtype == STYPE_RS41) { sprintf(w, "\"burst_timer\": %d,", (int)s->burstKT); w += strlen(w); } From 387d3c059d75a4445e3c4bba66090239218893b4 Mon Sep 17 00:00:00 2001 From: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Sun, 19 Sep 2021 20:25:58 +1000 Subject: [PATCH 4/4] Update RX_FSK.ino --- RX_FSK/RX_FSK.ino | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RX_FSK/RX_FSK.ino b/RX_FSK/RX_FSK.ino index d3a05c0..4db06e4 100644 --- a/RX_FSK/RX_FSK.ino +++ b/RX_FSK/RX_FSK.ino @@ -3699,8 +3699,8 @@ void sondehub_send_data(WiFiClient * client, SondeInfo * s, struct st_sondehub * w += strlen(w); } - // Only send burst timer if RS41 - if (realtype == STYPE_RS41) { + // Only send burst timer if RS41 and not 0 + if ((realtype == STYPE_RS41) && ((int)s->burstKT != 0)) { sprintf(w, "\"burst_timer\": %d,", (int)s->burstKT); w += strlen(w); }