From 6f154f107b953d9fd0c6626170e12379bc9d48d7 Mon Sep 17 00:00:00 2001 From: Uskompuf <22492406+Uskompuf@users.noreply.github.com> Date: Mon, 17 May 2021 15:57:21 +1000 Subject: [PATCH] Merge branch 'sondehub' of https://github.com/LukePrior/bsg_ttgo into sondehub --- RX_FSK/RX_FSK.ino | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/RX_FSK/RX_FSK.ino b/RX_FSK/RX_FSK.ino index 0f30863..b9833a3 100644 --- a/RX_FSK/RX_FSK.ino +++ b/RX_FSK/RX_FSK.ino @@ -2961,9 +2961,16 @@ void sondehub_send_data(WiFiClient *client, SondeInfo *s, struct st_sondehub *co if (s->ser == "") return; // Don't send anything without serial number - t += 18; // convert back to GPS time from UTC time +18s + if (String(sondeTypeStr[s->type]) == "RS41" || String(sondeTypeStr[s->type]) == "RS92" || String(sondeTypeStr[s->type]) == "M10" || String(sondeTypeStr[s->type]) == "M20") { + t += 18; // convert back to GPS time from UTC time +18s + } + ts = *gmtime(&t); + Serial.println(s->temperature); + Serial.println(s->relativeHumidity); + Serial.println(s->validPos); + memset(rs_msg, 0, MSG_SIZE); w=rs_msg; @@ -2987,6 +2994,8 @@ void sondehub_send_data(WiFiClient *client, SondeInfo *s, struct st_sondehub *co "\"heading\": %.1f," "\"sats\": %d," "\"rssi\": %.1f," + //"\"temp\": %.2f," + //"\"humidity\": %.2f," "\"uploader_position\": [ %s, %s, %s ]," "\"uploader_antenna\": \"%s\"" "}]",