From 67a948ee89ad7acfb963a98ffd74edf86452db58 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Tue, 17 Feb 2026 20:00:00 +0100 Subject: [PATCH 1/7] bump gpsd version --- Common/APRSGPSDIdFrameProvider.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/APRSGPSDIdFrameProvider.cpp b/Common/APRSGPSDIdFrameProvider.cpp index 4891a78..b64b770 100644 --- a/Common/APRSGPSDIdFrameProvider.cpp +++ b/Common/APRSGPSDIdFrameProvider.cpp @@ -80,7 +80,7 @@ bool CAPRSGPSDIdFrameProvider::buildAPRSFramesInt(const CAPRSEntry * entry, std: #elif GPSD_API_MAJOR_VERSION == 11 if(m_gpsdData.fix.status == STATUS_NO_FIX) return false; -#elif GPSD_API_MAJOR_VERSION <= 14 +#elif GPSD_API_MAJOR_VERSION <= 16 if(m_gpsdData.fix.status == STATUS_UNK) return false; #elif From ed3f10465bb4fc45403d6e68f0c49aef37f81b55 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Tue, 17 Feb 2026 21:01:46 +0100 Subject: [PATCH 2/7] #61 fix DTMF command parsing --- DStarBase/DTMF.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/DStarBase/DTMF.cpp b/DStarBase/DTMF.cpp index 84e0701..8bb8c1f 100644 --- a/DStarBase/DTMF.cpp +++ b/DStarBase/DTMF.cpp @@ -192,6 +192,9 @@ std::string CDTMF::processReflector(const std::string& prefix, const std::string { unsigned int len = command.size(); + if(len == 0U) + return std::string(""); + char c = command.at(len - 1U); if (c == 'A' || c == 'B' || c == 'C' || c == 'D') { if (len < 2U || len > 4U) @@ -213,14 +216,14 @@ std::string CDTMF::processReflector(const std::string& prefix, const std::string if (n1 == 0UL) return std::string(""); - unsigned long n2 = std::stoul(command.substr(2)); + unsigned long n2 = std::stoul(command.substr(len-2U)); if (n2 == 0UL || n2 > 26UL) return std::string(""); c = 'A' + n2 - 1UL; char ostr[32]; - snprintf(ostr, 32, "%s%03lu%cL", prefix.c_str(), n1, c); + std::snprintf(ostr, 32, "%s%03lu%cL", prefix.c_str(), n1, c); return std::string(ostr); } From 9d8fc74ce3a84a79cef235f5ff218b8aebbdd132 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Tue, 17 Feb 2026 21:02:00 +0100 Subject: [PATCH 3/7] #61 add tests for DTMF command parsing --- Tests/DTMF/decode.cpp | 161 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 152 insertions(+), 9 deletions(-) diff --git a/Tests/DTMF/decode.cpp b/Tests/DTMF/decode.cpp index e780888..3d5f52e 100644 --- a/Tests/DTMF/decode.cpp +++ b/Tests/DTMF/decode.cpp @@ -23,6 +23,8 @@ const unsigned char DTMF_MASK[] = {0x82U, 0x08U, 0x20U, 0x82U, 0x00U, 0x00U, 0x82U, 0x00U, 0x00U}; const unsigned char DTMF_SIG[] = {0x82U, 0x08U, 0x20U, 0x82U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U}; +const unsigned char NULL_AMBE_DATA_BYTES[] = {0x9E, 0x8D, 0x32, 0x88, 0x26, 0x1A, 0x3F, 0x61, 0xE8}; + const unsigned char DTMF_SYM_MASK[] = {0x10U, 0x40U, 0x08U, 0x20U}; const unsigned char DTMF_SYM0[] = {0x00U, 0x40U, 0x08U, 0x20U}; const unsigned char DTMF_SYM1[] = {0x00U, 0x00U, 0x00U, 0x00U}; @@ -47,9 +49,118 @@ namespace DTMFTests }; - TEST_F(DTMF_decode, decode_valid_dtmf) + TEST_F(DTMF_decode, decode_reflector_module_as_number) + { + unsigned char D[] = {DTMF_SIG[0], + DTMF_SIG[1], + DTMF_SIG[2], + DTMF_SIG[3], + (unsigned char)(DTMF_SIG[4] | DTMF_SYMD[0]), + (unsigned char)(DTMF_SIG[5] | DTMF_SYMD[1]), + DTMF_SIG[6], + (unsigned char)(DTMF_SIG[7] | DTMF_SYMD[2]), + (unsigned char)(DTMF_SIG[8] | DTMF_SYMD[3])}; + unsigned char Zero[] = {DTMF_SIG[0], + DTMF_SIG[1], + DTMF_SIG[2], + DTMF_SIG[3], + (unsigned char)(DTMF_SIG[4] | DTMF_SYM0[0]), + (unsigned char)(DTMF_SIG[5] | DTMF_SYM0[1]), + DTMF_SIG[6], + (unsigned char)(DTMF_SIG[7] | DTMF_SYM0[2]), + (unsigned char)(DTMF_SIG[8] | DTMF_SYM0[3])}; + + unsigned char One[] = {DTMF_SIG[0], + DTMF_SIG[1], + DTMF_SIG[2], + DTMF_SIG[3], + (unsigned char)(DTMF_SIG[4] | DTMF_SYM1[0]), + (unsigned char)(DTMF_SIG[5] | DTMF_SYM1[1]), + DTMF_SIG[6], + (unsigned char)(DTMF_SIG[7] | DTMF_SYM1[2]), + (unsigned char)(DTMF_SIG[8] | DTMF_SYM1[3])}; + + + unsigned char Eight[] = {DTMF_SIG[0], + DTMF_SIG[1], + DTMF_SIG[2], + DTMF_SIG[3], + (unsigned char)(DTMF_SIG[4] | DTMF_SYM8[0]), + (unsigned char)(DTMF_SIG[5] | DTMF_SYM8[1]), + DTMF_SIG[6], + (unsigned char)(DTMF_SIG[7] | DTMF_SYM8[2]), + (unsigned char)(DTMF_SIG[8] | DTMF_SYM8[3])}; + + unsigned char Four[] = {DTMF_SIG[0], + DTMF_SIG[1], + DTMF_SIG[2], + DTMF_SIG[3], + (unsigned char)(DTMF_SIG[4] | DTMF_SYM4[0]), + (unsigned char)(DTMF_SIG[5] | DTMF_SYM4[1]), + DTMF_SIG[6], + (unsigned char)(DTMF_SIG[7] | DTMF_SYM4[2]), + (unsigned char)(DTMF_SIG[8] | DTMF_SYM4[3])}; + + + CDTMF dtmf; + dtmf.decode(D, false); + dtmf.decode(D, false); + dtmf.decode(D, false); + dtmf.decode(D, false); + for(uint i = 0; i < 10U; i++) dtmf.decode(NULL_AMBE_DATA_BYTES, false); + dtmf.decode(Zero, false); + dtmf.decode(Zero, false); + dtmf.decode(Zero, false); + dtmf.decode(Zero, false); + for(uint i = 0; i < 10U; i++) dtmf.decode(NULL_AMBE_DATA_BYTES, false); + dtmf.decode(One, false); + dtmf.decode(One, false); + dtmf.decode(One, false); + dtmf.decode(One, false); + for(uint i = 0; i < 10U; i++) dtmf.decode(NULL_AMBE_DATA_BYTES, false); + dtmf.decode(Eight, false); + dtmf.decode(Eight, false); + dtmf.decode(Eight, false); + dtmf.decode(Eight, false); + for(uint i = 0; i < 10U; i++) dtmf.decode(NULL_AMBE_DATA_BYTES, false); + dtmf.decode(Zero, false); + dtmf.decode(Zero, false); + dtmf.decode(Zero, false); + dtmf.decode(Zero, false); + for(uint i = 0; i < 10U; i++) dtmf.decode(NULL_AMBE_DATA_BYTES, false); + dtmf.decode(Four, false); + dtmf.decode(Four, false); + dtmf.decode(Four, false); + dtmf.decode(Four, false); + dtmf.decode(Four, true); + for(uint i = 0; i < 10U; i++) dtmf.decode(NULL_AMBE_DATA_BYTES, false); + + EXPECT_TRUE(dtmf.hasCommand()); + EXPECT_STREQ(dtmf.translate().c_str(), "DCS018DL"); + } + + TEST_F(DTMF_decode, decode_reflector_module_as_letter) { - unsigned char ambe[] = {DTMF_SIG[0], + unsigned char D[] = {DTMF_SIG[0], + DTMF_SIG[1], + DTMF_SIG[2], + DTMF_SIG[3], + (unsigned char)(DTMF_SIG[4] | DTMF_SYMD[0]), + (unsigned char)(DTMF_SIG[5] | DTMF_SYMD[1]), + DTMF_SIG[6], + (unsigned char)(DTMF_SIG[7] | DTMF_SYMD[2]), + (unsigned char)(DTMF_SIG[8] | DTMF_SYMD[3])}; + unsigned char Zero[] = {DTMF_SIG[0], + DTMF_SIG[1], + DTMF_SIG[2], + DTMF_SIG[3], + (unsigned char)(DTMF_SIG[4] | DTMF_SYM0[0]), + (unsigned char)(DTMF_SIG[5] | DTMF_SYM0[1]), + DTMF_SIG[6], + (unsigned char)(DTMF_SIG[7] | DTMF_SYM0[2]), + (unsigned char)(DTMF_SIG[8] | DTMF_SYM0[3])}; + + unsigned char One[] = {DTMF_SIG[0], DTMF_SIG[1], DTMF_SIG[2], DTMF_SIG[3], @@ -59,13 +170,45 @@ namespace DTMFTests (unsigned char)(DTMF_SIG[7] | DTMF_SYM1[2]), (unsigned char)(DTMF_SIG[8] | DTMF_SYM1[3])}; + + unsigned char Eight[] = {DTMF_SIG[0], + DTMF_SIG[1], + DTMF_SIG[2], + DTMF_SIG[3], + (unsigned char)(DTMF_SIG[4] | DTMF_SYM8[0]), + (unsigned char)(DTMF_SIG[5] | DTMF_SYM8[1]), + DTMF_SIG[6], + (unsigned char)(DTMF_SIG[7] | DTMF_SYM8[2]), + (unsigned char)(DTMF_SIG[8] | DTMF_SYM8[3])}; + CDTMF dtmf; - dtmf.decode(ambe, false); - dtmf.decode(ambe, false); - dtmf.decode(ambe, false); - dtmf.decode(ambe, false); - dtmf.decode(ambe, false); - dtmf.decode(ambe, false); - dtmf.decode(ambe, true); + dtmf.decode(D, false); + dtmf.decode(D, false); + dtmf.decode(D, false); + dtmf.decode(D, false); + for(uint i = 0; i < 10U; i++) dtmf.decode(NULL_AMBE_DATA_BYTES, false); + dtmf.decode(Zero, false); + dtmf.decode(Zero, false); + dtmf.decode(Zero, false); + dtmf.decode(Zero, false); + for(uint i = 0; i < 10U; i++) dtmf.decode(NULL_AMBE_DATA_BYTES, false); + dtmf.decode(One, false); + dtmf.decode(One, false); + dtmf.decode(One, false); + dtmf.decode(One, false); + for(uint i = 0; i < 10U; i++) dtmf.decode(NULL_AMBE_DATA_BYTES, false); + dtmf.decode(Eight, false); + dtmf.decode(Eight, false); + dtmf.decode(Eight, false); + dtmf.decode(Eight, false); + for(uint i = 0; i < 10U; i++) dtmf.decode(NULL_AMBE_DATA_BYTES, false); + dtmf.decode(D, false); + dtmf.decode(D, false); + dtmf.decode(D, false); + dtmf.decode(D, false); + for(uint i = 0; i < 10U; i++) dtmf.decode(NULL_AMBE_DATA_BYTES, true); + + EXPECT_TRUE(dtmf.hasCommand()); + EXPECT_STREQ(dtmf.translate().c_str(), "DCS018DL"); } } \ No newline at end of file From 35bba7828a0619fceb4bc39e8ded0a66e3d5de33 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Wed, 18 Feb 2026 18:34:27 +0100 Subject: [PATCH 4/7] #61 move constants to header --- DStarBase/DTMF.cpp | 21 --------------------- DStarBase/DTMF.h | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/DStarBase/DTMF.cpp b/DStarBase/DTMF.cpp index 8bb8c1f..da61ff2 100644 --- a/DStarBase/DTMF.cpp +++ b/DStarBase/DTMF.cpp @@ -23,27 +23,6 @@ #include "DTMF.h" #include "Log.h" -const unsigned char DTMF_MASK[] = {0x82U, 0x08U, 0x20U, 0x82U, 0x00U, 0x00U, 0x82U, 0x00U, 0x00U}; -const unsigned char DTMF_SIG[] = {0x82U, 0x08U, 0x20U, 0x82U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U}; - -const unsigned char DTMF_SYM_MASK[] = {0x10U, 0x40U, 0x08U, 0x20U}; -const unsigned char DTMF_SYM0[] = {0x00U, 0x40U, 0x08U, 0x20U}; -const unsigned char DTMF_SYM1[] = {0x00U, 0x00U, 0x00U, 0x00U}; -const unsigned char DTMF_SYM2[] = {0x00U, 0x40U, 0x00U, 0x00U}; -const unsigned char DTMF_SYM3[] = {0x10U, 0x00U, 0x00U, 0x00U}; -const unsigned char DTMF_SYM4[] = {0x00U, 0x00U, 0x00U, 0x20U}; -const unsigned char DTMF_SYM5[] = {0x00U, 0x40U, 0x00U, 0x20U}; -const unsigned char DTMF_SYM6[] = {0x10U, 0x00U, 0x00U, 0x20U}; -const unsigned char DTMF_SYM7[] = {0x00U, 0x00U, 0x08U, 0x00U}; -const unsigned char DTMF_SYM8[] = {0x00U, 0x40U, 0x08U, 0x00U}; -const unsigned char DTMF_SYM9[] = {0x10U, 0x00U, 0x08U, 0x00U}; -const unsigned char DTMF_SYMA[] = {0x10U, 0x40U, 0x00U, 0x00U}; -const unsigned char DTMF_SYMB[] = {0x10U, 0x40U, 0x00U, 0x20U}; -const unsigned char DTMF_SYMC[] = {0x10U, 0x40U, 0x08U, 0x00U}; -const unsigned char DTMF_SYMD[] = {0x10U, 0x40U, 0x08U, 0x20U}; -const unsigned char DTMF_SYMS[] = {0x00U, 0x00U, 0x08U, 0x20U}; -const unsigned char DTMF_SYMH[] = {0x10U, 0x00U, 0x08U, 0x20U}; - CDTMF::CDTMF() : m_data(), m_command(), diff --git a/DStarBase/DTMF.h b/DStarBase/DTMF.h index 6109194..d8dbe8c 100644 --- a/DStarBase/DTMF.h +++ b/DStarBase/DTMF.h @@ -45,3 +45,24 @@ private: std::string processReflector(const std::string& prefix, const std::string& command) const; std::string processCCS(const std::string& command) const; }; + +const unsigned char DTMF_MASK[] = {0x82U, 0x08U, 0x20U, 0x82U, 0x00U, 0x00U, 0x82U, 0x00U, 0x00U}; +const unsigned char DTMF_SIG[] = {0x82U, 0x08U, 0x20U, 0x82U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U}; + +const unsigned char DTMF_SYM_MASK[] = {0x10U, 0x40U, 0x08U, 0x20U}; +const unsigned char DTMF_SYM0[] = {0x00U, 0x40U, 0x08U, 0x20U}; +const unsigned char DTMF_SYM1[] = {0x00U, 0x00U, 0x00U, 0x00U}; +const unsigned char DTMF_SYM2[] = {0x00U, 0x40U, 0x00U, 0x00U}; +const unsigned char DTMF_SYM3[] = {0x10U, 0x00U, 0x00U, 0x00U}; +const unsigned char DTMF_SYM4[] = {0x00U, 0x00U, 0x00U, 0x20U}; +const unsigned char DTMF_SYM5[] = {0x00U, 0x40U, 0x00U, 0x20U}; +const unsigned char DTMF_SYM6[] = {0x10U, 0x00U, 0x00U, 0x20U}; +const unsigned char DTMF_SYM7[] = {0x00U, 0x00U, 0x08U, 0x00U}; +const unsigned char DTMF_SYM8[] = {0x00U, 0x40U, 0x08U, 0x00U}; +const unsigned char DTMF_SYM9[] = {0x10U, 0x00U, 0x08U, 0x00U}; +const unsigned char DTMF_SYMA[] = {0x10U, 0x40U, 0x00U, 0x00U}; +const unsigned char DTMF_SYMB[] = {0x10U, 0x40U, 0x00U, 0x20U}; +const unsigned char DTMF_SYMC[] = {0x10U, 0x40U, 0x08U, 0x00U}; +const unsigned char DTMF_SYMD[] = {0x10U, 0x40U, 0x08U, 0x20U}; +const unsigned char DTMF_SYMS[] = {0x00U, 0x00U, 0x08U, 0x20U}; +const unsigned char DTMF_SYMH[] = {0x10U, 0x00U, 0x08U, 0x20U}; \ No newline at end of file From e3a894247d8e4097bdc98a18e2177e046d047d23 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Wed, 18 Feb 2026 18:34:55 +0100 Subject: [PATCH 5/7] #61 use constant, refactor tests, add short command tests --- Tests/DTMF/decode.cpp | 272 +++++++++++++++--------------------------- 1 file changed, 99 insertions(+), 173 deletions(-) diff --git a/Tests/DTMF/decode.cpp b/Tests/DTMF/decode.cpp index 3d5f52e..659fabc 100644 --- a/Tests/DTMF/decode.cpp +++ b/Tests/DTMF/decode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2024 by Geoffrey Merck F4FXL / KC3FRA + * Copyright (C) 2021-2026 by Geoffrey Merck F4FXL / KC3FRA * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,124 +16,64 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include #include #include "DTMF.h" - -const unsigned char DTMF_MASK[] = {0x82U, 0x08U, 0x20U, 0x82U, 0x00U, 0x00U, 0x82U, 0x00U, 0x00U}; -const unsigned char DTMF_SIG[] = {0x82U, 0x08U, 0x20U, 0x82U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U}; - -const unsigned char NULL_AMBE_DATA_BYTES[] = {0x9E, 0x8D, 0x32, 0x88, 0x26, 0x1A, 0x3F, 0x61, 0xE8}; - -const unsigned char DTMF_SYM_MASK[] = {0x10U, 0x40U, 0x08U, 0x20U}; -const unsigned char DTMF_SYM0[] = {0x00U, 0x40U, 0x08U, 0x20U}; -const unsigned char DTMF_SYM1[] = {0x00U, 0x00U, 0x00U, 0x00U}; -const unsigned char DTMF_SYM2[] = {0x00U, 0x40U, 0x00U, 0x00U}; -const unsigned char DTMF_SYM3[] = {0x10U, 0x00U, 0x00U, 0x00U}; -const unsigned char DTMF_SYM4[] = {0x00U, 0x00U, 0x00U, 0x20U}; -const unsigned char DTMF_SYM5[] = {0x00U, 0x40U, 0x00U, 0x20U}; -const unsigned char DTMF_SYM6[] = {0x10U, 0x00U, 0x00U, 0x20U}; -const unsigned char DTMF_SYM7[] = {0x00U, 0x00U, 0x08U, 0x00U}; -const unsigned char DTMF_SYM8[] = {0x00U, 0x40U, 0x08U, 0x00U}; -const unsigned char DTMF_SYM9[] = {0x10U, 0x00U, 0x08U, 0x00U}; -const unsigned char DTMF_SYMA[] = {0x10U, 0x40U, 0x00U, 0x00U}; -const unsigned char DTMF_SYMB[] = {0x10U, 0x40U, 0x00U, 0x20U}; -const unsigned char DTMF_SYMC[] = {0x10U, 0x40U, 0x08U, 0x00U}; -const unsigned char DTMF_SYMD[] = {0x10U, 0x40U, 0x08U, 0x20U}; -const unsigned char DTMF_SYMS[] = {0x00U, 0x00U, 0x08U, 0x20U}; -const unsigned char DTMF_SYMH[] = {0x10U, 0x00U, 0x08U, 0x20U}; +#include "DStarDefines.h" namespace DTMFTests { - class DTMF_decode : public ::testing::Test { - - }; + using Frame = std::array; + + static Frame makeFrame(const unsigned char sym[4]) + { + return Frame{ + DTMF_SIG[0], + DTMF_SIG[1], + DTMF_SIG[2], + DTMF_SIG[3], + static_cast(DTMF_SIG[4] | sym[0]), + static_cast(DTMF_SIG[5] | sym[1]), + DTMF_SIG[6], + static_cast(DTMF_SIG[7] | sym[2]), + static_cast(DTMF_SIG[8] | sym[3]), + }; + } + + static void decode4(CDTMF& dtmf, const Frame& f, bool last = false) + { + dtmf.decode(f.data(), false); + dtmf.decode(f.data(), false); + dtmf.decode(f.data(), false); + dtmf.decode(f.data(), last); + } + + static void gap(CDTMF& dtmf, unsigned n = 10, bool end = false) + { + for (unsigned i = 0; i < n; ++i) + dtmf.decode(NULL_AMBE_DATA_BYTES, end); + } + + class DTMF_decode : public ::testing::Test {}; TEST_F(DTMF_decode, decode_reflector_module_as_number) { - unsigned char D[] = {DTMF_SIG[0], - DTMF_SIG[1], - DTMF_SIG[2], - DTMF_SIG[3], - (unsigned char)(DTMF_SIG[4] | DTMF_SYMD[0]), - (unsigned char)(DTMF_SIG[5] | DTMF_SYMD[1]), - DTMF_SIG[6], - (unsigned char)(DTMF_SIG[7] | DTMF_SYMD[2]), - (unsigned char)(DTMF_SIG[8] | DTMF_SYMD[3])}; - unsigned char Zero[] = {DTMF_SIG[0], - DTMF_SIG[1], - DTMF_SIG[2], - DTMF_SIG[3], - (unsigned char)(DTMF_SIG[4] | DTMF_SYM0[0]), - (unsigned char)(DTMF_SIG[5] | DTMF_SYM0[1]), - DTMF_SIG[6], - (unsigned char)(DTMF_SIG[7] | DTMF_SYM0[2]), - (unsigned char)(DTMF_SIG[8] | DTMF_SYM0[3])}; - - unsigned char One[] = {DTMF_SIG[0], - DTMF_SIG[1], - DTMF_SIG[2], - DTMF_SIG[3], - (unsigned char)(DTMF_SIG[4] | DTMF_SYM1[0]), - (unsigned char)(DTMF_SIG[5] | DTMF_SYM1[1]), - DTMF_SIG[6], - (unsigned char)(DTMF_SIG[7] | DTMF_SYM1[2]), - (unsigned char)(DTMF_SIG[8] | DTMF_SYM1[3])}; - - - unsigned char Eight[] = {DTMF_SIG[0], - DTMF_SIG[1], - DTMF_SIG[2], - DTMF_SIG[3], - (unsigned char)(DTMF_SIG[4] | DTMF_SYM8[0]), - (unsigned char)(DTMF_SIG[5] | DTMF_SYM8[1]), - DTMF_SIG[6], - (unsigned char)(DTMF_SIG[7] | DTMF_SYM8[2]), - (unsigned char)(DTMF_SIG[8] | DTMF_SYM8[3])}; - - unsigned char Four[] = {DTMF_SIG[0], - DTMF_SIG[1], - DTMF_SIG[2], - DTMF_SIG[3], - (unsigned char)(DTMF_SIG[4] | DTMF_SYM4[0]), - (unsigned char)(DTMF_SIG[5] | DTMF_SYM4[1]), - DTMF_SIG[6], - (unsigned char)(DTMF_SIG[7] | DTMF_SYM4[2]), - (unsigned char)(DTMF_SIG[8] | DTMF_SYM4[3])}; - + const auto D = makeFrame(DTMF_SYMD); + const auto Zero = makeFrame(DTMF_SYM0); + const auto One = makeFrame(DTMF_SYM1); + const auto Eight= makeFrame(DTMF_SYM8); + const auto Four = makeFrame(DTMF_SYM4); CDTMF dtmf; - dtmf.decode(D, false); - dtmf.decode(D, false); - dtmf.decode(D, false); - dtmf.decode(D, false); - for(uint i = 0; i < 10U; i++) dtmf.decode(NULL_AMBE_DATA_BYTES, false); - dtmf.decode(Zero, false); - dtmf.decode(Zero, false); - dtmf.decode(Zero, false); - dtmf.decode(Zero, false); - for(uint i = 0; i < 10U; i++) dtmf.decode(NULL_AMBE_DATA_BYTES, false); - dtmf.decode(One, false); - dtmf.decode(One, false); - dtmf.decode(One, false); - dtmf.decode(One, false); - for(uint i = 0; i < 10U; i++) dtmf.decode(NULL_AMBE_DATA_BYTES, false); - dtmf.decode(Eight, false); - dtmf.decode(Eight, false); - dtmf.decode(Eight, false); - dtmf.decode(Eight, false); - for(uint i = 0; i < 10U; i++) dtmf.decode(NULL_AMBE_DATA_BYTES, false); - dtmf.decode(Zero, false); - dtmf.decode(Zero, false); - dtmf.decode(Zero, false); - dtmf.decode(Zero, false); - for(uint i = 0; i < 10U; i++) dtmf.decode(NULL_AMBE_DATA_BYTES, false); - dtmf.decode(Four, false); - dtmf.decode(Four, false); - dtmf.decode(Four, false); - dtmf.decode(Four, false); - dtmf.decode(Four, true); - for(uint i = 0; i < 10U; i++) dtmf.decode(NULL_AMBE_DATA_BYTES, false); + + decode4(dtmf, D); gap(dtmf); + decode4(dtmf, Zero); gap(dtmf); + decode4(dtmf, One); gap(dtmf); + decode4(dtmf, Eight); gap(dtmf); + decode4(dtmf, Zero); gap(dtmf); + decode4(dtmf, Four); + gap(dtmf, 10, true); EXPECT_TRUE(dtmf.hasCommand()); EXPECT_STREQ(dtmf.translate().c_str(), "DCS018DL"); @@ -141,74 +81,60 @@ namespace DTMFTests TEST_F(DTMF_decode, decode_reflector_module_as_letter) { - unsigned char D[] = {DTMF_SIG[0], - DTMF_SIG[1], - DTMF_SIG[2], - DTMF_SIG[3], - (unsigned char)(DTMF_SIG[4] | DTMF_SYMD[0]), - (unsigned char)(DTMF_SIG[5] | DTMF_SYMD[1]), - DTMF_SIG[6], - (unsigned char)(DTMF_SIG[7] | DTMF_SYMD[2]), - (unsigned char)(DTMF_SIG[8] | DTMF_SYMD[3])}; - unsigned char Zero[] = {DTMF_SIG[0], - DTMF_SIG[1], - DTMF_SIG[2], - DTMF_SIG[3], - (unsigned char)(DTMF_SIG[4] | DTMF_SYM0[0]), - (unsigned char)(DTMF_SIG[5] | DTMF_SYM0[1]), - DTMF_SIG[6], - (unsigned char)(DTMF_SIG[7] | DTMF_SYM0[2]), - (unsigned char)(DTMF_SIG[8] | DTMF_SYM0[3])}; - - unsigned char One[] = {DTMF_SIG[0], - DTMF_SIG[1], - DTMF_SIG[2], - DTMF_SIG[3], - (unsigned char)(DTMF_SIG[4] | DTMF_SYM1[0]), - (unsigned char)(DTMF_SIG[5] | DTMF_SYM1[1]), - DTMF_SIG[6], - (unsigned char)(DTMF_SIG[7] | DTMF_SYM1[2]), - (unsigned char)(DTMF_SIG[8] | DTMF_SYM1[3])}; - - - unsigned char Eight[] = {DTMF_SIG[0], - DTMF_SIG[1], - DTMF_SIG[2], - DTMF_SIG[3], - (unsigned char)(DTMF_SIG[4] | DTMF_SYM8[0]), - (unsigned char)(DTMF_SIG[5] | DTMF_SYM8[1]), - DTMF_SIG[6], - (unsigned char)(DTMF_SIG[7] | DTMF_SYM8[2]), - (unsigned char)(DTMF_SIG[8] | DTMF_SYM8[3])}; + const auto D = makeFrame(DTMF_SYMD); + const auto Zero = makeFrame(DTMF_SYM0); + const auto One = makeFrame(DTMF_SYM1); + const auto Eight= makeFrame(DTMF_SYM8); CDTMF dtmf; - dtmf.decode(D, false); - dtmf.decode(D, false); - dtmf.decode(D, false); - dtmf.decode(D, false); - for(uint i = 0; i < 10U; i++) dtmf.decode(NULL_AMBE_DATA_BYTES, false); - dtmf.decode(Zero, false); - dtmf.decode(Zero, false); - dtmf.decode(Zero, false); - dtmf.decode(Zero, false); - for(uint i = 0; i < 10U; i++) dtmf.decode(NULL_AMBE_DATA_BYTES, false); - dtmf.decode(One, false); - dtmf.decode(One, false); - dtmf.decode(One, false); - dtmf.decode(One, false); - for(uint i = 0; i < 10U; i++) dtmf.decode(NULL_AMBE_DATA_BYTES, false); - dtmf.decode(Eight, false); - dtmf.decode(Eight, false); - dtmf.decode(Eight, false); - dtmf.decode(Eight, false); - for(uint i = 0; i < 10U; i++) dtmf.decode(NULL_AMBE_DATA_BYTES, false); - dtmf.decode(D, false); - dtmf.decode(D, false); - dtmf.decode(D, false); - dtmf.decode(D, false); - for(uint i = 0; i < 10U; i++) dtmf.decode(NULL_AMBE_DATA_BYTES, true); + + decode4(dtmf, D); gap(dtmf); + decode4(dtmf, Zero); gap(dtmf); + decode4(dtmf, One); gap(dtmf); + decode4(dtmf, Eight); gap(dtmf); + decode4(dtmf, D); + gap(dtmf, 10, true); + + EXPECT_TRUE(dtmf.hasCommand()); + EXPECT_STREQ(dtmf.translate().c_str(), "DCS018DL"); + } + + TEST_F(DTMF_decode, decode_reflector_short_module_as_letter) + { + const auto D = makeFrame(DTMF_SYMD); + const auto One = makeFrame(DTMF_SYM1); + const auto Eight = makeFrame(DTMF_SYM8); + + CDTMF dtmf; + + decode4(dtmf, D); gap(dtmf); + decode4(dtmf, One); gap(dtmf); + decode4(dtmf, Eight); gap(dtmf); + decode4(dtmf, D); + gap(dtmf, 10, true); + + EXPECT_TRUE(dtmf.hasCommand()); + EXPECT_STREQ(dtmf.translate().c_str(), "DCS018DL"); + } + + TEST_F(DTMF_decode, decode_reflector_short_module_as_number) + { + const auto D = makeFrame(DTMF_SYMD); + const auto Zero = makeFrame(DTMF_SYM0); + const auto One = makeFrame(DTMF_SYM1); + const auto Eight = makeFrame(DTMF_SYM8); + const auto Four = makeFrame(DTMF_SYM4); + + CDTMF dtmf; + + decode4(dtmf, D); gap(dtmf); + decode4(dtmf, One); gap(dtmf); + decode4(dtmf, Eight); gap(dtmf); + decode4(dtmf, Zero); gap(dtmf); + decode4(dtmf, Four); + gap(dtmf, 10, true); EXPECT_TRUE(dtmf.hasCommand()); EXPECT_STREQ(dtmf.translate().c_str(), "DCS018DL"); } -} \ No newline at end of file +} From f81179db0c9e0c39950002af6abe402f9f3344ae Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Wed, 18 Feb 2026 18:37:06 +0100 Subject: [PATCH 6/7] #61 update readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 19391a9..acb2f03 100644 --- a/README.md +++ b/README.md @@ -158,6 +158,7 @@ The testing framwework used is Google Test. # 6. Version History ## 6.1. Version 1.0 +- [**Bugfix**] Fix decoding of DTMF commands with leading 0 ([#61](https://github.com/F4FXL/DStarGateway/issues/61)) - [**Improvement**] Improve threading handling ([#58](https://github.com/F4FXL/DStarGateway/issues/58)) - [**Improvement**] Add Add an option to disable logging of ircddb traffic ([#59](https://github.com/F4FXL/DStarGateway/issues/59)) - [**Bugfix**] Fix repeater not reverting to startup reflector after issueing a command through remote control. ([#57](https://github.com/F4FXL/DStarGateway/issues/57)) From e86058e3bc74b1afb85a2c9a2ef773eeb04489ba Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Wed, 18 Feb 2026 19:46:11 +0100 Subject: [PATCH 7/7] #61 add some more logging --- DStarBase/DTMF.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/DStarBase/DTMF.cpp b/DStarBase/DTMF.cpp index da61ff2..ab5b48e 100644 --- a/DStarBase/DTMF.cpp +++ b/DStarBase/DTMF.cpp @@ -104,6 +104,7 @@ bool CDTMF::decode(const unsigned char* ambe, bool end) // If it is not a DTMF Code if ((end || m_releaseCount >= 100U) && m_data.length() > 0U) { m_command = m_data; + CLog::logDebug("Received DTMF Command %s", m_command.c_str()); m_data.clear(); m_releaseCount = 0U; }