From e19ddcfbd87e6e7b1535d6f068af283c7ced983e Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Sun, 2 Jul 2023 14:02:37 +0200
Subject: [PATCH 1/3] EM ACS board

---
 CMakeLists.txt                 | 4 ++--
 bsp_q7s/em/emObjectFactory.cpp | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c63d32ad..b07423ac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@
 cmake_minimum_required(VERSION 3.13)
 
 set(OBSW_VERSION_MAJOR 5)
-set(OBSW_VERSION_MINOR 1)
+set(OBSW_VERSION_MINOR 2)
 set(OBSW_VERSION_REVISION 0)
 
 # set(CMAKE_VERBOSE TRUE)
@@ -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}
diff --git a/bsp_q7s/em/emObjectFactory.cpp b/bsp_q7s/em/emObjectFactory.cpp
index 2e171e02..1b6fd290 100644
--- a/bsp_q7s/em/emObjectFactory.cpp
+++ b/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
-  // Still initialize chip select to avoid SPI bus issues.
+  // 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

From a5c9e1481b4a54e2e1753176281e23e333801409 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Sun, 2 Jul 2023 14:04:29 +0200
Subject: [PATCH 2/3] changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5881296..55a1b6d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,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 swichting
+  issue has disappeared and adding back the ACS board is worth it for the GPS timekeeping.
 
 # [v5.1.0] 2023-06-28
 

From 0e9035d6c1095439d50cf6d808449d3b7870851e Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Sun, 2 Jul 2023 14:21:35 +0200
Subject: [PATCH 3/3] changelog, prep v5.2.0

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55a1b6d5..e1d14b27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,7 +20,7 @@ will consitute of a breaking change warranting a new major release:
 
 - Important bugfixes for PTME. See `q7s-package` CHANGELOG.
 
-# [v5.2.0] 2023-06-29
+# [v5.2.0] 2023-07-02
 
 ## Fixed
 
@@ -32,7 +32,7 @@ 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 swichting
+- 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