Merge branch 'v2.1.0-dev' into acs-params-fix

2023-05-23 15:08:56 +02:00 · 2023-05-23 15:08:56 +02:00 · 04571bbd7a
commit 04571bbd7a
parent 32a4aa48d9 72b5c7d053
2 changed files with 3 additions and 2 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -48,6 +48,7 @@ will consitute of a breaking change warranting a new major release:

 - Add the remaining system modes.
 - PLOC MPSoC flash read command working.
+- BPX battery handler is added for EM by default.

 ## Fixed

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