fix test includes

OpenRTX · Jul 21, 2022 · c2321f9 · c2321f9
1 parent cb94b78
commit c2321f9
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 20 deletions.
diff --git a/tests/unit/M17_demodulator.cpp b/tests/unit/M17_demodulator.cpp
@@ -26,12 +26,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <M17/M17DSP.h>
-#include <M17/M17Demodulator.h>
-#include <M17/M17Utils.h>
-#include <interfaces/audio_stream.h>
+
+#include "interfaces/audio_stream.h"
+#include "protocols/M17/M17DSP.hpp"
+#include "protocols/M17/M17Demodulator.hpp"
+#include "protocols/M17/M17Utils.hpp"
 
 using namespace std;
+using namespace M17;
 
 /**
  * Test the different demodulation steps

diff --git a/tests/unit/M17_golay.cpp b/tests/unit/M17_golay.cpp
@@ -19,12 +19,14 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <cstdio>
 #include <cstdint>
+#include <cstdio>
 #include <random>
-#include "M17/M17Golay.h"
+
+#include "protocols/M17/M17Golay.hpp"
 
 using namespace std;
+using namespace M17;
 
 default_random_engine rng;
 

diff --git a/tests/unit/M17_rrc.cpp b/tests/unit/M17_rrc.cpp
@@ -19,10 +19,11 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <limits.h>
 #include <inttypes.h>
+#include <limits.h>
 #include <stdio.h>
-#include <M17/M17DSP.h>
+
+#include "protocols/M17/M17DSP.hpp"
 
 #define IMPULSE_SIZE 4096
 

diff --git a/tests/unit/M17_viterbi.cpp b/tests/unit/M17_viterbi.cpp
@@ -19,16 +19,18 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <cstdio>
+#include <array>
 #include <cstdint>
+#include <cstdio>
 #include <random>
-#include <array>
-#include "M17/M17ConvolutionalEncoder.h"
-#include "M17/M17CodePuncturing.h"
-#include "M17/M17Viterbi.h"
-#include "M17/M17Utils.h"
+
+#include "protocols/M17/M17CodePuncturing.hpp"
+#include "protocols/M17/M17ConvolutionalEncoder.hpp"
+#include "protocols/M17/M17Utils.hpp"
+#include "protocols/M17/M17Viterbi.hpp"
 
 using namespace std;
+using namespace M17;
 
 default_random_engine rng;
 

diff --git a/tests/unit/cps.c b/tests/unit/cps.c
@@ -1,6 +1,7 @@
-#include <interfaces/cps_io.h>
-#include <string.h>
 #include <stdio.h>
+#include <string.h>
+
+#include "interfaces/cps_io.h"
 
 int test_initCPS() {
     // Initialize a new cps

diff --git a/tests/unit/linux_inputStream_test.cpp b/tests/unit/linux_inputStream_test.cpp
@@ -15,11 +15,10 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#include <string.h>
-
 #include <chrono>
 #include <cstdio>
 #include <cstdlib>
+#include <cstring>
 #include <thread>
 #include <vector>
 

diff --git a/tests/unit/ui_check_standby.c b/tests/unit/ui_check_standby.c
@@ -1,8 +1,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
-#include <state.h>
-#include <settings.h>
+
+#include "core/state.h"
+#include "core/settings.h"
 
 extern bool _ui_checkStandby(long long);
 extern state_t state;