Merge branch 'main' into higher-acs-modes-only-str

CHANGELOG.md

@@ -16,12 +16,18 @@ will consitute of a breaking change warranting a new major release:
 
 # [unreleased]
 
+# [v7.3.0] 2023-11-07
+
 ## Changed
 
 - Changed PDEC addresses depending on which firmware version is used. It is suspected that
   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.
 
+## Added
+
+- Always add PLOC MPSoC and PLOC SUPV components for the EM as well.
+
 # [v7.2.0] 2023-10-27
 
 - `eive-tmtc` v5.10.1

CMakeLists.txt

@@ -10,7 +10,7 @@
 cmake_minimum_required(VERSION 3.13)
 
 set(OBSW_VERSION_MAJOR 7)
-set(OBSW_VERSION_MINOR 2)
+set(OBSW_VERSION_MINOR 3)
 set(OBSW_VERSION_REVISION 0)
 
 # set(CMAKE_VERBOSE TRUE)
@@ -126,13 +126,13 @@ set(OBSW_ADD_HEATERS
     1
     CACHE STRING "Add TCS heaters")
 set(OBSW_ADD_PLOC_SUPERVISOR
-    ${INIT_VAL}
+    1
     CACHE STRING "Add PLOC supervisor handler")
 set(OBSW_ADD_SA_DEPL
     ${INIT_VAL}
     CACHE STRING "Add SA deployment handler")
 set(OBSW_ADD_PLOC_MPSOC
-    ${INIT_VAL}
+    1
     CACHE STRING "Add MPSoC handler")
 set(OBSW_ADD_ACS_CTRL
     ${INIT_VAL}

bsp_q7s/objectFactory.cpp

@@ -643,12 +643,12 @@ void ObjectFactory::createPayloadComponents(LinuxLibgpioIF* gpioComIF, PowerSwit
   supvGpioCookie->addGpio(gpioIds::ENABLE_SUPV_UART, gpioConfigSupv);
   gpioComIF->addGpios(supvGpioCookie);
   const char* plocSupvDev = q7s::UART_PLOC_SUPERVISOR_DEV;
-  if(not std::filesystem::exists(plocSupvDev)) {
+  if (not std::filesystem::exists(plocSupvDev)) {
     plocSupvDev = q7s::UART_PLOC_SUPERVISOR_DEV_FALLBACK;
   }
-  auto supervisorCookie = new SerialCookie(objects::PLOC_SUPERVISOR_HANDLER,
-                                           plocSupvDev, serial::PLOC_SUPV_BAUD,
-                                           supv::MAX_PACKET_SIZE * 20, UartModes::NON_CANONICAL);
+  auto supervisorCookie =
+      new SerialCookie(objects::PLOC_SUPERVISOR_HANDLER, plocSupvDev, serial::PLOC_SUPV_BAUD,
+                       supv::MAX_PACKET_SIZE * 20, UartModes::NON_CANONICAL);
   supervisorCookie->setNoFixedSizeReply();
   auto supvHelper = new PlocSupvUartManager(objects::PLOC_SUPERVISOR_HELPER);
   auto* supvHandler = new PlocSupervisorHandler(objects::PLOC_SUPERVISOR_HANDLER, supervisorCookie,

linux/ipcore/PdecHandler.cpp

@@ -468,9 +468,7 @@ bool PdecHandler::newTcReceived() {
   return true;
 }
 
-void PdecHandler::doPeriodicWork() {
-  checkLocks();
-}
+void PdecHandler::doPeriodicWork() { checkLocks(); }
 
 bool PdecHandler::checkFrameAna(uint32_t pdecFar) {
   bool frameValid = false;