From 220e033f342e20d64be4e85c0f8a0a888b486d8c Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 24 Jul 2022 19:11:44 +0200 Subject: [PATCH] M17: fixed clang undefined reference --- modemm17/CMakeLists.txt | 1 + modemm17/LinkSetupFrame.cpp | 9 +++++++++ modemm17/LinkSetupFrame.h | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 modemm17/LinkSetupFrame.cpp diff --git a/modemm17/CMakeLists.txt b/modemm17/CMakeLists.txt index baf81dc31..0b10a623d 100644 --- a/modemm17/CMakeLists.txt +++ b/modemm17/CMakeLists.txt @@ -4,6 +4,7 @@ set(modemm17_SOURCES Correlator.cpp FreqDevEstimator.cpp Golay24.cpp + LinkSetupFrame.cpp M17Demodulator.cpp M17Modulator.cpp ) diff --git a/modemm17/LinkSetupFrame.cpp b/modemm17/LinkSetupFrame.cpp new file mode 100644 index 000000000..1740bd4a3 --- /dev/null +++ b/modemm17/LinkSetupFrame.cpp @@ -0,0 +1,9 @@ +#include "LinkSetupFrame.h" + +namespace modemm17 +{ + +const LinkSetupFrame::encoded_call_t LinkSetupFrame::BROADCAST_ADDRESS = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; +const LinkSetupFrame::call_t LinkSetupFrame::BROADCAST_CALL = {'B', 'R', 'O', 'A', 'D', 'C', 'A', 'S', 'T', 0}; + +} diff --git a/modemm17/LinkSetupFrame.h b/modemm17/LinkSetupFrame.h index f37bed6cc..1e45c8bdd 100644 --- a/modemm17/LinkSetupFrame.h +++ b/modemm17/LinkSetupFrame.h @@ -18,8 +18,8 @@ struct LinkSetupFrame using gnss_t = std::array; using frame_t = std::array; - static constexpr encoded_call_t BROADCAST_ADDRESS = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; - static constexpr call_t BROADCAST_CALL = {'B', 'R', 'O', 'A', 'D', 'C', 'A', 'S', 'T', 0}; + static const encoded_call_t BROADCAST_ADDRESS; + static const call_t BROADCAST_CALL; enum TxType { PACKET, STREAM }; enum DataType { DT_RESERVED, DATA, VOICE, MIXED };