From 3b1f088596ef13c1bd8c10b8e83d6665559002f3 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Tue, 1 Mar 2022 17:57:48 +0100
Subject: [PATCH 1/2] use OSAL define instead of dedicated define

---
 linux/fsfwconfig/OBSWConfig.h.in         | 5 ++---
 mission/devices/GyroADIS1650XHandler.cpp | 8 +++++---
 mission/devices/GyroADIS1650XHandler.h   | 4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/linux/fsfwconfig/OBSWConfig.h.in b/linux/fsfwconfig/OBSWConfig.h.in
index 388d9ed0..cc90cd78 100644
--- a/linux/fsfwconfig/OBSWConfig.h.in
+++ b/linux/fsfwconfig/OBSWConfig.h.in
@@ -140,10 +140,9 @@ debugging. */
 #endif
 
 /*******************************************************************/
-/** Hardcoded                                                      */
+/** CMake Defines                                                  */
 /*******************************************************************/
-// Leave at one as the BSP is linux. Used by the ADIS1650X device handler
-#define OBSW_ADIS1650X_LINUX_COM_IF                 1
+#cmakedefine EIVE_BUILD_GPSD_GPS_HANDLER
 
 #include "OBSWVersion.h"
 
diff --git a/mission/devices/GyroADIS1650XHandler.cpp b/mission/devices/GyroADIS1650XHandler.cpp
index e3e418f7..b29f71de 100644
--- a/mission/devices/GyroADIS1650XHandler.cpp
+++ b/mission/devices/GyroADIS1650XHandler.cpp
@@ -3,7 +3,9 @@
 #include <fsfw/action/HasActionsIF.h>
 #include <fsfw/datapool/PoolReadGuard.h>
 
-#if OBSW_ADIS1650X_LINUX_COM_IF == 1
+#include "fsfw/FSFW.h"
+
+#ifdef FSFW_OSAL_LINUX
 #include <sys/ioctl.h>
 #include <unistd.h>
 
@@ -20,7 +22,7 @@ GyroADIS1650XHandler::GyroADIS1650XHandler(object_id_t objectId, object_id_t dev
       primaryDataset(this),
       configDataset(this),
       breakCountdown() {
-#if OBSW_ADIS1650X_LINUX_COM_IF == 1
+#ifdef FSFW_OSAL_LINUX
   SpiCookie *cookie = dynamic_cast<SpiCookie *>(comCookie);
   if (cookie != nullptr) {
     cookie->setCallbackMode(&spiSendCallback, this);
@@ -383,7 +385,7 @@ GyroADIS1650XHandler::BurstModes GyroADIS1650XHandler::getBurstMode() {
   }
 }
 
-#if OBSW_ADIS1650X_LINUX_COM_IF == 1
+#ifdef FSFW_OSAL_LINUX
 
 ReturnValue_t GyroADIS1650XHandler::spiSendCallback(SpiComIF *comIf, SpiCookie *cookie,
                                                     const uint8_t *sendData, size_t sendLen,
diff --git a/mission/devices/GyroADIS1650XHandler.h b/mission/devices/GyroADIS1650XHandler.h
index 55de1477..9ad56206 100644
--- a/mission/devices/GyroADIS1650XHandler.h
+++ b/mission/devices/GyroADIS1650XHandler.h
@@ -7,7 +7,7 @@
 #include "fsfw/devicehandlers/DeviceHandlerBase.h"
 #include "fsfw/globalfunctions/PeriodicOperationDivider.h"
 
-#if OBSW_ADIS1650X_LINUX_COM_IF == 1
+#ifdef FSFW_OSAL_LINUX
 class SpiComIF;
 class SpiCookie;
 #endif
@@ -65,7 +65,7 @@ class GyroADIS1650XHandler : public DeviceHandlerBase {
 
   BurstModes getBurstMode();
 
-#if OBSW_ADIS1650X_LINUX_COM_IF == 1
+#ifdef FSFW_OSAL_LINUX
   static ReturnValue_t spiSendCallback(SpiComIF *comIf, SpiCookie *cookie, const uint8_t *sendData,
                                        size_t sendLen, void *args);
 #endif
-- 
2.43.0


From 97a0662adc450219063e14ead177603df5653101 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Thu, 3 Mar 2022 10:36:33 +0100
Subject: [PATCH 2/2] submodule updates

---
 fsfw | 2 +-
 tmtc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fsfw b/fsfw
index 6e0b9069..75c56280 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 6e0b90696da2dfd2ec4749dfdb73950be2283c25
+Subproject commit 75c56280ad139640d2c12ac4ab78ce66c25fb495
diff --git a/tmtc b/tmtc
index 9efb347a..37c1a68d 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 9efb347aa241e5fb7a864540edbd87908110339c
+Subproject commit 37c1a68da1b465514e84403b06ce40d035e4ad88
-- 
2.43.0