Merge pull request 'PUS TC11 bugfix and upstream updates' (#88) from mueller/tc-11-tweaks-eive into develop

Reviewed-on: #88

scripts/auto-formatter.sh

@@ -10,9 +10,10 @@ folder_list=(
 )
 
 cmake_fmt="cmake-format"
+file_selectors="-iname CMakeLists.txt"
 if command -v ${cmake_fmt} &> /dev/null; then
-  cmake_fmt_cmd="${cmake_fmt} -i CMakeLists.txt"
+  ${cmake_fmt} -i CMakeLists.txt
-  eval ${cmake_fmt_cmd}
+  find ./src ${file_selectors} | xargs ${cmake_fmt}  -i
 else
   echo "No ${cmake_fmt} tool found, not formatting CMake files"
 fi

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,22 +35,22 @@ add_subdirectory(tmtcservices)
 # Optional
 
 if(FSFW_ADD_MONITORING)
-add_subdirectory(monitoring)
+  add_subdirectory(monitoring)
 endif()
 if(FSFW_ADD_PUS)
-    add_subdirectory(pus)
+  add_subdirectory(pus)
 endif()
 if(FSFW_ADD_TMSTORAGE)
-    add_subdirectory(tmstorage)
+  add_subdirectory(tmstorage)
 endif()
 if(FSFW_ADD_COORDINATES)
-    add_subdirectory(coordinates)
+  add_subdirectory(coordinates)
 endif()
 if(FSFW_ADD_RMAP)
-    add_subdirectory(rmap)
+  add_subdirectory(rmap)
 endif()
 if(FSFW_ADD_DATALINKLAYER)
-    add_subdirectory(datalinklayer)
+  add_subdirectory(datalinklayer)
 endif()
 
 # OSAL

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,32 +1,30 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
+target_sources(
-    PduConfig.cpp
+  ${LIB_FSFW_NAME}
-    VarLenField.cpp
+  PRIVATE PduConfig.cpp
-    HeaderSerializer.cpp
+          VarLenField.cpp
-    HeaderDeserializer.cpp
+          HeaderSerializer.cpp
-    FileDirectiveDeserializer.cpp
+          HeaderDeserializer.cpp
-    FileDirectiveSerializer.cpp
+          FileDirectiveDeserializer.cpp
- 
+          FileDirectiveSerializer.cpp
-    AckInfo.cpp
+          AckInfo.cpp
-    AckPduSerializer.cpp
+          AckPduSerializer.cpp
-    AckPduDeserializer.cpp
+          AckPduDeserializer.cpp
-    EofInfo.cpp
+          EofInfo.cpp
-    EofPduSerializer.cpp
+          EofPduSerializer.cpp
-    EofPduDeserializer.cpp
+          EofPduDeserializer.cpp
-    NakInfo.cpp
+          NakInfo.cpp
-    NakPduSerializer.cpp
+          NakPduSerializer.cpp
-    NakPduDeserializer.cpp
+          NakPduDeserializer.cpp
-    FinishedInfo.cpp
+          FinishedInfo.cpp
-    FinishedPduSerializer.cpp
+          FinishedPduSerializer.cpp
-    FinishedPduDeserializer.cpp
+          FinishedPduDeserializer.cpp
-    MetadataInfo.cpp
+          MetadataInfo.cpp
-    MetadataPduSerializer.cpp
+          MetadataPduSerializer.cpp
-    MetadataPduDeserializer.cpp
+          MetadataPduDeserializer.cpp
-    KeepAlivePduSerializer.cpp
+          KeepAlivePduSerializer.cpp
-    KeepAlivePduDeserializer.cpp
+          KeepAlivePduDeserializer.cpp
-    PromptPduSerializer.cpp
+          PromptPduSerializer.cpp
-    PromptPduDeserializer.cpp
+          PromptPduDeserializer.cpp
-
+          FileDataSerializer.cpp
-    FileDataSerializer.cpp
+          FileDataDeserializer.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}
-    FilestoreRequestTlv.cpp
+  PRIVATE EntityIdTlv.cpp
-    FilestoreResponseTlv.cpp
+          FilestoreRequestTlv.cpp
-    Lv.cpp
+          FilestoreResponseTlv.cpp
-    Tlv.cpp
+          Lv.cpp
-    FlowLabelTlv.cpp
+          Tlv.cpp
-    MessageToUserTlv.cpp
+          FlowLabelTlv.cpp
-    FaultHandlerOverrideTlv.cpp
+          MessageToUserTlv.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,12 +1,11 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(
-	PRIVATE 
+  ${LIB_FSFW_NAME}
-		Clcw.cpp
+  PRIVATE Clcw.cpp
-		DataLinkLayer.cpp
+          DataLinkLayer.cpp
-		Farm1StateLockout.cpp
+          Farm1StateLockout.cpp
-		Farm1StateOpen.cpp
+          Farm1StateOpen.cpp
-		Farm1StateWait.cpp
+          Farm1StateWait.cpp
-		MapPacketExtraction.cpp
+          MapPacketExtraction.cpp
-		TcTransferFrame.cpp
+          TcTransferFrame.cpp
-		TcTransferFrameLocal.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)
+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
+          ChildHandlerBase.cpp
-		ChildHandlerFDIR.cpp
+          ChildHandlerFDIR.cpp
-		DeviceHandlerBase.cpp
+          DeviceHandlerBase.cpp
-		DeviceHandlerFailureIsolation.cpp
+          DeviceHandlerFailureIsolation.cpp
-		DeviceHandlerMessage.cpp
+          DeviceHandlerMessage.cpp
-		DeviceTmReportingWrapper.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} PRIVATE
+target_sources(
-    arrayprinter.cpp
+  ${LIB_FSFW_NAME}
-    AsciiConverter.cpp
+  PRIVATE arrayprinter.cpp
-    CRC.cpp
+          AsciiConverter.cpp
-    DleEncoder.cpp
+          CRC.cpp
-    DleParser.cpp
+          DleEncoder.cpp
-    PeriodicOperationDivider.cpp
+          PeriodicOperationDivider.cpp
-    timevalOperations.cpp
+          timevalOperations.cpp
-    Type.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/objectmanager/frameworkObjects.h

@@ -14,6 +14,7 @@ enum framework_objects : object_id_t {
   PUS_SERVICE_5_EVENT_REPORTING = 0x53000005,
   PUS_SERVICE_8_FUNCTION_MGMT = 0x53000008,
   PUS_SERVICE_9_TIME_MGMT = 0x53000009,
+  PUS_SERVICE_11_TC_SCHEDULER = 0x53000011,
   PUS_SERVICE_17_TEST = 0x53000017,
   PUS_SERVICE_20_PARAMETERS = 0x53000020,
   PUS_SERVICE_200_MODE_MGMT = 0x53000200,

src/fsfw/osal/CMakeLists.txt

@@ -1,35 +1,33 @@
 # Check the OS_FSFW variable
 if(FSFW_OSAL MATCHES "freertos")
-    add_subdirectory(freertos)
+  add_subdirectory(freertos)
 elseif(FSFW_OSAL MATCHES "rtems")
-    add_subdirectory(rtems)
+  add_subdirectory(rtems)
 elseif(FSFW_OSAL MATCHES "linux")
-    add_subdirectory(linux)
+  add_subdirectory(linux)
 elseif(FSFW_OSAL MATCHES "host")
-    add_subdirectory(host)
+  add_subdirectory(host)
-    if (WIN32)
+  if(WIN32)
-        add_subdirectory(windows)
+    add_subdirectory(windows)
-    elseif(UNIX)
+  elseif(UNIX)
-        # We still need to pull in some Linux specific sources
+    # 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..")
+  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
+  # Not set. Assumuing this is a host build, try to determine host OS
-    if (WIN32)
+  if(WIN32)
-        add_subdirectory(host)
+    add_subdirectory(host)
-        add_subdirectory(windows)
+    add_subdirectory(windows)
-    elseif (UNIX)
+  elseif(UNIX)
-        add_subdirectory(linux)
+    add_subdirectory(linux)
-    else ()
+  else()
-        # MacOS or other OSes have not been tested yet / are not supported.
+    # MacOS or other OSes have not been tested yet / are not supported.
-        message(FATAL_ERROR "The host OS could not be determined! Aborting.")
+    message(FATAL_ERROR "The host OS could not be determined! Aborting.")
-    endif()
+  endif()
 
 endif()
 
-add_subdirectory(common)
+add_subdirectory(common)

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 
+endif()
-        ws2_32
-    )
-endif()

src/fsfw/osal/freertos/CMakeLists.txt

@@ -1,32 +1,30 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(
-	PRIVATE 
+  ${LIB_FSFW_NAME}
-		Clock.cpp
+  PRIVATE Clock.cpp
-		FixedTimeslotTask.cpp
+          FixedTimeslotTask.cpp
-		BinarySemaphore.cpp
+          BinarySemaphore.cpp
-		BinSemaphUsingTask.cpp
+          BinSemaphUsingTask.cpp
-		CountingSemaphore.cpp
+          CountingSemaphore.cpp
-		CountingSemaphUsingTask.cpp
+          CountingSemaphUsingTask.cpp
-		MessageQueue.cpp
+          MessageQueue.cpp
-		Mutex.cpp
+          Mutex.cpp
-		MutexFactory.cpp
+          MutexFactory.cpp
-		PeriodicTask.cpp
+          PeriodicTask.cpp
-		QueueFactory.cpp
+          QueueFactory.cpp
-		SemaphoreFactory.cpp
+          SemaphoreFactory.cpp
-		TaskFactory.cpp
+          TaskFactory.cpp
-		Timekeeper.cpp
+          Timekeeper.cpp
-		TaskManagement.cpp
+          TaskManagement.cpp
-		QueueMapManager.cpp
+          QueueMapManager.cpp)
-)
 
-# FreeRTOS is required to link the FSFW now. It is recommended to compile 
+# 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 
+# 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(
-		"LIB_OS_NAME is empty. Make sure to include the FreeRTOS header path properly."
+    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,27 +1,23 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
+target_sources(
-  Clock.cpp
+  ${LIB_FSFW_NAME}
-  FixedTimeslotTask.cpp
+  PRIVATE Clock.cpp
-  MessageQueue.cpp
+          FixedTimeslotTask.cpp
-  Mutex.cpp
+          MessageQueue.cpp
-  MutexFactory.cpp
+          Mutex.cpp
-  PeriodicTask.cpp
+          MutexFactory.cpp
-  QueueFactory.cpp
+          PeriodicTask.cpp
-  QueueMapManager.cpp
+          QueueFactory.cpp
-  SemaphoreFactory.cpp
+          QueueMapManager.cpp
-  TaskFactory.cpp
+          SemaphoreFactory.cpp
-  taskHelpers.cpp
+          TaskFactory.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()
+endif()

src/fsfw/osal/linux/CMakeLists.txt

@@ -1,29 +1,25 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
+target_sources(
-  Clock.cpp
+  ${LIB_FSFW_NAME}
-  BinarySemaphore.cpp
+  PRIVATE Clock.cpp
-  CountingSemaphore.cpp
+          BinarySemaphore.cpp
-  FixedTimeslotTask.cpp
+          CountingSemaphore.cpp
-  InternalErrorCodes.cpp
+          FixedTimeslotTask.cpp
-  MessageQueue.cpp
+          InternalErrorCodes.cpp
-  Mutex.cpp
+          MessageQueue.cpp
-  MutexFactory.cpp
+          Mutex.cpp
-  PeriodicPosixTask.cpp
+          MutexFactory.cpp
-  PosixThread.cpp
+          PeriodicPosixTask.cpp
-  QueueFactory.cpp
+          PosixThread.cpp
-  SemaphoreFactory.cpp
+          QueueFactory.cpp
-  TaskFactory.cpp
+          SemaphoreFactory.cpp
-  tcpipHelpers.cpp
+          TaskFactory.cpp
-  unixUtility.cpp
+          tcpipHelpers.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,20 +1,17 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(
-	PRIVATE 
+  ${LIB_FSFW_NAME}
-		Clock.cpp
+  PRIVATE Clock.cpp
-		CpuUsage.cpp
+          CpuUsage.cpp
-		InitTask.cpp
+          InitTask.cpp
-		InternalErrorCodes.cpp
+          InternalErrorCodes.cpp
-		MessageQueue.cpp
+          MessageQueue.cpp
-		PeriodicTask.cpp
+          PeriodicTask.cpp
-		Mutex.cpp
+          Mutex.cpp
-		MutexFactory.cpp
+          MutexFactory.cpp
-		FixedTimeslotTask.cpp
+          FixedTimeslotTask.cpp
-		QueueFactory.cpp
+          QueueFactory.cpp
-		RtemsBasic.cpp
+          RtemsBasic.cpp
-		RTEMSTaskBase.cpp
+          RTEMSTaskBase.cpp
-		TaskFactory.cpp
+          TaskFactory.cpp
-		BinarySemaphore.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/pus/CMakeLists.txt

@@ -1,12 +1,12 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE 
+target_sources(
-    Service1TelecommandVerification.cpp
+  ${LIB_FSFW_NAME}
-    Service2DeviceAccess.cpp
+  PRIVATE Service1TelecommandVerification.cpp
-    Service3Housekeeping.cpp
+          Service2DeviceAccess.cpp
-    Service5EventReporting.cpp
+          Service3Housekeeping.cpp
-    Service8FunctionManagement.cpp
+          Service5EventReporting.cpp
-    Service9TimeManagement.cpp
+          Service8FunctionManagement.cpp
-    Service17Test.cpp
+          Service9TimeManagement.cpp
-    Service20ParameterManagement.cpp
+          Service17Test.cpp
-    CService200ModeCommanding.cpp
+          Service20ParameterManagement.cpp
-    CService201HealthCommanding.cpp
+          CService200ModeCommanding.cpp
-)
+          CService201HealthCommanding.cpp)

src/fsfw/pus/Service11TelecommandScheduling.h

@@ -45,19 +45,17 @@ class Service11TelecommandScheduling final : public PusServiceBase {
       HasReturnvaluesIF::makeReturnCode(CLASS_ID, 3);
 
   // The types of PUS-11 subservices
-  enum Subservice : uint8_t {
+  enum [[maybe_unused]] Subservice : uint8_t{ENABLE_SCHEDULING = 1,
-    ENABLE_SCHEDULING = 1,
+                                             DISABLE_SCHEDULING = 2,
-    DISABLE_SCHEDULING = 2,
+                                             RESET_SCHEDULING = 3,
-    RESET_SCHEDULING = 3,
+                                             INSERT_ACTIVITY = 4,
-    INSERT_ACTIVITY = 4,
+                                             DELETE_ACTIVITY = 5,
-    DELETE_ACTIVITY = 5,
+                                             FILTER_DELETE_ACTIVITY = 6,
-    FILTER_DELETE_ACTIVITY = 6,
+                                             TIMESHIFT_ACTIVITY = 7,
-    TIMESHIFT_ACTIVITY = 7,
+                                             FILTER_TIMESHIFT_ACTIVITY = 8,
-    FILTER_TIMESHIFT_ACTIVITY = 8,
+                                             DETAIL_REPORT = 9,
-    DETAIL_REPORT = 9,
+                                             TIMEBASE_SCHEDULE_DETAIL_REPORT = 10,
-    TIMEBASE_SCHEDULE_DETAIL_REPORT = 10,
+                                             TIMESHIFT_ALL_SCHEDULE_ACTIVITIES = 15};
-    TIMESHIFT_ALL_SCHEDULE_ACTIVITIES = 15
-  };
 
   // The types of time windows for TC[11,6] and TC[11,8], as defined in ECSS-E-ST-70-41C,
   // requirement 8.11.3c (p. 507)
@@ -73,7 +71,7 @@ class Service11TelecommandScheduling final : public PusServiceBase {
                                  uint16_t releaseTimeMarginSeconds = DEFAULT_RELEASE_TIME_MARGIN,
                                  bool debugMode = false);
 
-  ~Service11TelecommandScheduling();
+  ~Service11TelecommandScheduling() override;
 
   /** PusServiceBase overrides */
   ReturnValue_t handleRequest(uint8_t subservice) override;
@@ -82,8 +80,8 @@ class Service11TelecommandScheduling final : public PusServiceBase {
 
  private:
   struct TelecommandStruct {
-    uint64_t requestId;
+    uint64_t requestId{};
-    uint32_t seconds;
+    uint32_t seconds{};
     store_address_t storeAddr;  // uint16
   };
 
@@ -92,9 +90,6 @@ class Service11TelecommandScheduling final : public PusServiceBase {
   // minimum release time offset to insert into schedule
   const uint16_t RELEASE_TIME_MARGIN_SECONDS = 5;
 
-  // the maximum amount of stored TCs is defined here
-  static constexpr uint16_t MAX_STORED_TELECOMMANDS = 500;
-
   bool debugMode = false;
   StorageManagerIF* tcStore = nullptr;
   AcceptsTelecommandsIF* tcRecipient = nullptr;
@@ -139,17 +134,6 @@ class Service11TelecommandScheduling final : public PusServiceBase {
    */
   ReturnValue_t doFilterTimeshiftActivity(const uint8_t* data, size_t size);
 
-  /**
-   * @brief Deserializes a generic type from a payload buffer by using the FSFW
-   * SerializeAdapter Interface.
-   * @param output Output to be deserialized
-   * @param buf Payload buffer (application data)
-   * @param bufsize Remaining size of payload buffer (application data size)
-   * @return RETURN_OK if successful
-   */
-  template <typename T>
-  ReturnValue_t deserializeViaFsfwInterface(T& output, const uint8_t* buf, size_t bufsize);
-
   /**
    * @brief Extracts the Request ID from the Application Data of a TC by utilizing a ctor of the
    * class TcPacketPus.
@@ -177,7 +161,7 @@ class Service11TelecommandScheduling final : public PusServiceBase {
    * @param ssc Source Sequence Count
    * @return Request ID
    */
-  uint64_t buildRequestId(uint32_t sourceId, uint16_t apid, uint16_t ssc) const;
+  [[nodiscard]] uint64_t buildRequestId(uint32_t sourceId, uint16_t apid, uint16_t ssc) const;
 
   /**
    * @brief Gets the filter range for filter TCs from a data packet
@@ -194,7 +178,7 @@ class Service11TelecommandScheduling final : public PusServiceBase {
   /**
    * @brief Prints content of multimap. Use for simple debugging only.
    */
-  void debugPrintMultimapContent(void) const;
+  void debugPrintMultimapContent() const;
 };
 
 #include "Service11TelecommandScheduling.tpp"

src/fsfw/pus/Service11TelecommandScheduling.tpp

@@ -1,11 +1,12 @@
 #pragma once
 
-#include <fsfw/objectmanager/ObjectManager.h>
-#include <fsfw/serialize/SerializeAdapter.h>
-#include <fsfw/tmtcservices/AcceptsTelecommandsIF.h>
-
 #include <cstddef>
 
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/serialize/SerializeAdapter.h"
+#include "fsfw/serviceinterface.h"
+#include "fsfw/tmtcservices/AcceptsTelecommandsIF.h"
+
 static constexpr auto DEF_END = SerializeIF::Endianness::BIG;
 
 template <size_t MAX_NUM_TCS>
@@ -18,7 +19,7 @@ inline Service11TelecommandScheduling<MAX_NUM_TCS>::Service11TelecommandScheduli
       tcRecipient(tcRecipient) {}
 
 template <size_t MAX_NUM_TCS>
-inline Service11TelecommandScheduling<MAX_NUM_TCS>::~Service11TelecommandScheduling() {}
+inline Service11TelecommandScheduling<MAX_NUM_TCS>::~Service11TelecommandScheduling() = default;
 
 template <size_t MAX_NUM_TCS>
 inline ReturnValue_t Service11TelecommandScheduling<MAX_NUM_TCS>::handleRequest(
@@ -116,8 +117,6 @@ template <size_t MAX_NUM_TCS>
 inline ReturnValue_t Service11TelecommandScheduling<MAX_NUM_TCS>::doInsertActivity(
     const uint8_t *data, size_t size) {
   uint32_t timestamp = 0;
-  const uint8_t *initData = data;
-  size_t initSz = size;
   ReturnValue_t result = SerializeAdapter::deSerialize(&timestamp, &data, &size, DEF_END);
   if (result != RETURN_OK) {
     return result;
@@ -142,7 +141,7 @@ inline ReturnValue_t Service11TelecommandScheduling<MAX_NUM_TCS>::doInsertActivi
 
   // store currentPacket and receive the store address
   store_address_t addr{};
-  if (tcStore->addData(&addr, initData, initSz) != RETURN_OK ||
+  if (tcStore->addData(&addr, data, size) != RETURN_OK ||
       addr.raw == storeId::INVALID_STORE_ADDRESS) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
     sif::error << "Service11TelecommandScheduling::doInsertActivity: Adding data to TC Store failed"
@@ -404,7 +403,6 @@ inline ReturnValue_t Service11TelecommandScheduling<MAX_NUM_TCS>::doFilterTimesh
     // and then insert it again as new entry
     telecommandMap.insert(std::make_pair(tempKey, tempTc));
     shiftedItemsCount++;
-    continue;
   }
 
   if (debugMode) {
@@ -463,9 +461,9 @@ template <size_t MAX_NUM_TCS>
 inline uint64_t Service11TelecommandScheduling<MAX_NUM_TCS>::buildRequestId(uint32_t sourceId,
                                                                             uint16_t apid,
                                                                             uint16_t ssc) const {
-  uint64_t sourceId64 = static_cast<uint64_t>(sourceId);
+  auto sourceId64 = static_cast<uint64_t>(sourceId);
-  uint64_t apid64 = static_cast<uint64_t>(apid);
+  auto apid64 = static_cast<uint64_t>(apid);
-  uint64_t ssc64 = static_cast<uint64_t>(ssc);
+  auto ssc64 = static_cast<uint64_t>(ssc);
 
   return (sourceId64 << 32) | (apid64 << 16) | ssc64;
 }
@@ -483,7 +481,7 @@ inline ReturnValue_t Service11TelecommandScheduling<MAX_NUM_TCS>::getMapFilterFr
   if (typeRaw > 3) {
     return INVALID_TYPE_TIME_WINDOW;
   }
-  TypeOfTimeWindow type = static_cast<TypeOfTimeWindow>(typeRaw);
+  auto type = static_cast<TypeOfTimeWindow>(typeRaw);
 
   // we now have the type of delete activity - so now we set the range to delete,
   // according to the type of time window.
@@ -558,7 +556,10 @@ inline ReturnValue_t Service11TelecommandScheduling<MAX_NUM_TCS>::getMapFilterFr
 
   // additional security check, this should never be true
   if (itBegin->first > itEnd->first) {
+#if FSFW_CPP_OSTREAM_ENABLED == 1
+#else
     sif::printError("11::GetMapFilterFromData: itBegin > itEnd\n");
+#endif
     return RETURN_FAILED;
   }
 
@@ -580,19 +581,22 @@ inline ReturnValue_t Service11TelecommandScheduling<MAX_NUM_TCS>::handleInvalidD
 }
 
 template <size_t MAX_NUM_TCS>
-inline void Service11TelecommandScheduling<MAX_NUM_TCS>::debugPrintMultimapContent(void) const {
+inline void Service11TelecommandScheduling<MAX_NUM_TCS>::debugPrintMultimapContent() const {
+  for (const auto &dit : telecommandMap) {
 #if FSFW_DISABLE_PRINTOUT == 0
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-  sif::debug << "Service11TelecommandScheduling::debugPrintMultimapContent: Multimap Content"
+    sif::debug << "Service11TelecommandScheduling::debugPrintMultimapContent: Multimap Content"
-             << std::endl;
+               << std::endl;
-  sif::debug << "[" << dit->first << "]: Request ID: " << dit->second.requestId << " | "
+    sif::debug << "[" << dit.first << "]: Request ID: " << dit.second.requestId << " | "
-             << "Store Address: " << dit->second.storeAddr << std::endl;
+               << "Store Address: " << dit.second.storeAddr.raw << std::endl;
 #else
-  sif::printDebug("Service11TelecommandScheduling::debugPrintMultimapContent: Multimap Content\n");
+    sif::printDebug(
-  for (auto dit = telecommandMap.begin(); dit != telecommandMap.end(); ++dit) {
+        "Service11TelecommandScheduling::debugPrintMultimapContent: Multimap Content\n");
-    sif::printDebug("[%d]: Request ID: %d  | Store Address: %d\n", dit->first,
+    for (auto dit = telecommandMap.begin(); dit != telecommandMap.end(); ++dit) {
-                    dit->second.requestId, dit->second.storeAddr);
+      sif::printDebug("[%d]: Request ID: %d  | Store Address: %d\n", dit->first,
+                      dit->second.requestId, dit->second.storeAddr);
+    }
+#endif
+#endif
   }
-#endif
-#endif
 }

src/fsfw/pus/Service5EventReporting.cpp

@@ -85,7 +85,7 @@ ReturnValue_t Service5EventReporting::handleRequest(uint8_t subservice) {
 // In addition to the default PUSServiceBase initialization, this service needs
 // to be registered to the event manager to listen for events.
 ReturnValue_t Service5EventReporting::initialize() {
-  EventManagerIF* manager = ObjectManager::instance()->get<EventManagerIF>(objects::EVENT_MANAGER);
+  auto* manager = ObjectManager::instance()->get<EventManagerIF>(objects::EVENT_MANAGER);
   if (manager == nullptr) {
     return RETURN_FAILED;
   }

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)
+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/tcdistribution/PUSDistributor.cpp

@@ -15,7 +15,7 @@ PUSDistributor::PUSDistributor(uint16_t setApid, object_id_t setObjectId,
       tcStatus(RETURN_FAILED),
       packetSource(setPacketSource) {}
 
-PUSDistributor::~PUSDistributor() {}
+PUSDistributor::~PUSDistributor() = default;
 
 PUSDistributor::TcMqMapIter PUSDistributor::selectDestination() {
 #if FSFW_CPP_OSTREAM_ENABLED == 1 && PUS_DISTRIBUTOR_DEBUGGING == 1
@@ -23,7 +23,7 @@ PUSDistributor::TcMqMapIter PUSDistributor::selectDestination() {
     sif::debug << "PUSDistributor::handlePacket received: " << storeId.poolIndex << ", "
                << storeId.packetIndex << std::endl;
 #endif
-    TcMqMapIter queueMapIt = this->queueMap.end();
+    auto queueMapIt = this->queueMap.end();
     if (this->currentPacket == nullptr) {
       return queueMapIt;
     }
@@ -49,9 +49,7 @@ PUSDistributor::TcMqMapIter PUSDistributor::selectDestination() {
                      << " error" << std::endl;
 #else
         sif::printWarning(
-            "PUSDistributor::handlePacket: Packet format invalid, "
+            "PUSDistributor::handlePacket: Packet format invalid, %s error\n", keyword);
-            "%s error\n",
-            keyword);
 #endif
 #endif
       }
@@ -133,7 +131,7 @@ ReturnValue_t PUSDistributor::initialize() {
     return ObjectManagerIF::CHILD_INIT_FAILED;
   }
 
-  CCSDSDistributorIF* ccsdsDistributor =
+  auto* ccsdsDistributor =
       ObjectManager::instance()->get<CCSDSDistributorIF>(packetSource);
   if (ccsdsDistributor == nullptr) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1

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
+          Heater.cpp
-		RedundantHeater.cpp
+          RedundantHeater.cpp
-		ThermalComponentCore.cpp
+          ThermalComponentCore.cpp
-		ThermalComponent.cpp
+          ThermalComponent.cpp
-		ThermalModule.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,8 +1,5 @@
-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)
-add_subdirectory(pus)
+add_subdirectory(pus)

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/tc/TcPacketStoredBase.cpp

@@ -6,20 +6,20 @@
 #include "fsfw/objectmanager/frameworkObjects.h"
 #include "fsfw/serviceinterface/ServiceInterface.h"
 
-StorageManagerIF* TcPacketStoredBase::store = nullptr;
+StorageManagerIF* TcPacketStoredBase::STORE = nullptr;
 
 TcPacketStoredBase::TcPacketStoredBase() {
   this->storeAddress.raw = StorageManagerIF::INVALID_ADDRESS;
-  this->checkAndSetStore();
+  TcPacketStoredBase::checkAndSetStore();
 }
 
-TcPacketStoredBase::~TcPacketStoredBase() {}
+TcPacketStoredBase::~TcPacketStoredBase() = default;
 
 ReturnValue_t TcPacketStoredBase::getData(const uint8_t** dataPtr, size_t* dataSize) {
-  auto result = this->store->getData(storeAddress, dataPtr, dataSize);
+  auto result = TcPacketStoredBase::STORE->getData(storeAddress, dataPtr, dataSize);
   if (result != HasReturnvaluesIF::RETURN_OK) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-    sif::warning << "TcPacketStoredBase: Could not get data!" << std::endl;
+    sif::warning << "TcPacketStoredBase: Could not get data" << std::endl;
 #else
     sif::printWarning("TcPacketStoredBase: Could not get data!\n");
 #endif
@@ -28,11 +28,13 @@ ReturnValue_t TcPacketStoredBase::getData(const uint8_t** dataPtr, size_t* dataS
 }
 
 bool TcPacketStoredBase::checkAndSetStore() {
-  if (this->store == nullptr) {
+  if (TcPacketStoredBase::STORE == nullptr) {
-    this->store = ObjectManager::instance()->get<StorageManagerIF>(objects::TC_STORE);
+    TcPacketStoredBase::STORE = ObjectManager::instance()->get<StorageManagerIF>(objects::TC_STORE);
-    if (this->store == nullptr) {
+    if (TcPacketStoredBase::STORE == nullptr) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-      sif::error << "TcPacketStoredBase::TcPacketStoredBase: TC Store not found!" << std::endl;
+      sif::error << "TcPacketStoredBase::TcPacketStoredBase: TC Store not found" << std::endl;
+#else
+      sif::printError("TcPacketStoredBase::TcPacketStoredBase: TC Store not found\n");
 #endif
       return false;
     }
@@ -47,7 +49,7 @@ void TcPacketStoredBase::setStoreAddress(store_address_t setAddress,
   size_t tempSize;
   ReturnValue_t status = StorageManagerIF::RETURN_FAILED;
   if (this->checkAndSetStore()) {
-    status = this->store->getData(this->storeAddress, &tempData, &tempSize);
+    status = TcPacketStoredBase::STORE->getData(this->storeAddress, &tempData, &tempSize);
   }
 
   if (status == StorageManagerIF::RETURN_OK) {

src/fsfw/tmtcpacket/pus/tc/TcPacketStoredBase.h

@@ -65,7 +65,7 @@ class TcPacketStoredBase : public TcPacketStoredIF {
    * call tries to set it and throws an error message in case of failures.
    * The default store is objects::TC_STORE.
    */
-  static StorageManagerIF* store;
+  static StorageManagerIF* STORE;
   /**
    * The address where the packet data of the object instance is stored.
    */
@@ -77,7 +77,7 @@ class TcPacketStoredBase : public TcPacketStoredIF {
    * @return  @li @c true if the store is linked or could be created.
    *          @li @c false otherwise.
    */
-  bool checkAndSetStore();
+  static bool checkAndSetStore();
 };
 
-#endif /* TMTCPACKET_PUS_TcPacketStoredBase_H_ */
+#endif /* TMTCPACKET_PUS_TCPACKETSTORED_H_ */

src/fsfw/tmtcpacket/pus/tc/TcPacketStoredIF.h

@@ -9,7 +9,7 @@
 
 class TcPacketStoredIF {
  public:
-  virtual ~TcPacketStoredIF(){};
+  virtual ~TcPacketStoredIF()= default;;
 
   /**
    * With this call, the stored packet can be set to another packet in a store. This is useful

src/fsfw/tmtcpacket/pus/tc/TcPacketStoredPus.cpp

@@ -14,8 +14,8 @@ TcPacketStoredPus::TcPacketStoredPus(uint16_t apid, uint8_t service, uint8_t sub
   }
   uint8_t* pData = nullptr;
   ReturnValue_t returnValue =
-      this->store->getFreeElement(&this->storeAddress, (TC_PACKET_MIN_SIZE + size), &pData);
+      this->STORE->getFreeElement(&this->storeAddress, (TC_PACKET_MIN_SIZE + size), &pData);
-  if (returnValue != this->store->RETURN_OK) {
+  if (returnValue != this->STORE->RETURN_OK) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
     sif::warning << "TcPacketStoredBase: Could not get free element from store!" << std::endl;
 #endif
@@ -44,19 +44,19 @@ TcPacketStoredPus::TcPacketStoredPus(const uint8_t* data, size_t size) : TcPacke
     return;
   }
   if (this->checkAndSetStore()) {
-    ReturnValue_t status = store->addData(&storeAddress, data, size);
+    ReturnValue_t status = STORE->addData(&storeAddress, data, size);
     if (status != HasReturnvaluesIF::RETURN_OK) {
       this->setData(nullptr, size);
     }
     const uint8_t* storePtr = nullptr;
     // Repoint base data pointer to the data in the store.
-    store->getData(storeAddress, &storePtr, &size);
+    STORE->getData(storeAddress, &storePtr, &size);
     this->setData(const_cast<uint8_t*>(storePtr), size);
   }
 }
 
 ReturnValue_t TcPacketStoredPus::deletePacket() {
-  ReturnValue_t result = this->store->deleteData(this->storeAddress);
+  ReturnValue_t result = this->STORE->deleteData(this->storeAddress);
   this->storeAddress.raw = StorageManagerIF::INVALID_ADDRESS;
   // To circumvent size checks
   this->setData(nullptr, -1);
@@ -68,7 +68,7 @@ TcPacketPusBase* TcPacketStoredPus::getPacketBase() { return this; }
 bool TcPacketStoredPus::isSizeCorrect() {
   const uint8_t* temp_data = nullptr;
   size_t temp_size;
-  ReturnValue_t status = this->store->getData(this->storeAddress, &temp_data, &temp_size);
+  ReturnValue_t status = this->STORE->getData(this->storeAddress, &temp_data, &temp_size);
   if (status == StorageManagerIF::RETURN_OK) {
     if (this->getFullSize() == temp_size) {
       return true;

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

@@ -1,9 +1,9 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
+target_sources(
-    TmPacketStoredPusA.cpp
+  ${LIB_FSFW_NAME}
-    TmPacketStoredPusC.cpp
+  PRIVATE TmPacketStoredPusA.cpp
-    TmPacketPusA.cpp
+          TmPacketStoredPusC.cpp
-    TmPacketPusC.cpp
+          TmPacketPusA.cpp
-    TmPacketStoredBase.cpp
+          TmPacketPusC.cpp
-    TmPacketBase.cpp
+          TmPacketStoredBase.cpp
-    TmPacketMinimal.cpp
+          TmPacketBase.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
+          PusServiceBase.cpp
-		PusVerificationReport.cpp
+          PusVerificationReport.cpp
-		TmTcBridge.cpp
+          TmTcBridge.cpp
-		TmTcMessage.cpp
+          TmTcMessage.cpp
-		VerificationReporter.cpp
+          VerificationReporter.cpp
-		SpacePacketParser.cpp
+          SpacePacketParser.cpp)
-)