EM ACS board #723

Merged
muellerr merged 2 commits from add-back-em-acs-brd into main 2023-07-02 14:19:55 +02:00
3 changed files with 7 additions and 4 deletions

View File

@ -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 - PTME was always reset on submode changes. The reset will now only be performed if the actual data
rate changes. 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 # [v5.1.0] 2023-06-28

View File

@ -10,7 +10,7 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.13)
set(OBSW_VERSION_MAJOR 5) set(OBSW_VERSION_MAJOR 5)
set(OBSW_VERSION_MINOR 1) set(OBSW_VERSION_MINOR 2)
set(OBSW_VERSION_REVISION 0) set(OBSW_VERSION_REVISION 0)
# set(CMAKE_VERBOSE TRUE) # set(CMAKE_VERBOSE TRUE)
@ -105,7 +105,7 @@ set(OBSW_ADD_THERMAL_TEMP_INSERTER
${OBSW_Q7S_EM} ${OBSW_Q7S_EM}
CACHE STRING "Add thermal sensor temperature inserter") CACHE STRING "Add thermal sensor temperature inserter")
set(OBSW_ADD_ACS_BOARD set(OBSW_ADD_ACS_BOARD
${INIT_VAL} 1
CACHE STRING "Add ACS board module") CACHE STRING "Add ACS board module")
set(OBSW_ADD_GPS_CTRL set(OBSW_ADD_GPS_CTRL
${INIT_VAL} ${INIT_VAL}

View File

@ -84,9 +84,10 @@ void ObjectFactory::produce(void* args) {
new CoreController(objects::CORE_CONTROLLER, enableHkSets); 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); createRadSensorChipSelect(gpioComIF);
#if OBSW_ADD_ACS_BOARD == 1
createAcsBoardComponents(*spiMainComIF, gpioComIF, uartComIF, *pwrSwitcher, true, createAcsBoardComponents(*spiMainComIF, gpioComIF, uartComIF, *pwrSwitcher, true,
adis1650x::Type::ADIS16507); adis1650x::Type::ADIS16507);
#else #else