VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-10-31 15:07:12 -04:00
Code Issues Projects Releases Wiki Activity

More M17 library cleanup

Browse Source
This commit is contained in:
f4exb 2022-07-20 09:07:00 +02:00
parent f00cdc28c9
commit a7392ab56f
28 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modemm17/CRC16.h
View File

@ -1,4 +1,4 @@
// Copyright 2020 modemm17 LLC. // Copyright 2020 Mobilinkd LLC.
#pragma once #pragma once

2
modemm17/CarrierDetect.h
View File

@ -1,4 +1,4 @@
// Copyright 2020 modemm17 LLC. // Copyright 2020 Mobilinkd LLC.
#pragma once #pragma once

2
modemm17/ClockRecovery.h
View File

@ -1,4 +1,4 @@
// Copyright 2021 modemm17 LLC. // Copyright 2021 Mobilinkd LLC.
#pragma once #pragma once

2
modemm17/Convolution.h
View File

@ -1,4 +1,4 @@
// Copyright 2020 modemm17 LLC. // Copyright 2020 Mobilinkd LLC.
#pragma once #pragma once

2
modemm17/Correlator.h
View File

@ -1,4 +1,4 @@
// Copyright 2021 Rob Riggs <rob@modemm17.com> // Copyright 2021 Rob Riggs <rob@mobilinkd.com>
// All rights reserved. // All rights reserved.
#pragma once #pragma once

2
modemm17/DataCarrierDetect.h
View File

@ -1,4 +1,4 @@
// Copyright 2021 modemm17 LLC. // Copyright 2021 Mobilinkd LLC.
#pragma once #pragma once

2
modemm17/DeviationError.h
View File

@ -1,4 +1,4 @@
// Copyright 2020 modemm17 LLC. // Copyright 2020 Mobilinkd LLC.
#pragma once #pragma once

2
modemm17/Filter.h
View File

@ -1,4 +1,4 @@
// Copyright 2015-2021 modemm17 LLC. // Copyright 2015-2021 Mobilinkd LLC.
#pragma once #pragma once

2
modemm17/FirFilter.h
View File

@ -1,4 +1,4 @@
// Copyright 2015-2020 modemm17 LLC. // Copyright 2015-2020 Mobilinkd LLC.
#pragma once #pragma once

2
modemm17/FreqDevEstimator.h
View File

@ -1,4 +1,4 @@
// Copyright 2021 Rob Riggs <rob@modemm17.com> // Copyright 2021 Rob Riggs <rob@mobilinkd.com>
// All rights reserved. // All rights reserved.
#pragma once #pragma once

2
modemm17/FrequencyError.h
View File

@ -1,4 +1,4 @@
// Copyright 2020 modemm17 LLC. // Copyright 2020 Mobilinkd LLC.
#pragma once #pragma once

2
modemm17/Fsk4Demod.h
View File

@ -1,4 +1,4 @@
// Copyright 2020 modemm17 LLC. // Copyright 2020 Mobilinkd LLC.
#pragma once #pragma once

2
modemm17/Golay24.h
View File

@ -1,4 +1,4 @@
// Copyright 2020 Rob Riggs <rob@modemm17.com> // Copyright 2020 Rob Riggs <rob@mobilinkd.com>
// All rights reserved. // All rights reserved.
#pragma once #pragma once

2
modemm17/IirFilter.h
View File

@ -1,4 +1,4 @@
// Copyright 2015-2021 modemm17 LLC. // Copyright 2015-2021 Mobilinkd LLC.
#pragma once #pragma once

9
modemm17/LinkSetupFrame.h
View File

@ -1,11 +1,11 @@
// Copyright 2020 modemm17 LLC. // Copyright 2020 Mobilinkd LLC.
#pragma once #pragma once
#include <array> #include <array>
#include <cstdint> #include <cstdint>
#include <cmath> #include <cmath>
#include <string_view> // Don't have std::span in C++17. // #include <string_view> // Don't have std::span in C++17.
#include <stdexcept> #include <stdexcept>
#include <algorithm> #include <algorithm>
@ -56,11 +56,11 @@ struct LinkSetupFrame
for (auto c : callsign) for (auto c : callsign)
{ {
encoded *= 40; encoded *= 40;
if (c >= 'A' and c <= 'Z') if ((c >= 'A') && (c <= 'Z'))
{ {
encoded += c - 'A' + 1; encoded += c - 'A' + 1;
} }
else if (c >= '0' and c <= '9') else if ((c >= '0') && (c <= '9'))
{ {
encoded += c - '0' + 27; encoded += c - '0' + 27;
} }
@ -112,6 +112,7 @@ struct LinkSetupFrame
// decode each base-40 digit and map them to the appriate character. // decode each base-40 digit and map them to the appriate character.
result.fill(0); result.fill(0);
size_t index = 0; size_t index = 0;
while (encoded) while (encoded)
{ {
result[index++] = callsign_map[encoded % 40]; result[index++] = callsign_map[encoded % 40];

2
modemm17/M17Demodulator.h
View File

@ -1,4 +1,4 @@
// Copyright 2020-2021 Rob Riggs <rob@modemm17.com> // Copyright 2020-2021 Rob Riggs <rob@mobilinkd.com>
// All rights reserved. // All rights reserved.
#pragma once #pragma once

2
modemm17/M17FrameDecoder.h
View File

@ -1,4 +1,4 @@
// Copyright 2021 modemm17 LLC. // Copyright 2021 Mobilinkd LLC.
#pragma once #pragma once

2
modemm17/M17Framer.h
View File

@ -1,4 +1,4 @@
// Copyright 2020 modemm17 LLC. // Copyright 2020 Mobilinkd LLC.
#pragma once #pragma once

2
modemm17/M17Randomizer.h
View File

@ -1,4 +1,4 @@
// Copyright 2020 modemm17 LLC. // Copyright 2020 Mobilinkd LLC.
#pragma once #pragma once

2
modemm17/M17Synchronizer.h
View File

@ -1,4 +1,4 @@
// Copyright 2020 modemm17 LLC. // Copyright 2020 Mobilinkd LLC.
#pragma once #pragma once

2
modemm17/PhaseEstimator.h
View File

@ -1,4 +1,4 @@
// Copyright 2020 modemm17 LLC. // Copyright 2020 Mobilinkd LLC.
#pragma once #pragma once

2
modemm17/PolynomialInterleaver.h
View File

@ -1,4 +1,4 @@
// Copyright 2020 modemm17 LLC. // Copyright 2020 Mobilinkd LLC.
#pragma once #pragma once

2
modemm17/SlidingDFT.h
View File

@ -1,4 +1,4 @@
// Copyright 2021 modemm17 LLC. // Copyright 2021 Mobilinkd LLC.
#pragma once #pragma once

2
modemm17/SymbolEvm.h
View File

@ -1,4 +1,4 @@
// Copyright 2020 modemm17 LLC. // Copyright 2020 Mobilinkd LLC.
#pragma once #pragma once

2
modemm17/Trellis.h
View File

@ -1,4 +1,4 @@
// Copyright 2020-2021 modemm17 LLC. // Copyright 2020-2021 Mobilinkd LLC.
// make CXXFLAGS="$(pkg-config --cflags gtest) $(pkg-config --libs gtest) -I. -O3" tests/TrellisTest // make CXXFLAGS="$(pkg-config --cflags gtest) $(pkg-config --libs gtest) -I. -O3" tests/TrellisTest

2
modemm17/Util.h
View File

@ -1,4 +1,4 @@
// Copyright 2020 modemm17 LLC. // Copyright 2020 Mobilinkd LLC.
#pragma once #pragma once

2
modemm17/Viterbi.h
View File

@ -1,4 +1,4 @@
// Copyright 2020 modemm17 LLC. // Copyright 2020 Mobilinkd LLC.
#pragma once #pragma once

2
modemm17/ax25_frame.h
View File

@ -1,4 +1,4 @@
// Copyright 2012-2021 Rob Riggs <rob@modemm17.com> // Copyright 2012-2021 Rob Riggs <rob@mobilinkd.com>
// All rights reserved. // All rights reserved.
#pragma once #pragma once