More M17 library cleanup

2022-07-20 09:07:00 +02:00 · 2022-07-20 09:07:00 +02:00 · a7392ab56f
commit a7392ab56f
--- a/modemm17/CRC16.h
+++ b/modemm17/CRC16.h
@ -1,4 +1,4 @@
-// Copyright 2020 modemm17 LLC.
+// Copyright 2020 Mobilinkd LLC.

 #pragma once

--- a/modemm17/CarrierDetect.h
+++ b/modemm17/CarrierDetect.h
@ -1,4 +1,4 @@
-// Copyright 2020 modemm17 LLC.
+// Copyright 2020 Mobilinkd LLC.

 #pragma once

--- a/modemm17/ClockRecovery.h
+++ b/modemm17/ClockRecovery.h
@ -1,4 +1,4 @@
-// Copyright 2021 modemm17 LLC.
+// Copyright 2021 Mobilinkd LLC.

 #pragma once

--- a/modemm17/Convolution.h
+++ b/modemm17/Convolution.h
@ -1,4 +1,4 @@
-// Copyright 2020 modemm17 LLC.
+// Copyright 2020 Mobilinkd LLC.

 #pragma once

--- a/modemm17/Correlator.h
+++ b/modemm17/Correlator.h
@ -1,4 +1,4 @@
-// Copyright 2021 Rob Riggs <rob@modemm17.com>
+// Copyright 2021 Rob Riggs <rob@mobilinkd.com>
 // All rights reserved.

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

 #pragma once

--- a/modemm17/DeviationError.h
+++ b/modemm17/DeviationError.h
@ -1,4 +1,4 @@
-// Copyright 2020 modemm17 LLC.
+// Copyright 2020 Mobilinkd LLC.

 #pragma once

--- a/modemm17/Filter.h
+++ b/modemm17/Filter.h
@ -1,4 +1,4 @@
-// Copyright 2015-2021 modemm17 LLC.
+// Copyright 2015-2021 Mobilinkd LLC.

 #pragma once

--- a/modemm17/FirFilter.h
+++ b/modemm17/FirFilter.h
@ -1,4 +1,4 @@
-// Copyright 2015-2020 modemm17 LLC.
+// Copyright 2015-2020 Mobilinkd LLC.

 #pragma once

--- a/modemm17/FreqDevEstimator.h
+++ b/modemm17/FreqDevEstimator.h
@ -1,4 +1,4 @@
-// Copyright 2021 Rob Riggs <rob@modemm17.com>
+// Copyright 2021 Rob Riggs <rob@mobilinkd.com>
 // All rights reserved.

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

 #pragma once

--- a/modemm17/Fsk4Demod.h
+++ b/modemm17/Fsk4Demod.h
@ -1,4 +1,4 @@
-// Copyright 2020 modemm17 LLC.
+// Copyright 2020 Mobilinkd LLC.

 #pragma once

--- a/modemm17/Golay24.h
+++ b/modemm17/Golay24.h
@ -1,4 +1,4 @@
-// Copyright 2020 Rob Riggs <rob@modemm17.com>
+// Copyright 2020 Rob Riggs <rob@mobilinkd.com>
 // All rights reserved.

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

 #pragma once

--- a/modemm17/LinkSetupFrame.h
+++ b/modemm17/LinkSetupFrame.h
@ -1,11 +1,11 @@
-// Copyright 2020 modemm17 LLC.
+// Copyright 2020 Mobilinkd LLC.

 #pragma once

 #include <array>
 #include <cstdint>
 #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 <algorithm>

@ -56,11 +56,11 @@ struct LinkSetupFrame
        for (auto c : callsign)
        {
            encoded *= 40;
-            if (c >= 'A' and c <= 'Z')
+            if ((c >= 'A') && (c <= 'Z'))
            {
                encoded += c - 'A' + 1;
            }
-            else if (c >= '0' and c <= '9')
+            else if ((c >= '0') && (c <= '9'))
            {
                encoded += c - '0' + 27;
            }
@ -112,6 +112,7 @@ struct LinkSetupFrame
        // decode each base-40 digit and map them to the appriate character.
        result.fill(0);
        size_t index = 0;
+
        while (encoded)
        {
            result[index++] = callsign_map[encoded % 40];
--- a/modemm17/M17Demodulator.h
+++ b/modemm17/M17Demodulator.h
@ -1,4 +1,4 @@
-// Copyright 2020-2021 Rob Riggs <rob@modemm17.com>
+// Copyright 2020-2021 Rob Riggs <rob@mobilinkd.com>
 // All rights reserved.

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

 #pragma once

--- a/modemm17/M17Framer.h
+++ b/modemm17/M17Framer.h
@ -1,4 +1,4 @@
-// Copyright 2020 modemm17 LLC.
+// Copyright 2020 Mobilinkd LLC.

 #pragma once

--- a/modemm17/M17Randomizer.h
+++ b/modemm17/M17Randomizer.h
@ -1,4 +1,4 @@
-// Copyright 2020 modemm17 LLC.
+// Copyright 2020 Mobilinkd LLC.

 #pragma once

--- a/modemm17/M17Synchronizer.h
+++ b/modemm17/M17Synchronizer.h
@ -1,4 +1,4 @@
-// Copyright 2020 modemm17 LLC.
+// Copyright 2020 Mobilinkd LLC.

 #pragma once

--- a/modemm17/PhaseEstimator.h
+++ b/modemm17/PhaseEstimator.h
@ -1,4 +1,4 @@
-// Copyright 2020 modemm17 LLC.
+// Copyright 2020 Mobilinkd LLC.

 #pragma once

--- a/modemm17/PolynomialInterleaver.h
+++ b/modemm17/PolynomialInterleaver.h
@ -1,4 +1,4 @@
-// Copyright 2020 modemm17 LLC.
+// Copyright 2020 Mobilinkd LLC.

 #pragma once

--- a/modemm17/SlidingDFT.h
+++ b/modemm17/SlidingDFT.h
@ -1,4 +1,4 @@
-// Copyright 2021 modemm17 LLC.
+// Copyright 2021 Mobilinkd LLC.

 #pragma once

--- a/modemm17/SymbolEvm.h
+++ b/modemm17/SymbolEvm.h
@ -1,4 +1,4 @@
-// Copyright 2020 modemm17 LLC.
+// Copyright 2020 Mobilinkd LLC.

 #pragma once

--- a/modemm17/Trellis.h
+++ b/modemm17/Trellis.h
@ -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

--- a/modemm17/Util.h
+++ b/modemm17/Util.h
@ -1,4 +1,4 @@
-// Copyright 2020 modemm17 LLC.
+// Copyright 2020 Mobilinkd LLC.

 #pragma once

--- a/modemm17/Viterbi.h
+++ b/modemm17/Viterbi.h
@ -1,4 +1,4 @@
-// Copyright 2020 modemm17 LLC.
+// Copyright 2020 Mobilinkd LLC.

 #pragma once

--- a/modemm17/ax25_frame.h
+++ b/modemm17/ax25_frame.h
@ -1,4 +1,4 @@
-// Copyright 2012-2021 Rob Riggs <rob@modemm17.com>
+// Copyright 2012-2021 Rob Riggs <rob@mobilinkd.com>
 // All rights reserved.

 #pragma once