Merge branch 'v2.1.0-dev' into acs-params-fix
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good

This commit is contained in:
Marius Eggert 2023-05-23 15:08:56 +02:00
commit 04571bbd7a
2 changed files with 3 additions and 2 deletions

View File

@ -48,6 +48,7 @@ will consitute of a breaking change warranting a new major release:
- Add the remaining system modes. - Add the remaining system modes.
- PLOC MPSoC flash read command working. - PLOC MPSoC flash read command working.
- BPX battery handler is added for EM by default.
## Fixed ## Fixed

View File

@ -83,8 +83,8 @@ set(OBSW_ADD_MGT
${INIT_VAL} ${INIT_VAL}
CACHE STRING "Add MGT module") CACHE STRING "Add MGT module")
set(OBSW_ADD_BPX_BATTERY_HANDLER set(OBSW_ADD_BPX_BATTERY_HANDLER
${INIT_VAL} 1
CACHE STRING "Add MGT module") CACHE STRING "Add BPX battery module")
set(OBSW_ADD_STAR_TRACKER set(OBSW_ADD_STAR_TRACKER
${INIT_VAL} ${INIT_VAL}
CACHE STRING "Add Startracker module") CACHE STRING "Add Startracker module")