From a97b4e9e76cae5749ffd54f647764598c2024d25 Mon Sep 17 00:00:00 2001 From: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Mon, 13 Sep 2021 21:37:48 +1000 Subject: [PATCH 1/2] Missed Sondehub improvements (#157) * fixes * fix Co-authored-by: Uskompuf <22492406+Uskompuf@users.noreply.github.com> --- RX_FSK/RX_FSK.ino | 9 +++++++-- RX_FSK/data/config.txt | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/RX_FSK/RX_FSK.ino b/RX_FSK/RX_FSK.ino index b4c3d9c..c5b40fb 100644 --- a/RX_FSK/RX_FSK.ino +++ b/RX_FSK/RX_FSK.ino @@ -3157,6 +3157,9 @@ void sondehub_station_update(WiFiClient *client, struct st_sondehub *conf) { sprintf(w, "\"uploader_position\": [null,null,null]"); } w += strlen(w); + } else { + sprintf(w, "\"uploader_position\": [null,null,null]"); + w += strlen(w); } // otherwise (in SH_LOC_NONE mode) we dont include any position info @@ -3354,8 +3357,7 @@ void sondehub_send_data(WiFiClient * client, SondeInfo * s, struct st_sondehub * if (chase == SH_LOC_CHASE) { if (gpsPos.valid && gpsPos.lat != 0 && gpsPos.lon != 0) { sprintf(w, - "\"uploader_position\": [%.6f,%.6f,%d]," - "\"mobile\": true", + "\"uploader_position\": [%.6f,%.6f,%d]", gpsPos.lat, gpsPos.lon, gpsPos.alt); } else { sprintf(w, "\"uploader_position\": [null,null,null]"); @@ -3372,6 +3374,9 @@ void sondehub_send_data(WiFiClient * client, SondeInfo * s, struct st_sondehub * sprintf(w, "\"uploader_position\": [null,null,null]"); } w += strlen(w); + } else { + sprintf(w, "\"uploader_position\": [null,null,null]"); + w += strlen(w); } // otherwise (in SH_LOC_NONE mode) we dont include any position info diff --git a/RX_FSK/data/config.txt b/RX_FSK/data/config.txt index 8a8487e..76c8021 100644 --- a/RX_FSK/data/config.txt +++ b/RX_FSK/data/config.txt @@ -121,7 +121,7 @@ mqtt.prefix=rdz_sonde_server/ #-------------------------------# # Sondehub v2 DB settings sondehub.active=0 -sondehub.chase=2 +sondehub.chase=3 sondehub.host=api.v2.sondehub.org sondehub.callsign=CHANGEME_RDZTTGO sondehub.lat= From 84ed0823a08b17c31d98fd8ba7eae0c3e0eecdfc Mon Sep 17 00:00:00 2001 From: eben80 Date: Mon, 13 Sep 2021 15:44:20 +0200 Subject: [PATCH 2/2] Include altitudemode in KML By specifying the altitudemode tag, the kml displays the correct altitude on Google Earth. --- RX_FSK/RX_FSK.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RX_FSK/RX_FSK.ino b/RX_FSK/RX_FSK.ino index c5b40fb..5546e3e 100644 --- a/RX_FSK/RX_FSK.ino +++ b/RX_FSK/RX_FSK.ino @@ -1082,7 +1082,7 @@ void addSondeStatusKML(char *ptr, int i) return; } - sprintf(ptr + strlen(ptr), "%s%.6f,%.6f,%.0f%3.3f MHz, Type: %s, h=%.0fm", + sprintf(ptr + strlen(ptr), "%sabsolute%.6f,%.6f,%.0f%3.3f MHz, Type: %s, h=%.0fm", s->id, s->id, s->lon, s->lat, s->alt, s->freq, sondeTypeStr[s->type], s->alt);