diff --git a/openrtx/include/protocols/M17/M17CodePuncturing.hpp b/openrtx/include/protocols/M17/M17CodePuncturing.hpp index 79ba2831..8edaddfc 100644 --- a/openrtx/include/protocols/M17/M17CodePuncturing.hpp +++ b/openrtx/include/protocols/M17/M17CodePuncturing.hpp @@ -27,7 +27,7 @@ #error This header is C++ only! #endif -#include +#include #include "M17Utils.hpp" namespace M17 @@ -36,21 +36,21 @@ namespace M17 /** * Puncture matrix for linx setup frame. */ -static constexpr auto LSF_PUNCTURE = std::experimental::make_array< uint8_t > -( +static constexpr std::array< uint8_t, 61 > LSF_PUNCTURE = +{ 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1 -); +}; /** * Puncture matrix for audio frames. */ -static constexpr auto DATA_PUNCTURE = std::experimental::make_array< uint8_t > -( +static constexpr std::array< uint8_t, 12 > DATA_PUNCTURE = +{ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0 -); +}; /** diff --git a/openrtx/include/protocols/M17/M17Decorrelator.hpp b/openrtx/include/protocols/M17/M17Decorrelator.hpp index a16baa4c..f8aaf4a6 100644 --- a/openrtx/include/protocols/M17/M17Decorrelator.hpp +++ b/openrtx/include/protocols/M17/M17Decorrelator.hpp @@ -27,7 +27,6 @@ #error This header is C++ only! #endif -#include #include #include diff --git a/openrtx/src/protocols/M17/M17Modulator.cpp b/openrtx/src/protocols/M17/M17Modulator.cpp index c5bb546c..d781688a 100644 --- a/openrtx/src/protocols/M17/M17Modulator.cpp +++ b/openrtx/src/protocols/M17/M17Modulator.cpp @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include