From f2f856e2275980d2685e82877e191027ed29325e Mon Sep 17 00:00:00 2001
From: meggert <eggertm@irs.uni-stuttgart.de>
Date: Mon, 18 Mar 2024 17:21:08 +0100
Subject: [PATCH] cleanup

---
 bsp_q7s/core/CoreController.h         | 2 +-
 dummies/GpsCtrlDummy.h                | 2 +-
 dummies/GpsDhbDummy.cpp               | 2 +-
 linux/acs/GPSDefinitions.h            | 4 ++++
 mission/controller/acs/SensorValues.h | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/bsp_q7s/core/CoreController.h b/bsp_q7s/core/CoreController.h
index 9c053008..6827a392 100644
--- a/bsp_q7s/core/CoreController.h
+++ b/bsp_q7s/core/CoreController.h
@@ -9,7 +9,7 @@
 #include <fsfw/parameters/ReceivesParameterMessagesIF.h>
 #include <fsfw_hal/linux/uio/UioMapper.h>
 #include <libxiphos.h>
-#include <mission/acs/archive/GPSDefinitions.h>
+#include <linux/acs/GPSDefinitions.h>
 #include <mission/utility/trace.h>
 
 #include <atomic>
diff --git a/dummies/GpsCtrlDummy.h b/dummies/GpsCtrlDummy.h
index 18b990fb..b64647b1 100644
--- a/dummies/GpsCtrlDummy.h
+++ b/dummies/GpsCtrlDummy.h
@@ -2,7 +2,7 @@
 #define DUMMIES_GPSCTRLDUMMY_H_
 
 #include <fsfw/controller/ExtendedControllerBase.h>
-#include <mission/acs/archive/GPSDefinitions.h>
+#include <linux/acs/GPSDefinitions.h>
 
 class GpsCtrlDummy : public ExtendedControllerBase {
  public:
diff --git a/dummies/GpsDhbDummy.cpp b/dummies/GpsDhbDummy.cpp
index 4e385ec5..73addb3c 100644
--- a/dummies/GpsDhbDummy.cpp
+++ b/dummies/GpsDhbDummy.cpp
@@ -1,5 +1,5 @@
 #include <dummies/GpsDhbDummy.h>
-#include <mission/acs/archive/GPSDefinitions.h>
+#include <linux/acs/GPSDefinitions.h>
 
 GpsDhbDummy::GpsDhbDummy(object_id_t objectId, object_id_t comif, CookieIF *comCookie)
     : DeviceHandlerBase(objectId, comif, comCookie) {}
diff --git a/linux/acs/GPSDefinitions.h b/linux/acs/GPSDefinitions.h
index 0f597397..9fb9e31d 100644
--- a/linux/acs/GPSDefinitions.h
+++ b/linux/acs/GPSDefinitions.h
@@ -9,6 +9,8 @@ namespace GpsHyperion {
 
 enum FixMode : uint8_t { NOT_SEEN = 0, NO_FIX = 1, FIX_2D = 2, FIX_3D = 3 };
 
+enum GnssChip : uint8_t { A_SIDE = 0, B_SIDE = 1 };
+
 static constexpr uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::GPS_HANDLER;
 //! [EXPORT] : [COMMENT] Fix has changed. P1: New fix. P2: Missed fix changes
 //! 0: Not seen, 1: No Fix, 2: 2D-Fix, 3: 3D-Fix
@@ -16,6 +18,8 @@ static constexpr Event GPS_FIX_CHANGE = event::makeEvent(SUBSYSTEM_ID, 0, severi
 //! [EXPORT] : [COMMENT] Could not get fix in maximum allowed time. P1: Maximum allowed time
 //! to get a fix after the GPS was switched on.
 static constexpr Event CANT_GET_FIX = event::makeEvent(SUBSYSTEM_ID, 1, severity::MEDIUM);
+//! [EXPORT] : [COMMENT] Failed to reset an GNNS Device. P1: Board-Side.
+static constexpr Event RESET_FAIL = event::makeEvent(SUBSYSTEM_ID, 2, severity::HIGH);
 
 static constexpr DeviceCommandId_t GPS_REPLY = 0;
 static constexpr DeviceCommandId_t TRIGGER_RESET_PIN_GNSS = 5;
diff --git a/mission/controller/acs/SensorValues.h b/mission/controller/acs/SensorValues.h
index d7da66c0..69761666 100644
--- a/mission/controller/acs/SensorValues.h
+++ b/mission/controller/acs/SensorValues.h
@@ -4,7 +4,7 @@
 #include <fsfw_hal/devicehandlers/MgmLIS3MDLHandler.h>
 #include <fsfw_hal/devicehandlers/MgmRM3100Handler.h>
 #include <fsfw_hal/devicehandlers/devicedefinitions/gyroL3gHelpers.h>
-#include <mission/acs/archive/GPSDefinitions.h>
+#include <linux/acs/GPSDefinitions.h>
 #include <mission/acs/gyroAdisHelpers.h>
 #include <mission/acs/imtqHelpers.h>
 #include <mission/acs/rwHelpers.h>