From 35bba7828a0619fceb4bc39e8ded0a66e3d5de33 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Wed, 18 Feb 2026 18:34:27 +0100 Subject: [PATCH] #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