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 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