From 1134505457f69fe8b0df7e9f1ce0f735e67300a0 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Thu, 1 Apr 2021 16:33:30 +0200
Subject: [PATCH] now its compiling

---
 bsp_q7s/gpio/gpioCallbacks.cpp   |  2 +-
 fsfw_hal                         |  2 +-
 fsfwconfig/OBSWConfig.h          |  2 --
 linux/boardtest/SpiTestClass.cpp | 19 ++++++++++---------
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/bsp_q7s/gpio/gpioCallbacks.cpp b/bsp_q7s/gpio/gpioCallbacks.cpp
index 5d7a639e..086e6469 100644
--- a/bsp_q7s/gpio/gpioCallbacks.cpp
+++ b/bsp_q7s/gpio/gpioCallbacks.cpp
@@ -26,7 +26,7 @@ void initTcsBoardDecoder(GpioIF* gpioComIF) {
      * Initial values of the spi mux gpios can all be set to an arbitrary value expect for spi mux
      * bit 1. Setting spi mux bit 1 to high will pull all decoder outputs to high voltage level.
      */
-    GpiodRegular spiMuxBit1 = new GpiodRegular(std::string("gpiochip7"), 13,
+    GpiodRegular* spiMuxBit1 = new GpiodRegular(std::string("gpiochip7"), 13,
             std::string("SPI Mux Bit 1"), gpio::OUT, 1);
     spiMuxGpios->addGpio(gpioIds::SPI_MUX_BIT_1, spiMuxBit1);
     GpiodRegular* spiMuxBit2 = new GpiodRegular(std::string("gpiochip7"), 14,
diff --git a/fsfw_hal b/fsfw_hal
index c62cdbeb..2fb50360 160000
--- a/fsfw_hal
+++ b/fsfw_hal
@@ -1 +1 @@
-Subproject commit c62cdbebcb521975043f1782692667faaf5a8aca
+Subproject commit 2fb50360ef8910ed785d31cc4da098a77c26fd81
diff --git a/fsfwconfig/OBSWConfig.h b/fsfwconfig/OBSWConfig.h
index 05ad0fe9..81e61653 100644
--- a/fsfwconfig/OBSWConfig.h
+++ b/fsfwconfig/OBSWConfig.h
@@ -31,8 +31,6 @@ debugging. */
 
 /* Can be used to switch device to NORMAL mode immediately */
 #define OBSW_SWITCH_TO_NORMAL_MODE_AFTER_STARTUP    1
-/* Can be used for low-level debugging of the SPI bus */
-#define FSFW_LINUX_SPI_WIRETAPPING                  0
 
 #ifdef __cplusplus
 
diff --git a/linux/boardtest/SpiTestClass.cpp b/linux/boardtest/SpiTestClass.cpp
index cb5b996c..ec6cc65c 100644
--- a/linux/boardtest/SpiTestClass.cpp
+++ b/linux/boardtest/SpiTestClass.cpp
@@ -294,40 +294,41 @@ void SpiTestClass::performL3gTest(uint8_t l3gId) {
 void SpiTestClass::acsInit() {
     GpioCookie* gpioCookie = new GpioCookie();
     std::string rpiGpioName = "gpiochip0";
+    GpiodRegular* gpio = nullptr;
     {
-        GpiodRegular gpio(rpiGpioName, mgm0Lis3ChipSelect, "MGM_0_LIS3",
+        gpio = new GpiodRegular(rpiGpioName, mgm0Lis3ChipSelect, "MGM_0_LIS3",
                 gpio::Direction::OUT, 1);
         gpioCookie->addGpio(gpioIds::MGM_0_LIS3_CS, gpio);
     }
     {
-        GpiodRegular gpio(rpiGpioName, mgm1Rm3100ChipSelect, "MGM_1_RM3100",
+        gpio = new GpiodRegular(rpiGpioName, mgm1Rm3100ChipSelect, "MGM_1_RM3100",
                 gpio::Direction::OUT, 1);
         gpioCookie->addGpio(gpioIds::MGM_1_RM3100_CS, gpio);
     }
     {
-        GpiodRegular gpio(rpiGpioName, gyro0AdisChipSelect, "GYRO_0_ADIS",
+        gpio = new GpiodRegular(rpiGpioName, gyro0AdisChipSelect, "GYRO_0_ADIS",
                 gpio::Direction::OUT, 1);
         gpioCookie->addGpio(gpioIds::GYRO_0_ADIS_CS, gpio);
     }
     {
-        GpiodRegular gpio(rpiGpioName, gyro1L3gd20ChipSelect, "GYRO_1_L3G",
+        gpio = new GpiodRegular(rpiGpioName, gyro1L3gd20ChipSelect, "GYRO_1_L3G",
                 gpio::Direction::OUT, 1);
         gpioCookie->addGpio(gpioIds::GYRO_1_L3G_CS, gpio);
     }
     {
-        GpiodRegular gpio(rpiGpioName, gyro2L3gd20ChipSelect, "GYRO_2_L3G",
+        gpio = new GpiodRegular(rpiGpioName, gyro2L3gd20ChipSelect, "GYRO_2_L3G",
                 gpio::Direction::OUT, 1);
         gpioCookie->addGpio(gpioIds::GYRO_2_L3G_CS, gpio);
     }
     {
-        GpiodRegular gpio(rpiGpioName, mgm2Lis3mdlChipSelect, "MGM_2_LIS3",
+        gpio = new GpiodRegular(rpiGpioName, mgm2Lis3mdlChipSelect, "MGM_2_LIS3",
                 gpio::Direction::OUT, 1);
-        gpioCookie->addGpio(gpioIds::MGM_2_LIS3_CS, &gpio);
+        gpioCookie->addGpio(gpioIds::MGM_2_LIS3_CS, gpio);
     }
     {
-        GpiodRegular gpio(rpiGpioName, mgm3Rm3100ChipSelect, "MGM_3_RM3100",
+        gpio = new GpiodRegular(rpiGpioName, mgm3Rm3100ChipSelect, "MGM_3_RM3100",
                 gpio::Direction::OUT, 1);
-        gpioCookie->addGpio(gpioIds::MGM_3_RM3100_CS, &gpio);
+        gpioCookie->addGpio(gpioIds::MGM_3_RM3100_CS, gpio);
     }
     if(gpioIF != nullptr) {
         gpioIF->addGpios(gpioCookie);