fleg
/
OpenRTX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

M17: replaced std::experimental::array with std:array

This commit is contained in:
Jim Ancona 2024-12-29 08:16:12 -05:00 committed by Silvano Seva
parent 5b7f835817
commit b16c3c0fd1
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openrtx/include/protocols/M17/M17CodePuncturing.hpp
View File

@ -27,7 +27,7 @@
#error This header is C++ only! #error This header is C++ only!
#endif #endif
#include <experimental/array> #include <array>
#include "M17Utils.hpp" #include "M17Utils.hpp"
namespace M17 namespace M17
@ -36,21 +36,21 @@ namespace M17
/** /**
* Puncture matrix for linx setup frame. * 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, 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, 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, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1
); };
/** /**
* Puncture matrix for audio frames. * 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, 1,
1, 1, 1, 1, 1, 0 1, 1, 1, 1, 1, 0
); };
/** /**

1
openrtx/include/protocols/M17/M17Decorrelator.hpp
View File

@ -27,7 +27,6 @@
#error This header is C++ only! #error This header is C++ only!
#endif #endif
#include <experimental/array>
#include <string> #include <string>
#include <array> #include <array>

1
openrtx/src/protocols/M17/M17Modulator.cpp
View File

@ -21,7 +21,6 @@
#include <new> #include <new>
#include <cstddef> #include <cstddef>
#include <cstring> #include <cstring>
#include <experimental/array>
#include <M17/M17Modulator.hpp> #include <M17/M17Modulator.hpp>
#include <M17/M17Utils.hpp> #include <M17/M17Utils.hpp>
#include <M17/M17DSP.hpp> #include <M17/M17DSP.hpp>