re-apply updated auto-formatter

src/CMakeLists.txt

@@ -1,9 +1,6 @@
-target_include_directories(${LIB_FSFW_NAME} PRIVATE
+target_include_directories(${LIB_FSFW_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
-    ${CMAKE_CURRENT_SOURCE_DIR}
-)
 
-target_include_directories(${LIB_FSFW_NAME} INTERFACE
+target_include_directories(${LIB_FSFW_NAME}
-    ${CMAKE_CURRENT_SOURCE_DIR}
+                           INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
-)
 
 add_subdirectory(fsfw)

src/fsfw/CMakeLists.txt

@@ -1,6 +1,4 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
+target_sources(${LIB_FSFW_NAME} PRIVATE version.cpp)
-    version.cpp
-)
 
 # Core
 
@@ -37,7 +35,7 @@ add_subdirectory(tmtcservices)
 # Optional
 
 if(FSFW_ADD_MONITORING)
-add_subdirectory(monitoring)
+  add_subdirectory(monitoring)
 endif()
 if(FSFW_ADD_PUS)
   add_subdirectory(pus)

src/fsfw/action/CMakeLists.txt

@@ -1,7 +1,3 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(
-    PRIVATE 
+  ${LIB_FSFW_NAME} PRIVATE ActionHelper.cpp ActionMessage.cpp
-        ActionHelper.cpp
+                           CommandActionHelper.cpp SimpleActionHelper.cpp)
-        ActionMessage.cpp
-        CommandActionHelper.cpp
-        SimpleActionHelper.cpp
-)

src/fsfw/cfdp/CMakeLists.txt

@@ -1,7 +1,4 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
+target_sources(${LIB_FSFW_NAME} PRIVATE CFDPHandler.cpp CFDPMessage.cpp)
-    CFDPHandler.cpp
-    CFDPMessage.cpp
-)
 
 add_subdirectory(pdu)
 add_subdirectory(tlv)

src/fsfw/cfdp/pdu/CMakeLists.txt

@@ -1,11 +1,11 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
+target_sources(
-    PduConfig.cpp
+  ${LIB_FSFW_NAME}
+  PRIVATE PduConfig.cpp
           VarLenField.cpp
           HeaderSerializer.cpp
           HeaderDeserializer.cpp
           FileDirectiveDeserializer.cpp
           FileDirectiveSerializer.cpp
- 
           AckInfo.cpp
           AckPduSerializer.cpp
           AckPduDeserializer.cpp
@@ -25,8 +25,6 @@ target_sources(${LIB_FSFW_NAME} PRIVATE
           KeepAlivePduDeserializer.cpp
           PromptPduSerializer.cpp
           PromptPduDeserializer.cpp
-
           FileDataSerializer.cpp
           FileDataDeserializer.cpp
-    FileDataInfo.cpp
+          FileDataInfo.cpp)
-)

src/fsfw/cfdp/tlv/CMakeLists.txt

@@ -1,10 +1,10 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
+target_sources(
-    EntityIdTlv.cpp
+  ${LIB_FSFW_NAME}
+  PRIVATE EntityIdTlv.cpp
           FilestoreRequestTlv.cpp
           FilestoreResponseTlv.cpp
           Lv.cpp
           Tlv.cpp
           FlowLabelTlv.cpp
           MessageToUserTlv.cpp
-    FaultHandlerOverrideTlv.cpp
+          FaultHandlerOverrideTlv.cpp)
-)

src/fsfw/container/CMakeLists.txt

@@ -1,5 +1,2 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(${LIB_FSFW_NAME} PRIVATE SharedRingBuffer.cpp
-    PRIVATE 
+                                        SimpleRingBuffer.cpp)
-        SharedRingBuffer.cpp
-        SimpleRingBuffer.cpp
-)

src/fsfw/controller/CMakeLists.txt

@@ -1,4 +1,2 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE 
+target_sources(${LIB_FSFW_NAME} PRIVATE ControllerBase.cpp
-    ControllerBase.cpp
+                                        ExtendedControllerBase.cpp)
-    ExtendedControllerBase.cpp
-)

src/fsfw/coordinates/CMakeLists.txt

@@ -1,5 +1,2 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(${LIB_FSFW_NAME} PRIVATE CoordinateTransformations.cpp
-	PRIVATE 
+                                        Sgp4Propagator.cpp)
-		CoordinateTransformations.cpp
-		Sgp4Propagator.cpp
-)

src/fsfw/datalinklayer/CMakeLists.txt

@@ -1,6 +1,6 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(
-	PRIVATE 
+  ${LIB_FSFW_NAME}
-		Clcw.cpp
+  PRIVATE Clcw.cpp
           DataLinkLayer.cpp
           Farm1StateLockout.cpp
           Farm1StateOpen.cpp
@@ -8,5 +8,4 @@ target_sources(${LIB_FSFW_NAME}
           MapPacketExtraction.cpp
           TcTransferFrame.cpp
           TcTransferFrameLocal.cpp
-		VirtualChannelReception.cpp
+          VirtualChannelReception.cpp)
-)

src/fsfw/datapool/CMakeLists.txt

@@ -1,4 +1 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
+target_sources(${LIB_FSFW_NAME} PRIVATE PoolDataSetBase.cpp PoolEntry.cpp)
-	PoolDataSetBase.cpp
-	PoolEntry.cpp
-)

src/fsfw/datapoollocal/CMakeLists.txt

@@ -1,10 +1,6 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(
-	PRIVATE 
+  ${LIB_FSFW_NAME}
-		LocalDataPoolManager.cpp
+  PRIVATE LocalDataPoolManager.cpp LocalDataSet.cpp LocalPoolDataSetBase.cpp
-		LocalDataSet.cpp
+          LocalPoolObjectBase.cpp SharedLocalDataSet.cpp)
-		LocalPoolDataSetBase.cpp
-		LocalPoolObjectBase.cpp
-		SharedLocalDataSet.cpp
-)
 
 add_subdirectory(internal)

src/fsfw/datapoollocal/internal/CMakeLists.txt

@@ -1,5 +1,2 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(${LIB_FSFW_NAME} PRIVATE HasLocalDpIFUserAttorney.cpp
-	PRIVATE 
+                                        HasLocalDpIFManagerAttorney.cpp)
-		HasLocalDpIFUserAttorney.cpp
-		HasLocalDpIFManagerAttorney.cpp
-)

src/fsfw/devicehandlers/CMakeLists.txt

@@ -1,11 +1,10 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(
-	PRIVATE 
+  ${LIB_FSFW_NAME}
-		AssemblyBase.cpp
+  PRIVATE AssemblyBase.cpp
           ChildHandlerBase.cpp
           ChildHandlerFDIR.cpp
           DeviceHandlerBase.cpp
           DeviceHandlerFailureIsolation.cpp
           DeviceHandlerMessage.cpp
           DeviceTmReportingWrapper.cpp
-		HealthDevice.cpp
+          HealthDevice.cpp)
-)

src/fsfw/events/CMakeLists.txt

@@ -1,6 +1,3 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE 
+target_sources(${LIB_FSFW_NAME} PRIVATE EventManager.cpp EventMessage.cpp)
-    EventManager.cpp
-    EventMessage.cpp
-)
 
 add_subdirectory(eventmatching)

src/fsfw/events/eventmatching/CMakeLists.txt

@@ -1,7 +1,3 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(
-	PRIVATE 
+  ${LIB_FSFW_NAME} PRIVATE EventIdRangeMatcher.cpp EventMatchTree.cpp
-		EventIdRangeMatcher.cpp
+                           ReporterRangeMatcher.cpp SeverityRangeMatcher.cpp)
-		EventMatchTree.cpp
-		ReporterRangeMatcher.cpp
-		SeverityRangeMatcher.cpp
-)

src/fsfw/fdir/CMakeLists.txt

@@ -1,6 +1,3 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(
-	PRIVATE 
+  ${LIB_FSFW_NAME} PRIVATE EventCorrelation.cpp FailureIsolationBase.cpp
-		EventCorrelation.cpp
+                           FaultCounter.cpp)
-		FailureIsolationBase.cpp
-		FaultCounter.cpp
-)

src/fsfw/globalfunctions/CMakeLists.txt

@@ -1,13 +1,12 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(
-	PRIVATE 
+  ${LIB_FSFW_NAME}
-		arrayprinter.cpp
+  PRIVATE arrayprinter.cpp
           AsciiConverter.cpp
           CRC.cpp
           DleEncoder.cpp
           PeriodicOperationDivider.cpp
           timevalOperations.cpp
           Type.cpp
-		bitutility.cpp
+          bitutility.cpp)
-)
 
 add_subdirectory(math)

src/fsfw/globalfunctions/math/CMakeLists.txt

@@ -1,4 +1 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(${LIB_FSFW_NAME} PRIVATE QuaternionOperations.cpp)
-	PRIVATE 
-		QuaternionOperations.cpp
-)

src/fsfw/health/CMakeLists.txt

@@ -1,6 +1,2 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(${LIB_FSFW_NAME} PRIVATE HealthHelper.cpp HealthMessage.cpp
-	PRIVATE 
+                                        HealthTable.cpp)
-		HealthHelper.cpp
-		HealthMessage.cpp
-		HealthTable.cpp	
-)

src/fsfw/housekeeping/CMakeLists.txt

@@ -1,5 +1,2 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(${LIB_FSFW_NAME} PRIVATE HousekeepingMessage.cpp
-	PRIVATE 
+                                        PeriodicHousekeepingHelper.cpp)
-		HousekeepingMessage.cpp
-		PeriodicHousekeepingHelper.cpp
-)

src/fsfw/internalerror/CMakeLists.txt

@@ -1,4 +1 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(${LIB_FSFW_NAME} PRIVATE InternalErrorReporter.cpp)
-	PRIVATE 
-		InternalErrorReporter.cpp
-)

src/fsfw/ipc/CMakeLists.txt

@@ -1,6 +1,3 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
+target_sources(
-    CommandMessage.cpp
+  ${LIB_FSFW_NAME} PRIVATE CommandMessage.cpp CommandMessageCleaner.cpp
-    CommandMessageCleaner.cpp
+                           MessageQueueMessage.cpp MessageQueueBase.cpp)
-    MessageQueueMessage.cpp
-    MessageQueueBase.cpp
-)

src/fsfw/memory/CMakeLists.txt

@@ -1,5 +1,2 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
+target_sources(${LIB_FSFW_NAME} PRIVATE MemoryHelper.cpp MemoryMessage.cpp
-    MemoryHelper.cpp
+                                        GenericFileSystemMessage.cpp)
-    MemoryMessage.cpp
-    GenericFileSystemMessage.cpp
-)

src/fsfw/modes/CMakeLists.txt

@@ -1,5 +1 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(${LIB_FSFW_NAME} PRIVATE ModeHelper.cpp ModeMessage.cpp)
-	PRIVATE 
-		ModeHelper.cpp
-		ModeMessage.cpp
-)

src/fsfw/monitoring/CMakeLists.txt

@@ -1,5 +1,2 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(${LIB_FSFW_NAME} PRIVATE LimitViolationReporter.cpp
-	PRIVATE 
+                                        MonitoringMessage.cpp)
-		LimitViolationReporter.cpp
-		MonitoringMessage.cpp
-)

src/fsfw/objectmanager/CMakeLists.txt

@@ -1,5 +1 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(${LIB_FSFW_NAME} PRIVATE ObjectManager.cpp SystemObject.cpp)
-	PRIVATE 
-		ObjectManager.cpp
-		SystemObject.cpp
-)

src/fsfw/osal/CMakeLists.txt

@@ -7,25 +7,23 @@ elseif(FSFW_OSAL MATCHES "linux")
   add_subdirectory(linux)
 elseif(FSFW_OSAL MATCHES "host")
   add_subdirectory(host)
-    if (WIN32)
+  if(WIN32)
     add_subdirectory(windows)
   elseif(UNIX)
     # We still need to pull in some Linux specific sources
-        target_sources(${LIB_FSFW_NAME} PUBLIC
+    target_sources(${LIB_FSFW_NAME} PUBLIC linux/tcpipHelpers.cpp)
-            linux/tcpipHelpers.cpp
+  endif()
-        )
-    endif ()
 
 else()
 
   message(WARNING "The OS_FSFW variable was not set. Assuming host OS..")
   # Not set. Assumuing this is a host build, try to determine host OS
-    if (WIN32)
+  if(WIN32)
     add_subdirectory(host)
     add_subdirectory(windows)
-    elseif (UNIX)
+  elseif(UNIX)
     add_subdirectory(linux)
-    else ()
+  else()
     # MacOS or other OSes have not been tested yet / are not supported.
     message(FATAL_ERROR "The host OS could not be determined! Aborting.")
   endif()

src/fsfw/osal/common/CMakeLists.txt

@@ -1,17 +1,10 @@
 if(DEFINED WIN32 OR DEFINED UNIX)
-    target_sources(${LIB_FSFW_NAME} PRIVATE 
+  target_sources(
-        tcpipCommon.cpp
+    ${LIB_FSFW_NAME}
-        TcpIpBase.cpp
+    PRIVATE tcpipCommon.cpp TcpIpBase.cpp UdpTcPollingTask.cpp
-        UdpTcPollingTask.cpp
+            UdpTmTcBridge.cpp TcpTmTcServer.cpp TcpTmTcBridge.cpp)
-        UdpTmTcBridge.cpp
-        TcpTmTcServer.cpp
-        TcpTmTcBridge.cpp
-    )
 endif()
 
 if(WIN32)
-    target_link_libraries(${LIB_FSFW_NAME} PRIVATE
+  target_link_libraries(${LIB_FSFW_NAME} PRIVATE wsock32 ws2_32)
-        wsock32 
-        ws2_32
-    )
 endif()

src/fsfw/osal/freertos/CMakeLists.txt

@@ -1,6 +1,6 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(
-	PRIVATE 
+  ${LIB_FSFW_NAME}
-		Clock.cpp
+  PRIVATE Clock.cpp
           FixedTimeslotTask.cpp
           BinarySemaphore.cpp
           BinSemaphUsingTask.cpp
@@ -15,18 +15,16 @@ target_sources(${LIB_FSFW_NAME}
           TaskFactory.cpp
           Timekeeper.cpp
           TaskManagement.cpp
-		QueueMapManager.cpp
+          QueueMapManager.cpp)
-)
 
 # FreeRTOS is required to link the FSFW now. It is recommended to compile
 # FreeRTOS as a static library and set LIB_OS_NAME to the target name of the
 # library.
 if(NOT LIB_OS_NAME)
-	message(STATUS
+  message(
+    STATUS
       "LIB_OS_NAME is empty. Make sure to include the FreeRTOS header path properly."
   )
 else()
-    target_link_libraries(${LIB_FSFW_NAME} PRIVATE
+  target_link_libraries(${LIB_FSFW_NAME} PRIVATE ${LIB_OS_NAME})
-        ${LIB_OS_NAME}
-    )
 endif()

src/fsfw/osal/host/CMakeLists.txt

@@ -1,5 +1,6 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
+target_sources(
-  Clock.cpp
+  ${LIB_FSFW_NAME}
+  PRIVATE Clock.cpp
           FixedTimeslotTask.cpp
           MessageQueue.cpp
           Mutex.cpp
@@ -9,19 +10,14 @@ target_sources(${LIB_FSFW_NAME} PRIVATE
           QueueMapManager.cpp
           SemaphoreFactory.cpp
           TaskFactory.cpp
-  taskHelpers.cpp
+          taskHelpers.cpp)
-)
 
 if(UNIX)
   find_package(Threads REQUIRED)
 
-  target_link_libraries(${LIB_FSFW_NAME} PRIVATE
+  target_link_libraries(${LIB_FSFW_NAME} PRIVATE ${CMAKE_THREAD_LIBS_INIT})
-    ${CMAKE_THREAD_LIBS_INIT}
-  )
   if(NOT APPLE)
-    target_link_libraries(${LIB_FSFW_NAME} PRIVATE
+    target_link_libraries(${LIB_FSFW_NAME} PRIVATE rt)
-      rt
-      )
   endif()
 
 endif()

src/fsfw/osal/linux/CMakeLists.txt

@@ -1,5 +1,6 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
+target_sources(
-  Clock.cpp
+  ${LIB_FSFW_NAME}
+  PRIVATE Clock.cpp
           BinarySemaphore.cpp
           CountingSemaphore.cpp
           FixedTimeslotTask.cpp
@@ -13,17 +14,12 @@ target_sources(${LIB_FSFW_NAME} PRIVATE
           SemaphoreFactory.cpp
           TaskFactory.cpp
           tcpipHelpers.cpp
-  unixUtility.cpp
+          unixUtility.cpp)
-  )
 
 find_package(Threads REQUIRED)
 
-target_link_libraries(${LIB_FSFW_NAME} PUBLIC
+target_link_libraries(${LIB_FSFW_NAME} PUBLIC ${CMAKE_THREAD_LIBS_INIT})
-  ${CMAKE_THREAD_LIBS_INIT}
-  )
 
 if(NOT APPLE)
-  target_link_libraries(${LIB_FSFW_NAME} PUBLIC
+  target_link_libraries(${LIB_FSFW_NAME} PUBLIC rt)
-    rt
-  )
 endif()

src/fsfw/osal/rtems/CMakeLists.txt

@@ -1,6 +1,6 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(
-	PRIVATE 
+  ${LIB_FSFW_NAME}
-		Clock.cpp
+  PRIVATE Clock.cpp
           CpuUsage.cpp
           InitTask.cpp
           InternalErrorCodes.cpp
@@ -14,7 +14,4 @@ target_sources(${LIB_FSFW_NAME}
           RTEMSTaskBase.cpp
           TaskFactory.cpp
           BinarySemaphore.cpp
-		SemaphoreFactory.cpp
+          SemaphoreFactory.cpp)
-)
-
-

src/fsfw/osal/windows/CMakeLists.txt

@@ -1,4 +1 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE 
+target_sources(${LIB_FSFW_NAME} PRIVATE tcpipHelpers.cpp winTaskHelpers.cpp)
-    tcpipHelpers.cpp
-    winTaskHelpers.cpp
-)

src/fsfw/parameters/CMakeLists.txt

@@ -1,6 +1,3 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(
-	PRIVATE 
+  ${LIB_FSFW_NAME} PRIVATE ParameterHelper.cpp ParameterMessage.cpp
-		ParameterHelper.cpp
+                           ParameterWrapper.cpp)
-		ParameterMessage.cpp
-		ParameterWrapper.cpp
-)

src/fsfw/power/CMakeLists.txt

@@ -1,8 +1,4 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
+target_sources(
-    Fuse.cpp
+  ${LIB_FSFW_NAME}
-    PowerComponent.cpp
+  PRIVATE Fuse.cpp PowerComponent.cpp PowerSensor.cpp PowerSwitcher.cpp
-    PowerSensor.cpp
+          DummyPowerSwitcher.cpp PowerSwitcherComponent.cpp)
-    PowerSwitcher.cpp
-    DummyPowerSwitcher.cpp
-    PowerSwitcherComponent.cpp
-)

src/fsfw/power/PowerSwitcherComponent.cpp

@@ -3,8 +3,11 @@
 #include <fsfw/ipc/QueueFactory.h>
 #include <fsfw/power/PowerSwitchIF.h>
 
-PowerSwitcherComponent::PowerSwitcherComponent(object_id_t objectId, PowerSwitchIF* pwrSwitcher, power::Switch_t pwrSwitch)
+PowerSwitcherComponent::PowerSwitcherComponent(object_id_t objectId, PowerSwitchIF *pwrSwitcher,
-  : SystemObject(objectId), switcher(pwrSwitcher, pwrSwitch), modeHelper(this),
+                                               power::Switch_t pwrSwitch)
+    : SystemObject(objectId),
+      switcher(pwrSwitcher, pwrSwitch),
+      modeHelper(this),
       healthHelper(this, objectId) {
   queue = QueueFactory::instance()->createMessageQueue();
 }
@@ -25,12 +28,12 @@ ReturnValue_t PowerSwitcherComponent::performOperation(uint8_t opCode) {
       continue;
     }
   }
-  if(switcher.active()) {
+  if (switcher.active()) {
     switcher.doStateMachine();
     auto currState = switcher.getState();
     if (currState == PowerSwitcher::SWITCH_IS_OFF) {
       setMode(MODE_OFF, 0);
-    } else if(currState == PowerSwitcher::SWITCH_IS_ON) {
+    } else if (currState == PowerSwitcher::SWITCH_IS_ON) {
       setMode(MODE_ON, 0);
     }
   }
@@ -39,19 +42,17 @@ ReturnValue_t PowerSwitcherComponent::performOperation(uint8_t opCode) {
 
 ReturnValue_t PowerSwitcherComponent::initialize() {
   ReturnValue_t result = modeHelper.initialize();
-  if(result != HasReturnvaluesIF::RETURN_OK) {
+  if (result != HasReturnvaluesIF::RETURN_OK) {
     return result;
   }
   result = healthHelper.initialize();
-  if(result != HasReturnvaluesIF::RETURN_OK) {
+  if (result != HasReturnvaluesIF::RETURN_OK) {
     return result;
   }
   return SystemObject::initialize();
 }
 
-MessageQueueId_t PowerSwitcherComponent::getCommandQueue() const {
+MessageQueueId_t PowerSwitcherComponent::getCommandQueue() const { return queue->getId(); }
-  return queue->getId();
-}
 
 void PowerSwitcherComponent::getMode(Mode_t *mode, Submode_t *submode) {
   *mode = this->mode;
@@ -66,23 +67,23 @@ ReturnValue_t PowerSwitcherComponent::setHealth(HealthState health) {
 ReturnValue_t PowerSwitcherComponent::checkModeCommand(Mode_t mode, Submode_t submode,
                                                        uint32_t *msToReachTheMode) {
   *msToReachTheMode = 5000;
-  if(mode != MODE_ON and mode != MODE_OFF) {
+  if (mode != MODE_ON and mode != MODE_OFF) {
     return TRANS_NOT_ALLOWED;
   }
   return RETURN_OK;
 }
 
 void PowerSwitcherComponent::startTransition(Mode_t mode, Submode_t submode) {
-  if(mode == MODE_OFF) {
+  if (mode == MODE_OFF) {
     switcher.turnOff(true);
     switcher.doStateMachine();
-    if(switcher.getState() == PowerSwitcher::SWITCH_IS_OFF) {
+    if (switcher.getState() == PowerSwitcher::SWITCH_IS_OFF) {
       setMode(MODE_OFF, 0);
     }
   } else if (mode == MODE_ON) {
     switcher.turnOn(true);
     switcher.doStateMachine();
-    if(switcher.getState() == PowerSwitcher::SWITCH_IS_ON) {
+    if (switcher.getState() == PowerSwitcher::SWITCH_IS_ON) {
       setMode(MODE_ON, 0);
     }
   }
@@ -103,6 +104,4 @@ void PowerSwitcherComponent::setMode(Mode_t newMode, Submode_t newSubmode) {
   announceMode(false);
 }
 
-HasHealthIF::HealthState PowerSwitcherComponent::getHealth() {
+HasHealthIF::HealthState PowerSwitcherComponent::getHealth() { return healthHelper.getHealth(); }
-  return healthHelper.getHealth();
-}

src/fsfw/power/PowerSwitcherComponent.h

@@ -6,8 +6,8 @@
 #include <fsfw/modes/HasModesIF.h>
 #include <fsfw/modes/ModeHelper.h>
 #include <fsfw/objectmanager/SystemObject.h>
-#include <fsfw/power/definitions.h>
 #include <fsfw/power/PowerSwitcher.h>
+#include <fsfw/power/definitions.h>
 #include <fsfw/tasks/ExecutableObjectIF.h>
 
 class PowerSwitchIF;
@@ -22,19 +22,17 @@ class PowerSwitchIF;
  * Commanding this component to MODE_OFF will cause the switcher to turn the switch off while
  * commanding in to MODE_ON will cause the switcher to turn the switch on.
  */
-class PowerSwitcherComponent:
+class PowerSwitcherComponent : public SystemObject,
-    public SystemObject,
                                public HasReturnvaluesIF,
                                public ExecutableObjectIF,
                                public HasModesIF,
                                public HasHealthIF {
-public:
+ public:
-  PowerSwitcherComponent(object_id_t objectId, PowerSwitchIF* pwrSwitcher,
+  PowerSwitcherComponent(object_id_t objectId, PowerSwitchIF *pwrSwitcher,
                          power::Switch_t pwrSwitch);
 
-private:
+ private:
-
+  MessageQueueIF *queue = nullptr;
-  MessageQueueIF* queue = nullptr;
   PowerSwitcher switcher;
 
   Mode_t mode = MODE_OFF;

src/fsfw/pus/CMakeLists.txt

@@ -1,5 +1,6 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE 
+target_sources(
-    Service1TelecommandVerification.cpp
+  ${LIB_FSFW_NAME}
+  PRIVATE Service1TelecommandVerification.cpp
           Service2DeviceAccess.cpp
           Service3Housekeeping.cpp
           Service5EventReporting.cpp
@@ -8,5 +9,4 @@ target_sources(${LIB_FSFW_NAME} PRIVATE
           Service17Test.cpp
           Service20ParameterManagement.cpp
           CService200ModeCommanding.cpp
-    CService201HealthCommanding.cpp
+          CService201HealthCommanding.cpp)
-)

src/fsfw/rmap/CMakeLists.txt

@@ -1,7 +1,2 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(${LIB_FSFW_NAME} PRIVATE RMAP.cpp RMAPCookie.cpp
-	PRIVATE 
+                                        RmapDeviceCommunicationIF.cpp)
-		RMAP.cpp
-		RMAPCookie.cpp
-		RmapDeviceCommunicationIF.cpp
-)
-

src/fsfw/serialize/CMakeLists.txt

@@ -1,4 +1 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(${LIB_FSFW_NAME} PRIVATE SerialBufferAdapter.cpp)
-	PRIVATE 
-		SerialBufferAdapter.cpp
-)

src/fsfw/serviceinterface/CMakeLists.txt

@@ -1,5 +1,4 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE 
+target_sources(
-	ServiceInterfaceStream.cpp
+  ${LIB_FSFW_NAME}
-	ServiceInterfaceBuffer.cpp
+  PRIVATE ServiceInterfaceStream.cpp ServiceInterfaceBuffer.cpp
-	ServiceInterfacePrinter.cpp
+          ServiceInterfacePrinter.cpp)
-)

src/fsfw/storagemanager/CMakeLists.txt

@@ -1,7 +1,3 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(
-	PRIVATE 
+  ${LIB_FSFW_NAME} PRIVATE ConstStorageAccessor.cpp StorageAccessor.cpp
-		ConstStorageAccessor.cpp
+                           LocalPool.cpp PoolManager.cpp)
-		StorageAccessor.cpp
-		LocalPool.cpp
-		PoolManager.cpp
-)

src/fsfw/subsystem/CMakeLists.txt

@@ -1,7 +1,3 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(${LIB_FSFW_NAME} PRIVATE Subsystem.cpp SubsystemBase.cpp)
-	PRIVATE 
-		Subsystem.cpp
-		SubsystemBase.cpp
-)
 
 add_subdirectory(modes)

src/fsfw/subsystem/modes/CMakeLists.txt

@@ -1,5 +1 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(${LIB_FSFW_NAME} PRIVATE ModeSequenceMessage.cpp ModeStore.cpp)
-	PRIVATE 
-		ModeSequenceMessage.cpp
-		ModeStore.cpp
-)

src/fsfw/tasks/CMakeLists.txt

@@ -1,5 +1,2 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(${LIB_FSFW_NAME} PRIVATE FixedSequenceSlot.cpp
-	PRIVATE 
+                                        FixedSlotSequence.cpp)
-		FixedSequenceSlot.cpp
-		FixedSlotSequence.cpp
-)

src/fsfw/tcdistribution/CMakeLists.txt

@@ -1,9 +1,4 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE 
+target_sources(
-    CCSDSDistributor.cpp
+  ${LIB_FSFW_NAME}
-    PUSDistributor.cpp
+  PRIVATE CCSDSDistributor.cpp PUSDistributor.cpp TcDistributor.cpp
-    TcDistributor.cpp
+          TcPacketCheckPUS.cpp TcPacketCheckCFDP.cpp CFDPDistributor.cpp)
-    TcPacketCheckPUS.cpp
-    TcPacketCheckCFDP.cpp
-    CFDPDistributor.cpp
-)
-

src/fsfw/thermal/CMakeLists.txt

@@ -1,10 +1,9 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(
-	PRIVATE 
+  ${LIB_FSFW_NAME}
-		AbstractTemperatureSensor.cpp
+  PRIVATE AbstractTemperatureSensor.cpp
           Heater.cpp
           RedundantHeater.cpp
           ThermalComponentCore.cpp
           ThermalComponent.cpp
           ThermalModule.cpp
-		ThermalMonitorReporter.cpp
+          ThermalMonitorReporter.cpp)
-)

src/fsfw/timemanager/CMakeLists.txt

@@ -1,8 +1,3 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
+target_sources(
-    CCSDSTime.cpp
+  ${LIB_FSFW_NAME} PRIVATE CCSDSTime.cpp Countdown.cpp Stopwatch.cpp
-    Countdown.cpp
+                           TimeMessage.cpp TimeStamper.cpp ClockCommon.cpp)
-    Stopwatch.cpp
-    TimeMessage.cpp
-    TimeStamper.cpp
-    ClockCommon.cpp
-)

src/fsfw/tmstorage/CMakeLists.txt

@@ -1,4 +1 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(${LIB_FSFW_NAME} PRIVATE TmStoreMessage.cpp)
-	PRIVATE 
-		TmStoreMessage.cpp
-)

src/fsfw/tmtcpacket/CMakeLists.txt

@@ -1,7 +1,4 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE 
+target_sources(${LIB_FSFW_NAME} PRIVATE SpacePacket.cpp SpacePacketBase.cpp)
-    SpacePacket.cpp
-    SpacePacketBase.cpp
-)
 
 add_subdirectory(cfdp)
 add_subdirectory(packetmatcher)

src/fsfw/tmtcpacket/cfdp/CMakeLists.txt

@@ -1,4 +1 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE    
+target_sources(${LIB_FSFW_NAME} PRIVATE CFDPPacket.cpp CFDPPacketStored.cpp)
-    CFDPPacket.cpp
-    CFDPPacketStored.cpp
-)

src/fsfw/tmtcpacket/packetmatcher/CMakeLists.txt

@@ -1,4 +1 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(${LIB_FSFW_NAME} PRIVATE PacketMatchTree.cpp)
-	PRIVATE 
-		PacketMatchTree.cpp
-)

src/fsfw/tmtcpacket/pus/tc/CMakeLists.txt

@@ -1,6 +1,3 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE    
+target_sources(
-    TcPacketPusBase.cpp
+  ${LIB_FSFW_NAME} PRIVATE TcPacketPusBase.cpp TcPacketPus.cpp
-    TcPacketPus.cpp
+                           TcPacketStoredBase.cpp TcPacketStoredPus.cpp)
-    TcPacketStoredBase.cpp
-    TcPacketStoredPus.cpp
-)

src/fsfw/tmtcpacket/pus/tm/CMakeLists.txt

@@ -1,9 +1,9 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
+target_sources(
-    TmPacketStoredPusA.cpp
+  ${LIB_FSFW_NAME}
+  PRIVATE TmPacketStoredPusA.cpp
           TmPacketStoredPusC.cpp
           TmPacketPusA.cpp
           TmPacketPusC.cpp
           TmPacketStoredBase.cpp
           TmPacketBase.cpp
-    TmPacketMinimal.cpp
+          TmPacketMinimal.cpp)
-)

src/fsfw/tmtcservices/CMakeLists.txt

@@ -1,10 +1,9 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(
-	PRIVATE 
+  ${LIB_FSFW_NAME}
-		CommandingServiceBase.cpp
+  PRIVATE CommandingServiceBase.cpp
           PusServiceBase.cpp
           PusVerificationReport.cpp
           TmTcBridge.cpp
           TmTcMessage.cpp
           VerificationReporter.cpp
-		SpacePacketParser.cpp
+          SpacePacketParser.cpp)
-)