Merge branch 'main' into main-v6

CHANGELOG.md

@@ -30,8 +30,9 @@ will consitute of a breaking change warranting a new major release:
 
 - For the live channel (VC0), telemetry was still only dumped if the transmitter is active.
   Please note that this fix will lead to crashes for FW versions below v3.2.
+  However, it might not be an issue for the oldest firmware on the satellite (v2.5.1).
 
-# [v5.2.0] 2023-06-29
+# [v5.2.0] 2023-07-02
 
 ## Fixed
 
@@ -43,6 +44,8 @@ will consitute of a breaking change warranting a new major release:
 
 - PTME was always reset on submode changes. The reset will now only be performed if the actual data
   rate changes.
+- Add back ACS board code for the EM. Now that the radiation sensor was removed, the image switching
+  issue has disappeared and adding back the ACS board is worth it for the GPS timekeeping.
 
 # [v5.1.0] 2023-06-28
 

CMakeLists.txt

@@ -105,7 +105,7 @@ set(OBSW_ADD_THERMAL_TEMP_INSERTER
     ${OBSW_Q7S_EM}
     CACHE STRING "Add thermal sensor temperature inserter")
 set(OBSW_ADD_ACS_BOARD
-    ${INIT_VAL}
+    1
     CACHE STRING "Add ACS board module")
 set(OBSW_ADD_GPS_CTRL
     ${INIT_VAL}

bsp_q7s/em/emObjectFactory.cpp

@@ -84,9 +84,10 @@ void ObjectFactory::produce(void* args) {
 
   new CoreController(objects::CORE_CONTROLLER, enableHkSets);
 
-#if OBSW_ADD_ACS_BOARD == 1
+  // Initialize chip select to avoid SPI bus issues.
-  // Still initialize chip select to avoid SPI bus issues.
   createRadSensorChipSelect(gpioComIF);
+
+#if OBSW_ADD_ACS_BOARD == 1
   createAcsBoardComponents(*spiMainComIF, gpioComIF, uartComIF, *pwrSwitcher, true,
                            adis1650x::Type::ADIS16507);
 #else