Merge remote-tracking branch 'origin/develop' into mueller/rtds-update

linux/CMakeLists.txt

@@ -6,6 +6,4 @@ add_subdirectory(devices)
 add_subdirectory(fsfwconfig)
 add_subdirectory(obc)
 
-target_sources(${OBSW_NAME} PUBLIC
-    ObjectFactory.cpp
-)
+target_sources(${OBSW_NAME} PUBLIC ObjectFactory.cpp)

linux/boardtest/CMakeLists.txt

@@ -1,10 +1,2 @@
-target_sources(${OBSW_NAME} PRIVATE
-	LibgpiodTest.cpp
-	I2cTestClass.cpp
-	SpiTestClass.cpp
-	UartTestClass.cpp
-)
-
-
-
-
+target_sources(${OBSW_NAME} PRIVATE LibgpiodTest.cpp I2cTestClass.cpp
+                                    SpiTestClass.cpp UartTestClass.cpp)

linux/callbacks/CMakeLists.txt

@@ -1,3 +1 @@
-target_sources(${OBSW_NAME} PRIVATE
-	gpioCallbacks.cpp
-)
+target_sources(${OBSW_NAME} PRIVATE gpioCallbacks.cpp)

linux/csp/CMakeLists.txt

@@ -1,8 +1 @@
-target_sources(${OBSW_NAME} PUBLIC
-	CspComIF.cpp
-	CspCookie.cpp
-)
-
-
-
-
+target_sources(${OBSW_NAME} PUBLIC CspComIF.cpp CspCookie.cpp)

linux/devices/CMakeLists.txt

@@ -1,7 +1,5 @@
 if(EIVE_BUILD_GPSD_GPS_HANDLER)
-    target_sources(${OBSW_NAME} PRIVATE
-        GPSHyperionLinuxController.cpp
-    )
+  target_sources(${OBSW_NAME} PRIVATE GPSHyperionLinuxController.cpp)
 endif()
 
 target_sources(${OBSW_NAME} PRIVATE

linux/devices/devicedefinitions/PlocSupervisorDefinitions.h

@@ -309,9 +309,8 @@ class ApidOnlyPacket : public SpacePacket {
  */
 class MPSoCBootSelect : public SpacePacket {
  public:
-
-	static const uint8_t NVM0 = 0;
-	static const uint8_t NVM1 = 1;
+  static const uint8_t NVM0 = 0;
+  static const uint8_t NVM1 = 1;
 
   /**
    * @brief   Constructor

linux/devices/ploc/CMakeLists.txt

@@ -1,7 +1,4 @@
-target_sources(${OBSW_NAME} PRIVATE
-    PlocSupervisorHandler.cpp
-    PlocMemoryDumper.cpp
-    PlocMPSoCHandler.cpp
-    PlocMPSoCHelper.cpp
-    PlocSupvHelper.cpp
-)
+target_sources(
+  ${OBSW_NAME}
+  PRIVATE PlocSupervisorHandler.cpp PlocMemoryDumper.cpp PlocMPSoCHandler.cpp
+          PlocMPSoCHelper.cpp PlocSupvHelper.cpp)

linux/devices/ploc/PlocSupervisorHandler.cpp

@@ -1062,7 +1062,8 @@ ReturnValue_t PlocSupervisorHandler::handleBootStatusReport(const uint8_t* data)
   nextReplyId = supv::EXE_REPORT;
 
 #if OBSW_VERBOSE_LEVEL >= 1 && OBSW_DEBUG_PLOC_SUPERVISOR == 1
-  sif::info << "PlocSupervisorHandler::handleBootStatusReport: SoC State (0 - off, 1 - booting, 2 - Update, 3 "
+  sif::info << "PlocSupervisorHandler::handleBootStatusReport: SoC State (0 - off, 1 - booting, 2 "
+               "- Update, 3 "
                "- operating, 4 - Shutdown, 5 - Reset): "
             << static_cast<unsigned int>(bootStatusReport.socState.value) << std::endl;
   sif::info << "PlocSupervisorHandler::handleBootStatusReport: Power Cycles: "

linux/devices/startracker/CMakeLists.txt

@@ -1,7 +1,4 @@
-target_sources(${OBSW_NAME} PRIVATE
-    StarTrackerHandler.cpp
-    StarTrackerJsonCommands.cpp
-    ArcsecDatalinkLayer.cpp
-    ArcsecJsonParamBase.cpp
-    StrHelper.cpp
-)
+target_sources(
+  ${OBSW_NAME}
+  PRIVATE StarTrackerHandler.cpp StarTrackerJsonCommands.cpp
+          ArcsecDatalinkLayer.cpp ArcsecJsonParamBase.cpp StrHelper.cpp)

linux/fsfwconfig/CMakeLists.txt

@@ -1,28 +1,16 @@
-target_sources(${OBSW_NAME} PRIVATE
-	ipc/MissionMessageTypes.cpp
-	pollingsequence/pollingSequenceFactory.cpp
-)
+target_sources(${OBSW_NAME} PRIVATE ipc/MissionMessageTypes.cpp
+                                    pollingsequence/pollingSequenceFactory.cpp)
 
-target_include_directories(${OBSW_NAME} PUBLIC
-	${CMAKE_CURRENT_SOURCE_DIR}
-)
+target_include_directories(${OBSW_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 # If a special translation file for object IDs exists, compile it.
 if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/objects/translateObjects.cpp")
-    target_sources(${OBSW_NAME} PRIVATE
-        objects/translateObjects.cpp
-    )
-    target_sources(${UNITTEST_NAME} PRIVATE
-        objects/translateObjects.cpp
-    )
+  target_sources(${OBSW_NAME} PRIVATE objects/translateObjects.cpp)
+  target_sources(${UNITTEST_NAME} PRIVATE objects/translateObjects.cpp)
 endif()
 
 # If a special translation file for events exists, compile it.
 if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/objects/translateObjects.cpp")
-    target_sources(${OBSW_NAME} PRIVATE
-        events/translateEvents.cpp
-    )
-    target_sources(${UNITTEST_NAME} PRIVATE
-        events/translateEvents.cpp
-    )
+  target_sources(${OBSW_NAME} PRIVATE events/translateEvents.cpp)
+  target_sources(${UNITTEST_NAME} PRIVATE events/translateEvents.cpp)
 endif()

linux/obc/CMakeLists.txt

@@ -1,10 +1,3 @@
-target_sources(${OBSW_NAME} PUBLIC
-	PapbVcInterface.cpp
-	Ptme.cpp
-	PdecHandler.cpp
-	PdecConfig.cpp
-	PtmeConfig.cpp
-	AxiPtmeConfig.cpp
-)
-
-
+target_sources(
+  ${OBSW_NAME} PUBLIC PapbVcInterface.cpp Ptme.cpp PdecHandler.cpp
+                      PdecConfig.cpp PtmeConfig.cpp AxiPtmeConfig.cpp)

linux/utility/CMakeLists.txt

@@ -1,7 +1 @@
-target_sources(${OBSW_NAME} PUBLIC
-    utility.cpp
-)
-
-
-
-
+target_sources(${OBSW_NAME} PUBLIC utility.cpp)