Merge branch 'develop' into petri_dev

CMakeLists.txt

@@ -455,8 +455,8 @@ if(TGT_BSP MATCHES "arm/q7s")
   target_link_libraries(${LIB_EIVE_MISSION} PUBLIC ${LIB_GPS} ${LIB_ARCSEC})
 endif()
 
-target_link_libraries(
-  ${UNITTEST_NAME} PRIVATE Catch2 ${LIB_EIVE_MISSION} rapidcsv ${LIB_DUMMIES})
+target_link_libraries(${UNITTEST_NAME} PRIVATE Catch2 ${LIB_EIVE_MISSION}
+                                               rapidcsv ${LIB_DUMMIES})
 
 if(TGT_BSP MATCHES "arm/egse")
   target_link_libraries(${OBSW_NAME} PRIVATE ${LIB_ARCSEC})

bsp_q7s/core/CoreController.cpp

@@ -1872,11 +1872,11 @@ ReturnValue_t CoreController::executeSwUpdate(SwUpdateSources sourceDir, const u
     sourceStr = "tmp directory";
   }
   bool sameChipAndCopy = false;
-  if(chip == CURRENT_CHIP and copy == CURRENT_COPY) {
+  if (chip == CURRENT_CHIP and copy == CURRENT_COPY) {
     // This is problematic if the OBSW is running as a systemd service.
     // Do not allow for now.
     return HasActionsIF::INVALID_PARAMETERS;
-    //sameChipAndCopy = true;
+    // sameChipAndCopy = true;
   }
   sif::info << "Executing SW update for Chip " << static_cast<int>(data[0]) << " Copy "
             << static_cast<int>(data[1]) << " from " << sourceStr << std::endl;
@@ -1912,7 +1912,7 @@ ReturnValue_t CoreController::executeSwUpdate(SwUpdateSources sourceDir, const u
   cmd.clear();
   path obswDestPath;
   path obswVersionDestPath;
-  if(not sameChipAndCopy) {
+  if (not sameChipAndCopy) {
     cmd << "xsc_mount_copy " << std::to_string(data[0]) << " " << std::to_string(data[1]);
     result = system(cmd.str().c_str());
     if (result != 0) {

mission/devices/devicedefinitions/gomspaceDefines.h

@@ -28,6 +28,6 @@ static constexpr uint32_t P60PDU_PARAM_SIZE = 0x13E;
 static constexpr uint32_t P60ACU_HK_SIZE = 0x7C;
 static constexpr uint32_t P60ACU_PARAM_SIZE = 0x1B;
 
-}
+}  // namespace gsConstants
 
 #endif /* MISSION_DEVICES_DEVICEDEFINITIONS_GOMSPACEDEFINES_H_ */