From af3973f43ae0c231ffb58792a7a475baa2693e7e Mon Sep 17 00:00:00 2001 From: Adi Bier / DL1HRC Date: Tue, 26 Jan 2021 16:14:23 +0100 Subject: [PATCH 1/2] Bugfix: Gusts were not announced correctly in combination with mps --- src/svxlink/modules/metarinfo/ModuleMetarInfo.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/svxlink/modules/metarinfo/ModuleMetarInfo.cpp b/src/svxlink/modules/metarinfo/ModuleMetarInfo.cpp index a41fc519..44bb7579 100644 --- a/src/svxlink/modules/metarinfo/ModuleMetarInfo.cpp +++ b/src/svxlink/modules/metarinfo/ModuleMetarInfo.cpp @@ -2032,9 +2032,10 @@ bool ModuleMetarInfo::isWind(std::string &retval, std::string token) } // do we have gusts? - if (token.find("g",3) != string::npos) + size_t found = token.find("g",3); + if (found != string::npos) { - ss << " " << token.substr(token.length()-4,2) << " " << unit; + ss << " " << token.substr(found+1, 2) << " " << unit; } retval = ss.str(); From 4be904fe25336b1f17d4fff2ce7d57b580f8bf6b Mon Sep 17 00:00:00 2001 From: Tobias Blomberg Date: Wed, 27 Jan 2021 21:27:16 +0100 Subject: [PATCH 2/2] Update ChangeLog and module metarinfo version --- src/svxlink/ChangeLog | 3 +++ src/versions | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/svxlink/ChangeLog b/src/svxlink/ChangeLog index fb7c039d..cc247dac 100644 --- a/src/svxlink/ChangeLog +++ b/src/svxlink/ChangeLog @@ -142,6 +142,9 @@ * The voter COMMAND_PTY now accept a new command MUTE that will keep the receiver active but block all content. +* Bugfix in ModuleMetarInfo: Gusts were not announced correctly in combination + with mps + 1.7.0 -- 01 Sep 2019 diff --git a/src/versions b/src/versions index d2bdb5d9..ab78e0f3 100644 --- a/src/versions +++ b/src/versions @@ -20,7 +20,7 @@ MODULE_PROPAGATION_MONITOR=1.0.1 MODULE_TCL_VOICE_MAIL=1.0.2 MODULE_SELCALLENC=1.0.0 MODULE_DTMF_REPEATER=1.0.2 -MODULE_METAR_INFO=1.2.1.99.2 +MODULE_METAR_INFO=1.2.1.99.3 MODULE_FRN=1.1.0 MODULE_TRX=1.0.0