From 4622f6f99a825c5b96ef7ffaacbbb8932abe7385 Mon Sep 17 00:00:00 2001 From: dl9rdz Date: Thu, 23 Sep 2021 12:41:29 +0200 Subject: [PATCH 1/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8d16990..022c404 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ for details on supported boards, and additional setup instructions. Manufacturer | Model | Position | Temperature | Humidity | Pressure -------------|-------|----------|-------------|----------|---------- Vaisala | RS92-SGP/NGP | :heavy_check_mark: | :heavy_check_mark: | :x: | :x: -Vaisala | RS41-SG/SGP/SGM | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: +Vaisala | RS41-SG/SGP/SGM | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: Graw | DFM06/09/17 | :heavy_check_mark: | :x: | :x: | :x: Meteomodem | M10 | :heavy_check_mark: | :x: | :x: | Not Sent Meteomodem | M20 | :heavy_check_mark: | :x: | :x: | Not Sent From 9fdfc02cafd64eb80cd69fafb70fda493f46a6ac Mon Sep 17 00:00:00 2001 From: "Hansi, dl9rdz" Date: Thu, 23 Sep 2021 12:49:56 +0200 Subject: [PATCH 2/5] station update also if disconected --- 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 73c2095..0c03e22 100644 --- a/RX_FSK/RX_FSK.ino +++ b/RX_FSK/RX_FSK.ino @@ -3578,7 +3578,7 @@ void sondehub_reply_handler(WiFiClient * client) { // also handle periodic station updates here... // interval check moved to sondehub_station_update to avoid having to calculate distance in auto mode twice - if (shState == SH_CONN_IDLE) { + if (shState == SH_CONN_IDLE || shState == SH_DISCONNECTED ) { // (do not set station update while a telemetry report is being sent sondehub_station_update(&shclient, &sonde.config.sondehub); } From 03968f6ab4b78547b6ca008bb252d7a8aefb6221 Mon Sep 17 00:00:00 2001 From: "Hansi, dl9rdz" Date: Thu, 23 Sep 2021 13:30:56 +0200 Subject: [PATCH 3/5] clear all data also on SH import --- RX_FSK/src/ShFreqImport.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/RX_FSK/src/ShFreqImport.cpp b/RX_FSK/src/ShFreqImport.cpp index 3bd7aa9..907abe6 100644 --- a/RX_FSK/src/ShFreqImport.cpp +++ b/RX_FSK/src/ShFreqImport.cpp @@ -90,6 +90,7 @@ void ShFreqImport::populate(char *id, float lat, float lon, float freq, const ch return; } // no more free slots + sonde.clearAllData(&sondeList[ppos]); sonde.sondeList[ppos].active = 1; sonde.sondeList[ppos].freq = freq; sonde.sondeList[ppos].type = (SondeType)stype; From 69062ac85601d32736e01f832ca292e3b094cae7 Mon Sep 17 00:00:00 2001 From: "Hansi, dl9rdz" Date: Thu, 23 Sep 2021 13:41:01 +0200 Subject: [PATCH 4/5] initialize pressure with NAN --- RX_FSK/src/Sonde.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RX_FSK/src/Sonde.cpp b/RX_FSK/src/Sonde.cpp index cb05aea..49fb926 100644 --- a/RX_FSK/src/Sonde.cpp +++ b/RX_FSK/src/Sonde.cpp @@ -676,7 +676,7 @@ void Sonde::clearAllData(SondeInfo *si) { memset(&(si->d), 0, sizeof(SondeData)); // set floats to NaN si->d.lat = si->d.lon = si->d.alt = si->d.vs = si->d.hs = si->d.dir = NAN; - si->d.temperature = si->d.tempRHSensor = si->d.relativeHumidity = si->d.batteryVoltage = NAN; + si->d.temperature = si->d.tempRHSensor = si->d.relativeHumidity = si->d.pressures = si->d.batteryVoltage = NAN; } void Sonde::updateDisplayPos() { From c64651f36b2ca998db5b0b7e26e2fc0b5578be06 Mon Sep 17 00:00:00 2001 From: "Hansi, dl9rdz" Date: Thu, 23 Sep 2021 13:42:32 +0200 Subject: [PATCH 5/5] typo-- --- RX_FSK/src/ShFreqImport.cpp | 2 +- RX_FSK/src/Sonde.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/RX_FSK/src/ShFreqImport.cpp b/RX_FSK/src/ShFreqImport.cpp index 907abe6..4da63b1 100644 --- a/RX_FSK/src/ShFreqImport.cpp +++ b/RX_FSK/src/ShFreqImport.cpp @@ -90,7 +90,7 @@ void ShFreqImport::populate(char *id, float lat, float lon, float freq, const ch return; } // no more free slots - sonde.clearAllData(&sondeList[ppos]); + sonde.clearAllData(&sonde.sondeList[ppos]); sonde.sondeList[ppos].active = 1; sonde.sondeList[ppos].freq = freq; sonde.sondeList[ppos].type = (SondeType)stype; diff --git a/RX_FSK/src/Sonde.cpp b/RX_FSK/src/Sonde.cpp index 49fb926..318accd 100644 --- a/RX_FSK/src/Sonde.cpp +++ b/RX_FSK/src/Sonde.cpp @@ -676,7 +676,7 @@ void Sonde::clearAllData(SondeInfo *si) { memset(&(si->d), 0, sizeof(SondeData)); // set floats to NaN si->d.lat = si->d.lon = si->d.alt = si->d.vs = si->d.hs = si->d.dir = NAN; - si->d.temperature = si->d.tempRHSensor = si->d.relativeHumidity = si->d.pressures = si->d.batteryVoltage = NAN; + si->d.temperature = si->d.tempRHSensor = si->d.relativeHumidity = si->d.pressure = si->d.batteryVoltage = NAN; } void Sonde::updateDisplayPos() {