Merge branch 'main' into prep_v7.3.0
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good

This commit is contained in:
Marius Eggert 2023-11-06 15:36:04 +01:00
commit 3fe2c44955
2 changed files with 6 additions and 2 deletions

View File

@ -24,6 +24,10 @@ will consitute of a breaking change warranting a new major release:
the previous addresses were invalid and not properly covered by the Linux memory protection. the previous addresses were invalid and not properly covered by the Linux memory protection.
The OBSW will use the old addresses for older FW versions. The OBSW will use the old addresses for older FW versions.
## Added
- Always add PLOC MPSoC and PLOC SUPV components for the EM as well.
# [v7.2.0] 2023-10-27 # [v7.2.0] 2023-10-27
- `eive-tmtc` v5.10.1 - `eive-tmtc` v5.10.1

View File

@ -126,13 +126,13 @@ set(OBSW_ADD_HEATERS
1 1
CACHE STRING "Add TCS heaters") CACHE STRING "Add TCS heaters")
set(OBSW_ADD_PLOC_SUPERVISOR set(OBSW_ADD_PLOC_SUPERVISOR
${INIT_VAL} 1
CACHE STRING "Add PLOC supervisor handler") CACHE STRING "Add PLOC supervisor handler")
set(OBSW_ADD_SA_DEPL set(OBSW_ADD_SA_DEPL
${INIT_VAL} ${INIT_VAL}
CACHE STRING "Add SA deployment handler") CACHE STRING "Add SA deployment handler")
set(OBSW_ADD_PLOC_MPSOC set(OBSW_ADD_PLOC_MPSOC
${INIT_VAL} 1
CACHE STRING "Add MPSoC handler") CACHE STRING "Add MPSoC handler")
set(OBSW_ADD_ACS_CTRL set(OBSW_ADD_ACS_CTRL
${INIT_VAL} ${INIT_VAL}