manage deps

rtlopez · Feb 8, 2025 · 63647ad · 63647ad
1 parent e4a8a76
commit 63647ad
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/lib/Espfc/src/ModelState.h b/lib/Espfc/src/ModelState.h
@@ -14,7 +14,6 @@
 #include "Utils/Stats.h"
 #include "Device/SerialDevice.h"
 #include "Connect/Msp.hpp"
-#include <GpsProtocol.hpp>
 
 namespace Espfc {
 
@@ -321,9 +320,17 @@ struct ModeState
   bool airmodeAllowed;
 };
 
+enum GpsDeviceVersion
+{
+  GPS_UNKNOWN,
+  GPS_M8,
+  GPS_M9,
+  GPS_F9,
+};
+
 struct GpsSupportState
 {
-  Gps::DeviceVersion version = Gps::GPS_UNKNOWN;
+  GpsDeviceVersion version = GPS_UNKNOWN;
   bool glonass = false;
   bool galileo = false;
   bool beidou = false;

diff --git a/lib/Espfc/src/Sensor/GpsSensor.cpp b/lib/Espfc/src/Sensor/GpsSensor.cpp
@@ -1,4 +1,5 @@
 #include "Sensor/GpsSensor.hpp"
+#include <GpsProtocol.hpp>
 #include <Arduino.h>
 
 namespace Espfc::Sensor
@@ -329,15 +330,15 @@ void GpsSensor::handleVersion() const
 
   if (std::strcmp(payload + 30, "00080000") == 0)
   {
-    _model.state.gps.support.version = Gps::GPS_M8;
+    _model.state.gps.support.version = GPS_M8;
   }
   else if (std::strcmp(payload + 30, "00090000") == 0)
   {
-    _model.state.gps.support.version = Gps::GPS_M9;
+    _model.state.gps.support.version = GPS_M9;
   }
   else if (std::strcmp(payload + 30, "00190000") == 0)
   {
-    _model.state.gps.support.version = Gps::GPS_F9;
+    _model.state.gps.support.version = GPS_F9;
   }
   if (_ubxMsg.length >= 70)
   {

diff --git a/lib/Espfc/src/Sensor/GpsSensor.hpp b/lib/Espfc/src/Sensor/GpsSensor.hpp
@@ -3,7 +3,6 @@
 #include "Model.h"
 #include "Device/SerialDevice.h"
 #include "Utils/Timer.h"
-#include <GpsProtocol.hpp>
 #include <GpsParser.hpp>
 #include <array>
 #include <algorithm>

diff --git a/test/test_fc/test_fc.cpp b/test/test_fc/test_fc.cpp
@@ -5,6 +5,7 @@
 #include "Control/Controller.h"
 #include "Control/Actuator.h"
 #include "Output/Mixer.h"
+#include <Gps.hpp>
 
 using namespace fakeit;
 using namespace Espfc;

diff --git a/test/test_input_crsf/test_input_crsf.cpp b/test/test_input_crsf/test_input_crsf.cpp
@@ -3,6 +3,7 @@
 #include "Device/InputCRSF.h"
 #include "Device/InputIBUS.hpp"
 #include "msp/msp_protocol.h"
+#include <Gps.hpp>
 
 using namespace Espfc;
 using namespace Espfc::Device;