From 4e8ce4eb0ab86553b7798fdd9e71864c6eddd578 Mon Sep 17 00:00:00 2001
From: Ulrich Mohr <mohr@irs.uni-stuttgart.de>
Date: Mon, 7 Mar 2022 11:47:44 +0100
Subject: [PATCH 1/3] keeping unittests running

---
 bsp_hosted/fsfwconfig/devices/gpioIds.h | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/bsp_hosted/fsfwconfig/devices/gpioIds.h b/bsp_hosted/fsfwconfig/devices/gpioIds.h
index 0c426ccd..f2bb23ac 100644
--- a/bsp_hosted/fsfwconfig/devices/gpioIds.h
+++ b/bsp_hosted/fsfwconfig/devices/gpioIds.h
@@ -50,7 +50,16 @@ enum gpioId_t {
   SPI_MUX_BIT_6,
 
   CS_RAD_SENSOR,
-  ENABLE_RADFET
+  ENABLE_RADFET,
+
+  PLPCDU_ENB_VBAT0,
+  PLPCDU_ENB_VBAT1,
+  PLPCDU_ENB_DRO,
+  PLPCDU_ENB_X8,
+  PLPCDU_ENB_TX,
+  PLPCDU_ENB_HPA,
+  PLPCDU_ENB_MPA,
+  PLPCDU_ADC_CS
 };
 }
 

From 2ef1befb9c6ace4071a086980cc758c74947262e Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Mon, 7 Mar 2022 15:29:27 +0100
Subject: [PATCH 2/3] common gpioIds.h file

---
 bsp_hosted/fsfwconfig/devices/gpioIds.h       | 66 -------------------
 .../config}/devices/gpioIds.h                 |  0
 2 files changed, 66 deletions(-)
 delete mode 100644 bsp_hosted/fsfwconfig/devices/gpioIds.h
 rename {linux/fsfwconfig => common/config}/devices/gpioIds.h (100%)

diff --git a/bsp_hosted/fsfwconfig/devices/gpioIds.h b/bsp_hosted/fsfwconfig/devices/gpioIds.h
deleted file mode 100644
index f2bb23ac..00000000
--- a/bsp_hosted/fsfwconfig/devices/gpioIds.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef FSFWCONFIG_DEVICES_GPIOIDS_H_
-#define FSFWCONFIG_DEVICES_GPIOIDS_H_
-
-namespace gpioIds {
-enum gpioId_t {
-  HEATER_0,
-  HEATER_1,
-  HEATER_2,
-  HEATER_3,
-  HEATER_4,
-  HEATER_5,
-  HEATER_6,
-  HEATER_7,
-  DEPLSA1,
-  DEPLSA2,
-
-  MGM_0_LIS3_CS,
-  MGM_1_RM3100_CS,
-  GYRO_0_ADIS_CS,
-  GYRO_1_L3G_CS,
-  GYRO_2_L3G_CS,
-  MGM_2_LIS3_CS,
-  MGM_3_RM3100_CS,
-
-  TEST_ID_0,
-  TEST_ID_1,
-
-  RTD_IC_3,
-  RTD_IC_4,
-  RTD_IC_5,
-  RTD_IC_6,
-  RTD_IC_7,
-  RTD_IC_8,
-  RTD_IC_9,
-  RTD_IC_10,
-  RTD_IC_11,
-  RTD_IC_12,
-  RTD_IC_13,
-  RTD_IC_14,
-  RTD_IC_15,
-  RTD_IC_16,
-  RTD_IC_17,
-  RTD_IC_18,
-
-  SPI_MUX_BIT_1,
-  SPI_MUX_BIT_2,
-  SPI_MUX_BIT_3,
-  SPI_MUX_BIT_4,
-  SPI_MUX_BIT_5,
-  SPI_MUX_BIT_6,
-
-  CS_RAD_SENSOR,
-  ENABLE_RADFET,
-
-  PLPCDU_ENB_VBAT0,
-  PLPCDU_ENB_VBAT1,
-  PLPCDU_ENB_DRO,
-  PLPCDU_ENB_X8,
-  PLPCDU_ENB_TX,
-  PLPCDU_ENB_HPA,
-  PLPCDU_ENB_MPA,
-  PLPCDU_ADC_CS
-};
-}
-
-#endif /* FSFWCONFIG_DEVICES_GPIOIDS_H_ */
diff --git a/linux/fsfwconfig/devices/gpioIds.h b/common/config/devices/gpioIds.h
similarity index 100%
rename from linux/fsfwconfig/devices/gpioIds.h
rename to common/config/devices/gpioIds.h

From afb1c875daac74750542d2c1c5f9c60ffb8defb0 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Mon, 7 Mar 2022 15:34:19 +0100
Subject: [PATCH 3/3] fsfw update

---
 fsfw | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fsfw b/fsfw
index 75c56280..d6c10411 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 75c56280ad139640d2c12ac4ab78ce66c25fb495
+Subproject commit d6c1041133822903c123e4efd890b1320e1157c9