From 6c588cea53379414061e80c2b09cb2542749b3d9 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Fri, 13 May 2022 17:33:43 +0200
Subject: [PATCH 1/4] apply cmake-fmt on all cmakelists.txt files

---
 scripts/auto-formatter.sh                     | 11 ++--
 src/CMakeLists.txt                            |  9 +--
 src/fsfw/CMakeLists.txt                       | 16 +++--
 src/fsfw/action/CMakeLists.txt                | 10 +--
 src/fsfw/cfdp/CMakeLists.txt                  |  5 +-
 src/fsfw/cfdp/pdu/CMakeLists.txt              | 62 +++++++++----------
 src/fsfw/cfdp/tlv/CMakeLists.txt              | 20 +++---
 src/fsfw/container/CMakeLists.txt             |  7 +--
 src/fsfw/controller/CMakeLists.txt            |  6 +-
 src/fsfw/coordinates/CMakeLists.txt           |  7 +--
 src/fsfw/datalinklayer/CMakeLists.txt         | 23 ++++---
 src/fsfw/datapool/CMakeLists.txt              |  5 +-
 src/fsfw/datapoollocal/CMakeLists.txt         | 14 ++---
 .../datapoollocal/internal/CMakeLists.txt     |  7 +--
 src/fsfw/devicehandlers/CMakeLists.txt        | 21 +++----
 src/fsfw/events/CMakeLists.txt                |  5 +-
 src/fsfw/events/eventmatching/CMakeLists.txt  | 10 +--
 src/fsfw/fdir/CMakeLists.txt                  |  9 +--
 src/fsfw/globalfunctions/CMakeLists.txt       | 22 +++----
 src/fsfw/globalfunctions/math/CMakeLists.txt  |  5 +-
 src/fsfw/health/CMakeLists.txt                |  8 +--
 src/fsfw/housekeeping/CMakeLists.txt          |  7 +--
 src/fsfw/internalerror/CMakeLists.txt         |  5 +-
 src/fsfw/ipc/CMakeLists.txt                   |  9 +--
 src/fsfw/memory/CMakeLists.txt                |  7 +--
 src/fsfw/modes/CMakeLists.txt                 |  6 +-
 src/fsfw/monitoring/CMakeLists.txt            |  7 +--
 src/fsfw/objectmanager/CMakeLists.txt         |  6 +-
 src/fsfw/osal/CMakeLists.txt                  | 46 +++++++-------
 src/fsfw/osal/common/CMakeLists.txt           | 19 ++----
 src/fsfw/osal/freertos/CMakeLists.txt         | 52 ++++++++--------
 src/fsfw/osal/host/CMakeLists.txt             | 36 +++++------
 src/fsfw/osal/linux/CMakeLists.txt            | 42 ++++++-------
 src/fsfw/osal/rtems/CMakeLists.txt            | 37 +++++------
 src/fsfw/osal/windows/CMakeLists.txt          |  5 +-
 src/fsfw/parameters/CMakeLists.txt            |  9 +--
 src/fsfw/power/CMakeLists.txt                 | 12 ++--
 src/fsfw/pus/CMakeLists.txt                   | 24 +++----
 src/fsfw/rmap/CMakeLists.txt                  |  9 +--
 src/fsfw/serialize/CMakeLists.txt             |  5 +-
 src/fsfw/serviceinterface/CMakeLists.txt      |  9 ++-
 src/fsfw/storagemanager/CMakeLists.txt        | 10 +--
 src/fsfw/subsystem/CMakeLists.txt             |  8 +--
 src/fsfw/subsystem/modes/CMakeLists.txt       |  6 +-
 src/fsfw/tasks/CMakeLists.txt                 |  7 +--
 src/fsfw/tcdistribution/CMakeLists.txt        | 13 ++--
 src/fsfw/thermal/CMakeLists.txt               | 19 +++---
 src/fsfw/timemanager/CMakeLists.txt           | 11 +---
 src/fsfw/tmstorage/CMakeLists.txt             |  5 +-
 src/fsfw/tmtcpacket/CMakeLists.txt            |  7 +--
 src/fsfw/tmtcpacket/cfdp/CMakeLists.txt       |  5 +-
 .../tmtcpacket/packetmatcher/CMakeLists.txt   |  5 +-
 src/fsfw/tmtcpacket/pus/tc/CMakeLists.txt     |  9 +--
 src/fsfw/tmtcpacket/pus/tm/CMakeLists.txt     | 18 +++---
 src/fsfw/tmtcservices/CMakeLists.txt          | 19 +++---
 55 files changed, 310 insertions(+), 466 deletions(-)

diff --git a/scripts/auto-formatter.sh b/scripts/auto-formatter.sh
index 7b67ee9d..405d1268 100755
--- a/scripts/auto-formatter.sh
+++ b/scripts/auto-formatter.sh
@@ -4,9 +4,10 @@ if [[ ! -f README.md ]]; then
 fi
 
 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"
-  eval ${cmake_fmt_cmd}
+  ${cmake_fmt} -i CMakeLists.txt
+  find ./src ${file_selectors} | xargs ${cmake_fmt}  -i
 else
   echo "No ${cmake_fmt} tool found, not formatting CMake files"
 fi
@@ -14,9 +15,9 @@ fi
 cpp_format="clang-format"
 file_selectors="-iname *.h -o -iname *.cpp -o -iname *.c -o -iname *.tpp"
 if command -v ${cpp_format} &> /dev/null; then
-  find ./src ${file_selectors} | xargs clang-format --style=file -i
-  find ./hal ${file_selectors} | xargs clang-format --style=file -i
-  find ./tests ${file_selectors} | xargs clang-format --style=file -i
+  find ./src ${file_selectors} | xargs ${cpp_format} --style=file -i
+  find ./hal ${file_selectors} | xargs ${cpp_format} --style=file -i
+  find ./tests ${file_selectors} | xargs ${cpp_format} --style=file -i
 else
   echo "No ${cpp_format} tool found, not formatting C++/C files"
 fi
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ed2f2522..34f21c2f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,9 +1,6 @@
-target_include_directories(${LIB_FSFW_NAME} PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-)
+target_include_directories(${LIB_FSFW_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
-target_include_directories(${LIB_FSFW_NAME} INTERFACE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-)
+target_include_directories(${LIB_FSFW_NAME}
+                           INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
 
 add_subdirectory(fsfw)
diff --git a/src/fsfw/CMakeLists.txt b/src/fsfw/CMakeLists.txt
index efb9f6c7..1daad714 100644
--- a/src/fsfw/CMakeLists.txt
+++ b/src/fsfw/CMakeLists.txt
@@ -1,6 +1,4 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
-    version.cpp
-)
+target_sources(${LIB_FSFW_NAME} PRIVATE 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
diff --git a/src/fsfw/action/CMakeLists.txt b/src/fsfw/action/CMakeLists.txt
index f9ac451d..7fb397af 100644
--- a/src/fsfw/action/CMakeLists.txt
+++ b/src/fsfw/action/CMakeLists.txt
@@ -1,7 +1,3 @@
-target_sources(${LIB_FSFW_NAME} 
-    PRIVATE 
-        ActionHelper.cpp
-        ActionMessage.cpp
-        CommandActionHelper.cpp
-        SimpleActionHelper.cpp
-)
\ No newline at end of file
+target_sources(
+  ${LIB_FSFW_NAME} PRIVATE ActionHelper.cpp ActionMessage.cpp
+                           CommandActionHelper.cpp SimpleActionHelper.cpp)
diff --git a/src/fsfw/cfdp/CMakeLists.txt b/src/fsfw/cfdp/CMakeLists.txt
index 908dc32a..0b926a9a 100644
--- a/src/fsfw/cfdp/CMakeLists.txt
+++ b/src/fsfw/cfdp/CMakeLists.txt
@@ -1,7 +1,4 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
-    CFDPHandler.cpp
-    CFDPMessage.cpp
-)
+target_sources(${LIB_FSFW_NAME} PRIVATE CFDPHandler.cpp CFDPMessage.cpp)
 
 add_subdirectory(pdu)
 add_subdirectory(tlv)
diff --git a/src/fsfw/cfdp/pdu/CMakeLists.txt b/src/fsfw/cfdp/pdu/CMakeLists.txt
index 931db306..4f345bdc 100644
--- a/src/fsfw/cfdp/pdu/CMakeLists.txt
+++ b/src/fsfw/cfdp/pdu/CMakeLists.txt
@@ -1,32 +1,30 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
-    PduConfig.cpp
-    VarLenField.cpp
-    HeaderSerializer.cpp
-    HeaderDeserializer.cpp
-    FileDirectiveDeserializer.cpp
-    FileDirectiveSerializer.cpp
- 
-    AckInfo.cpp
-    AckPduSerializer.cpp
-    AckPduDeserializer.cpp
-    EofInfo.cpp
-    EofPduSerializer.cpp
-    EofPduDeserializer.cpp
-    NakInfo.cpp
-    NakPduSerializer.cpp
-    NakPduDeserializer.cpp
-    FinishedInfo.cpp
-    FinishedPduSerializer.cpp
-    FinishedPduDeserializer.cpp
-    MetadataInfo.cpp
-    MetadataPduSerializer.cpp
-    MetadataPduDeserializer.cpp
-    KeepAlivePduSerializer.cpp
-    KeepAlivePduDeserializer.cpp
-    PromptPduSerializer.cpp
-    PromptPduDeserializer.cpp
-
-    FileDataSerializer.cpp
-    FileDataDeserializer.cpp
-    FileDataInfo.cpp
-)
\ No newline at end of file
+target_sources(
+  ${LIB_FSFW_NAME}
+  PRIVATE PduConfig.cpp
+          VarLenField.cpp
+          HeaderSerializer.cpp
+          HeaderDeserializer.cpp
+          FileDirectiveDeserializer.cpp
+          FileDirectiveSerializer.cpp
+          AckInfo.cpp
+          AckPduSerializer.cpp
+          AckPduDeserializer.cpp
+          EofInfo.cpp
+          EofPduSerializer.cpp
+          EofPduDeserializer.cpp
+          NakInfo.cpp
+          NakPduSerializer.cpp
+          NakPduDeserializer.cpp
+          FinishedInfo.cpp
+          FinishedPduSerializer.cpp
+          FinishedPduDeserializer.cpp
+          MetadataInfo.cpp
+          MetadataPduSerializer.cpp
+          MetadataPduDeserializer.cpp
+          KeepAlivePduSerializer.cpp
+          KeepAlivePduDeserializer.cpp
+          PromptPduSerializer.cpp
+          PromptPduDeserializer.cpp
+          FileDataSerializer.cpp
+          FileDataDeserializer.cpp
+          FileDataInfo.cpp)
diff --git a/src/fsfw/cfdp/tlv/CMakeLists.txt b/src/fsfw/cfdp/tlv/CMakeLists.txt
index 24459cf8..cdf7b44a 100644
--- a/src/fsfw/cfdp/tlv/CMakeLists.txt
+++ b/src/fsfw/cfdp/tlv/CMakeLists.txt
@@ -1,10 +1,10 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
-    EntityIdTlv.cpp
-    FilestoreRequestTlv.cpp
-    FilestoreResponseTlv.cpp
-    Lv.cpp
-    Tlv.cpp
-    FlowLabelTlv.cpp
-    MessageToUserTlv.cpp
-    FaultHandlerOverrideTlv.cpp
-)
\ No newline at end of file
+target_sources(
+  ${LIB_FSFW_NAME}
+  PRIVATE EntityIdTlv.cpp
+          FilestoreRequestTlv.cpp
+          FilestoreResponseTlv.cpp
+          Lv.cpp
+          Tlv.cpp
+          FlowLabelTlv.cpp
+          MessageToUserTlv.cpp
+          FaultHandlerOverrideTlv.cpp)
diff --git a/src/fsfw/container/CMakeLists.txt b/src/fsfw/container/CMakeLists.txt
index 13eced1d..52087ff0 100644
--- a/src/fsfw/container/CMakeLists.txt
+++ b/src/fsfw/container/CMakeLists.txt
@@ -1,5 +1,2 @@
-target_sources(${LIB_FSFW_NAME} 
-    PRIVATE 
-        SharedRingBuffer.cpp
-        SimpleRingBuffer.cpp
-)
\ No newline at end of file
+target_sources(${LIB_FSFW_NAME} PRIVATE SharedRingBuffer.cpp
+                                        SimpleRingBuffer.cpp)
diff --git a/src/fsfw/controller/CMakeLists.txt b/src/fsfw/controller/CMakeLists.txt
index 550acfcd..c8c000d8 100644
--- a/src/fsfw/controller/CMakeLists.txt
+++ b/src/fsfw/controller/CMakeLists.txt
@@ -1,4 +1,2 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE 
-    ControllerBase.cpp
-    ExtendedControllerBase.cpp
-)
\ No newline at end of file
+target_sources(${LIB_FSFW_NAME} PRIVATE ControllerBase.cpp
+                                        ExtendedControllerBase.cpp)
diff --git a/src/fsfw/coordinates/CMakeLists.txt b/src/fsfw/coordinates/CMakeLists.txt
index a1fa1e52..15452b1c 100644
--- a/src/fsfw/coordinates/CMakeLists.txt
+++ b/src/fsfw/coordinates/CMakeLists.txt
@@ -1,5 +1,2 @@
-target_sources(${LIB_FSFW_NAME} 
-	PRIVATE 
-		CoordinateTransformations.cpp
-		Sgp4Propagator.cpp
-)
\ No newline at end of file
+target_sources(${LIB_FSFW_NAME} PRIVATE CoordinateTransformations.cpp
+                                        Sgp4Propagator.cpp)
diff --git a/src/fsfw/datalinklayer/CMakeLists.txt b/src/fsfw/datalinklayer/CMakeLists.txt
index 148e7c5d..cc18088f 100644
--- a/src/fsfw/datalinklayer/CMakeLists.txt
+++ b/src/fsfw/datalinklayer/CMakeLists.txt
@@ -1,12 +1,11 @@
-target_sources(${LIB_FSFW_NAME} 
-	PRIVATE 
-		Clcw.cpp
-		DataLinkLayer.cpp
-		Farm1StateLockout.cpp
-		Farm1StateOpen.cpp
-		Farm1StateWait.cpp
-		MapPacketExtraction.cpp
-		TcTransferFrame.cpp
-		TcTransferFrameLocal.cpp
-		VirtualChannelReception.cpp
-)
\ No newline at end of file
+target_sources(
+  ${LIB_FSFW_NAME}
+  PRIVATE Clcw.cpp
+          DataLinkLayer.cpp
+          Farm1StateLockout.cpp
+          Farm1StateOpen.cpp
+          Farm1StateWait.cpp
+          MapPacketExtraction.cpp
+          TcTransferFrame.cpp
+          TcTransferFrameLocal.cpp
+          VirtualChannelReception.cpp)
diff --git a/src/fsfw/datapool/CMakeLists.txt b/src/fsfw/datapool/CMakeLists.txt
index 535be2b0..b2ac592c 100644
--- a/src/fsfw/datapool/CMakeLists.txt
+++ b/src/fsfw/datapool/CMakeLists.txt
@@ -1,4 +1 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE 
-    PoolDataSetBase.cpp
-    PoolEntry.cpp
-)
\ No newline at end of file
+target_sources(${LIB_FSFW_NAME} PRIVATE PoolDataSetBase.cpp PoolEntry.cpp)
diff --git a/src/fsfw/datapoollocal/CMakeLists.txt b/src/fsfw/datapoollocal/CMakeLists.txt
index e2db39eb..749ef688 100644
--- a/src/fsfw/datapoollocal/CMakeLists.txt
+++ b/src/fsfw/datapoollocal/CMakeLists.txt
@@ -1,10 +1,6 @@
-target_sources(${LIB_FSFW_NAME} 
-	PRIVATE 
-		LocalDataPoolManager.cpp
-		LocalDataSet.cpp
-		LocalPoolDataSetBase.cpp
-		LocalPoolObjectBase.cpp
-		SharedLocalDataSet.cpp
-)
+target_sources(
+  ${LIB_FSFW_NAME}
+  PRIVATE LocalDataPoolManager.cpp LocalDataSet.cpp LocalPoolDataSetBase.cpp
+          LocalPoolObjectBase.cpp SharedLocalDataSet.cpp)
 
-add_subdirectory(internal)
\ No newline at end of file
+add_subdirectory(internal)
diff --git a/src/fsfw/datapoollocal/internal/CMakeLists.txt b/src/fsfw/datapoollocal/internal/CMakeLists.txt
index 554f3b88..6585d06e 100644
--- a/src/fsfw/datapoollocal/internal/CMakeLists.txt
+++ b/src/fsfw/datapoollocal/internal/CMakeLists.txt
@@ -1,5 +1,2 @@
-target_sources(${LIB_FSFW_NAME} 
-	PRIVATE 
-		HasLocalDpIFUserAttorney.cpp
-		HasLocalDpIFManagerAttorney.cpp
-)
+target_sources(${LIB_FSFW_NAME} PRIVATE HasLocalDpIFUserAttorney.cpp
+                                        HasLocalDpIFManagerAttorney.cpp)
diff --git a/src/fsfw/devicehandlers/CMakeLists.txt b/src/fsfw/devicehandlers/CMakeLists.txt
index 50c1008f..180a89da 100644
--- a/src/fsfw/devicehandlers/CMakeLists.txt
+++ b/src/fsfw/devicehandlers/CMakeLists.txt
@@ -1,11 +1,10 @@
-target_sources(${LIB_FSFW_NAME} 
-	PRIVATE 
-		AssemblyBase.cpp
-		ChildHandlerBase.cpp
-		ChildHandlerFDIR.cpp
-		DeviceHandlerBase.cpp
-		DeviceHandlerFailureIsolation.cpp
-		DeviceHandlerMessage.cpp
-		DeviceTmReportingWrapper.cpp
-		HealthDevice.cpp
-)
\ No newline at end of file
+target_sources(
+  ${LIB_FSFW_NAME}
+  PRIVATE AssemblyBase.cpp
+          ChildHandlerBase.cpp
+          ChildHandlerFDIR.cpp
+          DeviceHandlerBase.cpp
+          DeviceHandlerFailureIsolation.cpp
+          DeviceHandlerMessage.cpp
+          DeviceTmReportingWrapper.cpp
+          HealthDevice.cpp)
diff --git a/src/fsfw/events/CMakeLists.txt b/src/fsfw/events/CMakeLists.txt
index 28eec772..704cca85 100644
--- a/src/fsfw/events/CMakeLists.txt
+++ b/src/fsfw/events/CMakeLists.txt
@@ -1,6 +1,3 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE 
-    EventManager.cpp
-    EventMessage.cpp
-)
+target_sources(${LIB_FSFW_NAME} PRIVATE EventManager.cpp EventMessage.cpp)
 
 add_subdirectory(eventmatching)
diff --git a/src/fsfw/events/eventmatching/CMakeLists.txt b/src/fsfw/events/eventmatching/CMakeLists.txt
index 81ff9ed8..a9f9c7b3 100644
--- a/src/fsfw/events/eventmatching/CMakeLists.txt
+++ b/src/fsfw/events/eventmatching/CMakeLists.txt
@@ -1,7 +1,3 @@
-target_sources(${LIB_FSFW_NAME} 
-	PRIVATE 
-		EventIdRangeMatcher.cpp
-		EventMatchTree.cpp
-		ReporterRangeMatcher.cpp
-		SeverityRangeMatcher.cpp
-)
\ No newline at end of file
+target_sources(
+  ${LIB_FSFW_NAME} PRIVATE EventIdRangeMatcher.cpp EventMatchTree.cpp
+                           ReporterRangeMatcher.cpp SeverityRangeMatcher.cpp)
diff --git a/src/fsfw/fdir/CMakeLists.txt b/src/fsfw/fdir/CMakeLists.txt
index f5ffbba8..d41ee2eb 100644
--- a/src/fsfw/fdir/CMakeLists.txt
+++ b/src/fsfw/fdir/CMakeLists.txt
@@ -1,6 +1,3 @@
-target_sources(${LIB_FSFW_NAME} 
-	PRIVATE 
-		EventCorrelation.cpp
-		FailureIsolationBase.cpp
-		FaultCounter.cpp
-)
\ No newline at end of file
+target_sources(
+  ${LIB_FSFW_NAME} PRIVATE EventCorrelation.cpp FailureIsolationBase.cpp
+                           FaultCounter.cpp)
diff --git a/src/fsfw/globalfunctions/CMakeLists.txt b/src/fsfw/globalfunctions/CMakeLists.txt
index acd1edbe..cf8a25d5 100644
--- a/src/fsfw/globalfunctions/CMakeLists.txt
+++ b/src/fsfw/globalfunctions/CMakeLists.txt
@@ -1,13 +1,13 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
-    arrayprinter.cpp
-    AsciiConverter.cpp
-    CRC.cpp
-    DleEncoder.cpp
-    DleParser.cpp
-    PeriodicOperationDivider.cpp
-    timevalOperations.cpp
-    Type.cpp
-    bitutility.cpp
-)
+target_sources(
+  ${LIB_FSFW_NAME}
+  PRIVATE arrayprinter.cpp
+          AsciiConverter.cpp
+          CRC.cpp
+          DleEncoder.cpp
+          DleParser.cpp
+          PeriodicOperationDivider.cpp
+          timevalOperations.cpp
+          Type.cpp
+          bitutility.cpp)
 
 add_subdirectory(math)
diff --git a/src/fsfw/globalfunctions/math/CMakeLists.txt b/src/fsfw/globalfunctions/math/CMakeLists.txt
index a9c4ded7..1eeb69b5 100644
--- a/src/fsfw/globalfunctions/math/CMakeLists.txt
+++ b/src/fsfw/globalfunctions/math/CMakeLists.txt
@@ -1,4 +1 @@
-target_sources(${LIB_FSFW_NAME} 
-	PRIVATE 
-		QuaternionOperations.cpp
-)
+target_sources(${LIB_FSFW_NAME} PRIVATE QuaternionOperations.cpp)
diff --git a/src/fsfw/health/CMakeLists.txt b/src/fsfw/health/CMakeLists.txt
index d5f3ccd3..37e4ce48 100644
--- a/src/fsfw/health/CMakeLists.txt
+++ b/src/fsfw/health/CMakeLists.txt
@@ -1,6 +1,2 @@
-target_sources(${LIB_FSFW_NAME} 
-	PRIVATE 
-		HealthHelper.cpp
-		HealthMessage.cpp
-		HealthTable.cpp	
-)
\ No newline at end of file
+target_sources(${LIB_FSFW_NAME} PRIVATE HealthHelper.cpp HealthMessage.cpp
+                                        HealthTable.cpp)
diff --git a/src/fsfw/housekeeping/CMakeLists.txt b/src/fsfw/housekeeping/CMakeLists.txt
index fecad2e3..236d3204 100644
--- a/src/fsfw/housekeeping/CMakeLists.txt
+++ b/src/fsfw/housekeeping/CMakeLists.txt
@@ -1,5 +1,2 @@
-target_sources(${LIB_FSFW_NAME} 
-	PRIVATE 
-		HousekeepingMessage.cpp
-		PeriodicHousekeepingHelper.cpp
-)
\ No newline at end of file
+target_sources(${LIB_FSFW_NAME} PRIVATE HousekeepingMessage.cpp
+                                        PeriodicHousekeepingHelper.cpp)
diff --git a/src/fsfw/internalerror/CMakeLists.txt b/src/fsfw/internalerror/CMakeLists.txt
index 2b383914..87d3c3f7 100644
--- a/src/fsfw/internalerror/CMakeLists.txt
+++ b/src/fsfw/internalerror/CMakeLists.txt
@@ -1,4 +1 @@
-target_sources(${LIB_FSFW_NAME} 
-	PRIVATE 
-		InternalErrorReporter.cpp
-)
\ No newline at end of file
+target_sources(${LIB_FSFW_NAME} PRIVATE InternalErrorReporter.cpp)
diff --git a/src/fsfw/ipc/CMakeLists.txt b/src/fsfw/ipc/CMakeLists.txt
index 3bfe510d..92b91f35 100644
--- a/src/fsfw/ipc/CMakeLists.txt
+++ b/src/fsfw/ipc/CMakeLists.txt
@@ -1,6 +1,3 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
-    CommandMessage.cpp
-    CommandMessageCleaner.cpp
-    MessageQueueMessage.cpp
-    MessageQueueBase.cpp
-)
\ No newline at end of file
+target_sources(
+  ${LIB_FSFW_NAME} PRIVATE CommandMessage.cpp CommandMessageCleaner.cpp
+                           MessageQueueMessage.cpp MessageQueueBase.cpp)
diff --git a/src/fsfw/memory/CMakeLists.txt b/src/fsfw/memory/CMakeLists.txt
index c713cd42..9e591bae 100644
--- a/src/fsfw/memory/CMakeLists.txt
+++ b/src/fsfw/memory/CMakeLists.txt
@@ -1,5 +1,2 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
-    MemoryHelper.cpp
-    MemoryMessage.cpp
-    GenericFileSystemMessage.cpp
-)
\ No newline at end of file
+target_sources(${LIB_FSFW_NAME} PRIVATE MemoryHelper.cpp MemoryMessage.cpp
+                                        GenericFileSystemMessage.cpp)
diff --git a/src/fsfw/modes/CMakeLists.txt b/src/fsfw/modes/CMakeLists.txt
index 8e5c719b..4eef58e0 100644
--- a/src/fsfw/modes/CMakeLists.txt
+++ b/src/fsfw/modes/CMakeLists.txt
@@ -1,5 +1 @@
-target_sources(${LIB_FSFW_NAME} 
-	PRIVATE 
-		ModeHelper.cpp
-		ModeMessage.cpp
-)
\ No newline at end of file
+target_sources(${LIB_FSFW_NAME} PRIVATE ModeHelper.cpp ModeMessage.cpp)
diff --git a/src/fsfw/monitoring/CMakeLists.txt b/src/fsfw/monitoring/CMakeLists.txt
index d26e807c..48f945b5 100644
--- a/src/fsfw/monitoring/CMakeLists.txt
+++ b/src/fsfw/monitoring/CMakeLists.txt
@@ -1,5 +1,2 @@
-target_sources(${LIB_FSFW_NAME} 
-	PRIVATE 
-		LimitViolationReporter.cpp
-		MonitoringMessage.cpp
-)
\ No newline at end of file
+target_sources(${LIB_FSFW_NAME} PRIVATE LimitViolationReporter.cpp
+                                        MonitoringMessage.cpp)
diff --git a/src/fsfw/objectmanager/CMakeLists.txt b/src/fsfw/objectmanager/CMakeLists.txt
index 72aaec89..c71f43aa 100644
--- a/src/fsfw/objectmanager/CMakeLists.txt
+++ b/src/fsfw/objectmanager/CMakeLists.txt
@@ -1,5 +1 @@
-target_sources(${LIB_FSFW_NAME} 
-	PRIVATE 
-		ObjectManager.cpp
-		SystemObject.cpp
-)
\ No newline at end of file
+target_sources(${LIB_FSFW_NAME} PRIVATE ObjectManager.cpp SystemObject.cpp)
diff --git a/src/fsfw/osal/CMakeLists.txt b/src/fsfw/osal/CMakeLists.txt
index f3c5cfad..50fd6102 100644
--- a/src/fsfw/osal/CMakeLists.txt
+++ b/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)
-    if (WIN32)
-        add_subdirectory(windows)
-    elseif(UNIX)
-        # We still need to pull in some Linux specific sources
-        target_sources(${LIB_FSFW_NAME} PUBLIC
-            linux/tcpipHelpers.cpp
-        )
-    endif ()
+  add_subdirectory(host)
+  if(WIN32)
+    add_subdirectory(windows)
+  elseif(UNIX)
+    # We still need to pull in some Linux specific sources
+    target_sources(${LIB_FSFW_NAME} PUBLIC linux/tcpipHelpers.cpp)
+  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)
-        add_subdirectory(host)
-        add_subdirectory(windows)
-    elseif (UNIX)
-        add_subdirectory(linux)
-    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()
+  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)
+    add_subdirectory(host)
+    add_subdirectory(windows)
+  elseif(UNIX)
+    add_subdirectory(linux)
+  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()
 
 endif()
 
-add_subdirectory(common)
\ No newline at end of file
+add_subdirectory(common)
diff --git a/src/fsfw/osal/common/CMakeLists.txt b/src/fsfw/osal/common/CMakeLists.txt
index b7c8c033..c0814172 100644
--- a/src/fsfw/osal/common/CMakeLists.txt
+++ b/src/fsfw/osal/common/CMakeLists.txt
@@ -1,17 +1,10 @@
 if(DEFINED WIN32 OR DEFINED UNIX)
-    target_sources(${LIB_FSFW_NAME} PRIVATE 
-        tcpipCommon.cpp
-        TcpIpBase.cpp
-        UdpTcPollingTask.cpp
-        UdpTmTcBridge.cpp
-        TcpTmTcServer.cpp
-        TcpTmTcBridge.cpp
-    )
+  target_sources(
+    ${LIB_FSFW_NAME}
+    PRIVATE tcpipCommon.cpp TcpIpBase.cpp UdpTcPollingTask.cpp
+            UdpTmTcBridge.cpp TcpTmTcServer.cpp TcpTmTcBridge.cpp)
 endif()
 
 if(WIN32)
-    target_link_libraries(${LIB_FSFW_NAME} PRIVATE
-        wsock32 
-        ws2_32
-    )
-endif()
\ No newline at end of file
+  target_link_libraries(${LIB_FSFW_NAME} PRIVATE wsock32 ws2_32)
+endif()
diff --git a/src/fsfw/osal/freertos/CMakeLists.txt b/src/fsfw/osal/freertos/CMakeLists.txt
index 40bdcd0f..cb6ac55a 100644
--- a/src/fsfw/osal/freertos/CMakeLists.txt
+++ b/src/fsfw/osal/freertos/CMakeLists.txt
@@ -1,32 +1,30 @@
-target_sources(${LIB_FSFW_NAME} 
-	PRIVATE 
-		Clock.cpp
-		FixedTimeslotTask.cpp
-		BinarySemaphore.cpp
-		BinSemaphUsingTask.cpp
-		CountingSemaphore.cpp
-		CountingSemaphUsingTask.cpp
-		MessageQueue.cpp
-		Mutex.cpp
-		MutexFactory.cpp
-		PeriodicTask.cpp
-		QueueFactory.cpp
-		SemaphoreFactory.cpp
-		TaskFactory.cpp
-		Timekeeper.cpp
-		TaskManagement.cpp
-		QueueMapManager.cpp
-)
+target_sources(
+  ${LIB_FSFW_NAME}
+  PRIVATE Clock.cpp
+          FixedTimeslotTask.cpp
+          BinarySemaphore.cpp
+          BinSemaphUsingTask.cpp
+          CountingSemaphore.cpp
+          CountingSemaphUsingTask.cpp
+          MessageQueue.cpp
+          Mutex.cpp
+          MutexFactory.cpp
+          PeriodicTask.cpp
+          QueueFactory.cpp
+          SemaphoreFactory.cpp
+          TaskFactory.cpp
+          Timekeeper.cpp
+          TaskManagement.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 
+# 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
-		"LIB_OS_NAME is empty. Make sure to include the FreeRTOS header path properly."
-	)
+  message(
+    STATUS
+      "LIB_OS_NAME is empty. Make sure to include the FreeRTOS header path properly."
+  )
 else()
-    target_link_libraries(${LIB_FSFW_NAME} PRIVATE
-        ${LIB_OS_NAME}
-    )
+  target_link_libraries(${LIB_FSFW_NAME} PRIVATE ${LIB_OS_NAME})
 endif()
diff --git a/src/fsfw/osal/host/CMakeLists.txt b/src/fsfw/osal/host/CMakeLists.txt
index 8b11a531..95ab25c9 100644
--- a/src/fsfw/osal/host/CMakeLists.txt
+++ b/src/fsfw/osal/host/CMakeLists.txt
@@ -1,27 +1,23 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
-  Clock.cpp
-  FixedTimeslotTask.cpp
-  MessageQueue.cpp
-  Mutex.cpp
-  MutexFactory.cpp
-  PeriodicTask.cpp
-  QueueFactory.cpp
-  QueueMapManager.cpp
-  SemaphoreFactory.cpp
-  TaskFactory.cpp
-  taskHelpers.cpp
-)
+target_sources(
+  ${LIB_FSFW_NAME}
+  PRIVATE Clock.cpp
+          FixedTimeslotTask.cpp
+          MessageQueue.cpp
+          Mutex.cpp
+          MutexFactory.cpp
+          PeriodicTask.cpp
+          QueueFactory.cpp
+          QueueMapManager.cpp
+          SemaphoreFactory.cpp
+          TaskFactory.cpp
+          taskHelpers.cpp)
 
 if(UNIX)
   find_package(Threads REQUIRED)
 
-  target_link_libraries(${LIB_FSFW_NAME} PRIVATE
-    ${CMAKE_THREAD_LIBS_INIT}
-  )
+  target_link_libraries(${LIB_FSFW_NAME} PRIVATE ${CMAKE_THREAD_LIBS_INIT})
   if(NOT APPLE)
-    target_link_libraries(${LIB_FSFW_NAME} PRIVATE
-      rt
-      )
+    target_link_libraries(${LIB_FSFW_NAME} PRIVATE rt)
   endif()
 
-endif()
\ No newline at end of file
+endif()
diff --git a/src/fsfw/osal/linux/CMakeLists.txt b/src/fsfw/osal/linux/CMakeLists.txt
index 2e88d6d0..72a62b86 100644
--- a/src/fsfw/osal/linux/CMakeLists.txt
+++ b/src/fsfw/osal/linux/CMakeLists.txt
@@ -1,29 +1,25 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
-  Clock.cpp
-  BinarySemaphore.cpp
-  CountingSemaphore.cpp
-  FixedTimeslotTask.cpp
-  InternalErrorCodes.cpp
-  MessageQueue.cpp
-  Mutex.cpp
-  MutexFactory.cpp
-  PeriodicPosixTask.cpp
-  PosixThread.cpp
-  QueueFactory.cpp
-  SemaphoreFactory.cpp
-  TaskFactory.cpp
-  tcpipHelpers.cpp
-  unixUtility.cpp
-  )
+target_sources(
+  ${LIB_FSFW_NAME}
+  PRIVATE Clock.cpp
+          BinarySemaphore.cpp
+          CountingSemaphore.cpp
+          FixedTimeslotTask.cpp
+          InternalErrorCodes.cpp
+          MessageQueue.cpp
+          Mutex.cpp
+          MutexFactory.cpp
+          PeriodicPosixTask.cpp
+          PosixThread.cpp
+          QueueFactory.cpp
+          SemaphoreFactory.cpp
+          TaskFactory.cpp
+          tcpipHelpers.cpp
+          unixUtility.cpp)
 
 find_package(Threads REQUIRED)
 
-target_link_libraries(${LIB_FSFW_NAME} PUBLIC
-  ${CMAKE_THREAD_LIBS_INIT}
-  )
+target_link_libraries(${LIB_FSFW_NAME} PUBLIC ${CMAKE_THREAD_LIBS_INIT})
 
 if(NOT APPLE)
-  target_link_libraries(${LIB_FSFW_NAME} PUBLIC
-    rt
-  )
+  target_link_libraries(${LIB_FSFW_NAME} PUBLIC rt)
 endif()
diff --git a/src/fsfw/osal/rtems/CMakeLists.txt b/src/fsfw/osal/rtems/CMakeLists.txt
index 734566a3..1b47e1b9 100644
--- a/src/fsfw/osal/rtems/CMakeLists.txt
+++ b/src/fsfw/osal/rtems/CMakeLists.txt
@@ -1,20 +1,17 @@
-target_sources(${LIB_FSFW_NAME} 
-	PRIVATE 
-		Clock.cpp
-		CpuUsage.cpp
-		InitTask.cpp
-		InternalErrorCodes.cpp
-		MessageQueue.cpp
-		PeriodicTask.cpp
-		Mutex.cpp
-		MutexFactory.cpp
-		FixedTimeslotTask.cpp
-		QueueFactory.cpp
-		RtemsBasic.cpp
-		RTEMSTaskBase.cpp
-		TaskFactory.cpp
-		BinarySemaphore.cpp
-		SemaphoreFactory.cpp
-)
-
-
+target_sources(
+  ${LIB_FSFW_NAME}
+  PRIVATE Clock.cpp
+          CpuUsage.cpp
+          InitTask.cpp
+          InternalErrorCodes.cpp
+          MessageQueue.cpp
+          PeriodicTask.cpp
+          Mutex.cpp
+          MutexFactory.cpp
+          FixedTimeslotTask.cpp
+          QueueFactory.cpp
+          RtemsBasic.cpp
+          RTEMSTaskBase.cpp
+          TaskFactory.cpp
+          BinarySemaphore.cpp
+          SemaphoreFactory.cpp)
diff --git a/src/fsfw/osal/windows/CMakeLists.txt b/src/fsfw/osal/windows/CMakeLists.txt
index 36a54765..e961b25b 100644
--- a/src/fsfw/osal/windows/CMakeLists.txt
+++ b/src/fsfw/osal/windows/CMakeLists.txt
@@ -1,4 +1 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE 
-    tcpipHelpers.cpp
-    winTaskHelpers.cpp
-)
+target_sources(${LIB_FSFW_NAME} PRIVATE tcpipHelpers.cpp winTaskHelpers.cpp)
diff --git a/src/fsfw/parameters/CMakeLists.txt b/src/fsfw/parameters/CMakeLists.txt
index fb5e4590..98a8085c 100644
--- a/src/fsfw/parameters/CMakeLists.txt
+++ b/src/fsfw/parameters/CMakeLists.txt
@@ -1,6 +1,3 @@
-target_sources(${LIB_FSFW_NAME} 
-	PRIVATE 
-		ParameterHelper.cpp
-		ParameterMessage.cpp
-		ParameterWrapper.cpp
-)
\ No newline at end of file
+target_sources(
+  ${LIB_FSFW_NAME} PRIVATE ParameterHelper.cpp ParameterMessage.cpp
+                           ParameterWrapper.cpp)
diff --git a/src/fsfw/power/CMakeLists.txt b/src/fsfw/power/CMakeLists.txt
index e195b1c0..b4ab0006 100644
--- a/src/fsfw/power/CMakeLists.txt
+++ b/src/fsfw/power/CMakeLists.txt
@@ -1,8 +1,4 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
-    Fuse.cpp
-    PowerComponent.cpp
-    PowerSensor.cpp
-    PowerSwitcher.cpp
-    DummyPowerSwitcher.cpp
-    PowerSwitcherComponent.cpp
-)
\ No newline at end of file
+target_sources(
+  ${LIB_FSFW_NAME}
+  PRIVATE Fuse.cpp PowerComponent.cpp PowerSensor.cpp PowerSwitcher.cpp
+          DummyPowerSwitcher.cpp PowerSwitcherComponent.cpp)
diff --git a/src/fsfw/pus/CMakeLists.txt b/src/fsfw/pus/CMakeLists.txt
index 8b55adf0..35b35bea 100644
--- a/src/fsfw/pus/CMakeLists.txt
+++ b/src/fsfw/pus/CMakeLists.txt
@@ -1,12 +1,12 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE 
-    Service1TelecommandVerification.cpp
-    Service2DeviceAccess.cpp
-    Service3Housekeeping.cpp
-    Service5EventReporting.cpp
-    Service8FunctionManagement.cpp
-    Service9TimeManagement.cpp
-    Service17Test.cpp
-    Service20ParameterManagement.cpp
-    CService200ModeCommanding.cpp
-    CService201HealthCommanding.cpp
-)
\ No newline at end of file
+target_sources(
+  ${LIB_FSFW_NAME}
+  PRIVATE Service1TelecommandVerification.cpp
+          Service2DeviceAccess.cpp
+          Service3Housekeeping.cpp
+          Service5EventReporting.cpp
+          Service8FunctionManagement.cpp
+          Service9TimeManagement.cpp
+          Service17Test.cpp
+          Service20ParameterManagement.cpp
+          CService200ModeCommanding.cpp
+          CService201HealthCommanding.cpp)
diff --git a/src/fsfw/rmap/CMakeLists.txt b/src/fsfw/rmap/CMakeLists.txt
index 78c99e42..44184860 100644
--- a/src/fsfw/rmap/CMakeLists.txt
+++ b/src/fsfw/rmap/CMakeLists.txt
@@ -1,7 +1,2 @@
-target_sources(${LIB_FSFW_NAME} 
-	PRIVATE 
-		RMAP.cpp
-		RMAPCookie.cpp
-		RmapDeviceCommunicationIF.cpp
-)
-
+target_sources(${LIB_FSFW_NAME} PRIVATE RMAP.cpp RMAPCookie.cpp
+                                        RmapDeviceCommunicationIF.cpp)
diff --git a/src/fsfw/serialize/CMakeLists.txt b/src/fsfw/serialize/CMakeLists.txt
index fc2387e8..5ac92d7f 100644
--- a/src/fsfw/serialize/CMakeLists.txt
+++ b/src/fsfw/serialize/CMakeLists.txt
@@ -1,4 +1 @@
-target_sources(${LIB_FSFW_NAME} 
-	PRIVATE 
-		SerialBufferAdapter.cpp
-)
\ No newline at end of file
+target_sources(${LIB_FSFW_NAME} PRIVATE SerialBufferAdapter.cpp)
diff --git a/src/fsfw/serviceinterface/CMakeLists.txt b/src/fsfw/serviceinterface/CMakeLists.txt
index 84c79177..df3f074e 100644
--- a/src/fsfw/serviceinterface/CMakeLists.txt
+++ b/src/fsfw/serviceinterface/CMakeLists.txt
@@ -1,5 +1,4 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE 
-	ServiceInterfaceStream.cpp
-	ServiceInterfaceBuffer.cpp
-	ServiceInterfacePrinter.cpp
-)
\ No newline at end of file
+target_sources(
+  ${LIB_FSFW_NAME}
+  PRIVATE ServiceInterfaceStream.cpp ServiceInterfaceBuffer.cpp
+          ServiceInterfacePrinter.cpp)
diff --git a/src/fsfw/storagemanager/CMakeLists.txt b/src/fsfw/storagemanager/CMakeLists.txt
index b8138cae..50ce50ed 100644
--- a/src/fsfw/storagemanager/CMakeLists.txt
+++ b/src/fsfw/storagemanager/CMakeLists.txt
@@ -1,7 +1,3 @@
-target_sources(${LIB_FSFW_NAME} 
-	PRIVATE 
-		ConstStorageAccessor.cpp
-		StorageAccessor.cpp
-		LocalPool.cpp
-		PoolManager.cpp
-)
\ No newline at end of file
+target_sources(
+  ${LIB_FSFW_NAME} PRIVATE ConstStorageAccessor.cpp StorageAccessor.cpp
+                           LocalPool.cpp PoolManager.cpp)
diff --git a/src/fsfw/subsystem/CMakeLists.txt b/src/fsfw/subsystem/CMakeLists.txt
index 5c98ee70..164c90f7 100644
--- a/src/fsfw/subsystem/CMakeLists.txt
+++ b/src/fsfw/subsystem/CMakeLists.txt
@@ -1,7 +1,3 @@
-target_sources(${LIB_FSFW_NAME} 
-	PRIVATE 
-		Subsystem.cpp
-		SubsystemBase.cpp
-)
+target_sources(${LIB_FSFW_NAME} PRIVATE Subsystem.cpp SubsystemBase.cpp)
 
-add_subdirectory(modes)
\ No newline at end of file
+add_subdirectory(modes)
diff --git a/src/fsfw/subsystem/modes/CMakeLists.txt b/src/fsfw/subsystem/modes/CMakeLists.txt
index 6ac6a293..ba57de2c 100644
--- a/src/fsfw/subsystem/modes/CMakeLists.txt
+++ b/src/fsfw/subsystem/modes/CMakeLists.txt
@@ -1,5 +1 @@
-target_sources(${LIB_FSFW_NAME} 
-	PRIVATE 
-		ModeSequenceMessage.cpp
-		ModeStore.cpp
-)
+target_sources(${LIB_FSFW_NAME} PRIVATE ModeSequenceMessage.cpp ModeStore.cpp)
diff --git a/src/fsfw/tasks/CMakeLists.txt b/src/fsfw/tasks/CMakeLists.txt
index 1964bb4e..df69520a 100644
--- a/src/fsfw/tasks/CMakeLists.txt
+++ b/src/fsfw/tasks/CMakeLists.txt
@@ -1,5 +1,2 @@
-target_sources(${LIB_FSFW_NAME} 
-	PRIVATE 
-		FixedSequenceSlot.cpp
-		FixedSlotSequence.cpp
-)
\ No newline at end of file
+target_sources(${LIB_FSFW_NAME} PRIVATE FixedSequenceSlot.cpp
+                                        FixedSlotSequence.cpp)
diff --git a/src/fsfw/tcdistribution/CMakeLists.txt b/src/fsfw/tcdistribution/CMakeLists.txt
index 7118c38c..ab32c509 100644
--- a/src/fsfw/tcdistribution/CMakeLists.txt
+++ b/src/fsfw/tcdistribution/CMakeLists.txt
@@ -1,9 +1,4 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE 
-    CCSDSDistributor.cpp
-    PUSDistributor.cpp
-    TcDistributor.cpp
-    TcPacketCheckPUS.cpp
-    TcPacketCheckCFDP.cpp
-    CFDPDistributor.cpp
-)
-
+target_sources(
+  ${LIB_FSFW_NAME}
+  PRIVATE CCSDSDistributor.cpp PUSDistributor.cpp TcDistributor.cpp
+          TcPacketCheckPUS.cpp TcPacketCheckCFDP.cpp CFDPDistributor.cpp)
diff --git a/src/fsfw/thermal/CMakeLists.txt b/src/fsfw/thermal/CMakeLists.txt
index ad532721..995ebc4d 100644
--- a/src/fsfw/thermal/CMakeLists.txt
+++ b/src/fsfw/thermal/CMakeLists.txt
@@ -1,10 +1,9 @@
-target_sources(${LIB_FSFW_NAME} 
-	PRIVATE 
-		AbstractTemperatureSensor.cpp
-		Heater.cpp
-		RedundantHeater.cpp
-		ThermalComponentCore.cpp
-		ThermalComponent.cpp
-		ThermalModule.cpp
-		ThermalMonitorReporter.cpp
-)
+target_sources(
+  ${LIB_FSFW_NAME}
+  PRIVATE AbstractTemperatureSensor.cpp
+          Heater.cpp
+          RedundantHeater.cpp
+          ThermalComponentCore.cpp
+          ThermalComponent.cpp
+          ThermalModule.cpp
+          ThermalMonitorReporter.cpp)
diff --git a/src/fsfw/timemanager/CMakeLists.txt b/src/fsfw/timemanager/CMakeLists.txt
index 00467772..c4f77395 100644
--- a/src/fsfw/timemanager/CMakeLists.txt
+++ b/src/fsfw/timemanager/CMakeLists.txt
@@ -1,8 +1,3 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
-    CCSDSTime.cpp
-    Countdown.cpp
-    Stopwatch.cpp
-    TimeMessage.cpp
-    TimeStamper.cpp
-    ClockCommon.cpp
-)
+target_sources(
+  ${LIB_FSFW_NAME} PRIVATE CCSDSTime.cpp Countdown.cpp Stopwatch.cpp
+                           TimeMessage.cpp TimeStamper.cpp ClockCommon.cpp)
diff --git a/src/fsfw/tmstorage/CMakeLists.txt b/src/fsfw/tmstorage/CMakeLists.txt
index 7990d85a..80da7faf 100644
--- a/src/fsfw/tmstorage/CMakeLists.txt
+++ b/src/fsfw/tmstorage/CMakeLists.txt
@@ -1,4 +1 @@
-target_sources(${LIB_FSFW_NAME} 
-	PRIVATE 
-		TmStoreMessage.cpp
-)
+target_sources(${LIB_FSFW_NAME} PRIVATE TmStoreMessage.cpp)
diff --git a/src/fsfw/tmtcpacket/CMakeLists.txt b/src/fsfw/tmtcpacket/CMakeLists.txt
index e1deaba9..196ba752 100644
--- a/src/fsfw/tmtcpacket/CMakeLists.txt
+++ b/src/fsfw/tmtcpacket/CMakeLists.txt
@@ -1,8 +1,5 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE 
-    SpacePacket.cpp
-    SpacePacketBase.cpp
-)
+target_sources(${LIB_FSFW_NAME} PRIVATE SpacePacket.cpp SpacePacketBase.cpp)
 
 add_subdirectory(cfdp)
 add_subdirectory(packetmatcher)
-add_subdirectory(pus)
\ No newline at end of file
+add_subdirectory(pus)
diff --git a/src/fsfw/tmtcpacket/cfdp/CMakeLists.txt b/src/fsfw/tmtcpacket/cfdp/CMakeLists.txt
index 0b7ab18a..7d20aab8 100644
--- a/src/fsfw/tmtcpacket/cfdp/CMakeLists.txt
+++ b/src/fsfw/tmtcpacket/cfdp/CMakeLists.txt
@@ -1,4 +1 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE    
-    CFDPPacket.cpp
-    CFDPPacketStored.cpp
-)
+target_sources(${LIB_FSFW_NAME} PRIVATE CFDPPacket.cpp CFDPPacketStored.cpp)
diff --git a/src/fsfw/tmtcpacket/packetmatcher/CMakeLists.txt b/src/fsfw/tmtcpacket/packetmatcher/CMakeLists.txt
index e9a8d03b..6ea94799 100644
--- a/src/fsfw/tmtcpacket/packetmatcher/CMakeLists.txt
+++ b/src/fsfw/tmtcpacket/packetmatcher/CMakeLists.txt
@@ -1,4 +1 @@
-target_sources(${LIB_FSFW_NAME} 
-	PRIVATE 
-		PacketMatchTree.cpp
-)
+target_sources(${LIB_FSFW_NAME} PRIVATE PacketMatchTree.cpp)
diff --git a/src/fsfw/tmtcpacket/pus/tc/CMakeLists.txt b/src/fsfw/tmtcpacket/pus/tc/CMakeLists.txt
index dc611263..09c63bfd 100644
--- a/src/fsfw/tmtcpacket/pus/tc/CMakeLists.txt
+++ b/src/fsfw/tmtcpacket/pus/tc/CMakeLists.txt
@@ -1,6 +1,3 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE    
-    TcPacketPusBase.cpp
-    TcPacketPus.cpp
-    TcPacketStoredBase.cpp
-    TcPacketStoredPus.cpp
-)
+target_sources(
+  ${LIB_FSFW_NAME} PRIVATE TcPacketPusBase.cpp TcPacketPus.cpp
+                           TcPacketStoredBase.cpp TcPacketStoredPus.cpp)
diff --git a/src/fsfw/tmtcpacket/pus/tm/CMakeLists.txt b/src/fsfw/tmtcpacket/pus/tm/CMakeLists.txt
index ace87820..ded74ce2 100644
--- a/src/fsfw/tmtcpacket/pus/tm/CMakeLists.txt
+++ b/src/fsfw/tmtcpacket/pus/tm/CMakeLists.txt
@@ -1,9 +1,9 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
-    TmPacketStoredPusA.cpp
-    TmPacketStoredPusC.cpp
-    TmPacketPusA.cpp
-    TmPacketPusC.cpp
-    TmPacketStoredBase.cpp
-    TmPacketBase.cpp
-    TmPacketMinimal.cpp
-)
+target_sources(
+  ${LIB_FSFW_NAME}
+  PRIVATE TmPacketStoredPusA.cpp
+          TmPacketStoredPusC.cpp
+          TmPacketPusA.cpp
+          TmPacketPusC.cpp
+          TmPacketStoredBase.cpp
+          TmPacketBase.cpp
+          TmPacketMinimal.cpp)
diff --git a/src/fsfw/tmtcservices/CMakeLists.txt b/src/fsfw/tmtcservices/CMakeLists.txt
index 96cf99b5..d2a3f4ed 100644
--- a/src/fsfw/tmtcservices/CMakeLists.txt
+++ b/src/fsfw/tmtcservices/CMakeLists.txt
@@ -1,10 +1,9 @@
-target_sources(${LIB_FSFW_NAME} 
-	PRIVATE 
-		CommandingServiceBase.cpp
-		PusServiceBase.cpp
-		PusVerificationReport.cpp
-		TmTcBridge.cpp
-		TmTcMessage.cpp
-		VerificationReporter.cpp
-		SpacePacketParser.cpp
-)
\ No newline at end of file
+target_sources(
+  ${LIB_FSFW_NAME}
+  PRIVATE CommandingServiceBase.cpp
+          PusServiceBase.cpp
+          PusVerificationReport.cpp
+          TmTcBridge.cpp
+          TmTcMessage.cpp
+          VerificationReporter.cpp
+          SpacePacketParser.cpp)
-- 
2.43.0


From c379f8671d49d4903cbb154ed524873c3a6b06e9 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Fri, 13 May 2022 18:10:10 +0200
Subject: [PATCH 2/4] added all new configuration classes

---
 src/fsfw/devicehandlers/DeviceHandlerBase.h |  6 +-
 src/fsfw/devicehandlers/DhbCfgHelpers.cpp   |  1 -
 src/fsfw/devicehandlers/DhbCfgHelpers.h     | 63 +++++++++++++++++++--
 3 files changed, 62 insertions(+), 8 deletions(-)
 delete mode 100644 src/fsfw/devicehandlers/DhbCfgHelpers.cpp

diff --git a/src/fsfw/devicehandlers/DeviceHandlerBase.h b/src/fsfw/devicehandlers/DeviceHandlerBase.h
index 34171067..3174fb0b 100644
--- a/src/fsfw/devicehandlers/DeviceHandlerBase.h
+++ b/src/fsfw/devicehandlers/DeviceHandlerBase.h
@@ -7,6 +7,8 @@
 #include "DeviceHandlerFailureIsolation.h"
 #include "DeviceHandlerIF.h"
 #include "DeviceHandlerThermalSet.h"
+#include "DhbCfgHelpers.h"
+
 #include "fsfw/action/ActionHelper.h"
 #include "fsfw/action/HasActionsIF.h"
 #include "fsfw/datapool/PoolVariableIF.h"
@@ -488,9 +490,7 @@ class DeviceHandlerBase : public DeviceHandlerIF,
    * @return - @c RETURN_OK when the command was successfully inserted,
    *         - @c RETURN_FAILED else.
    */
-  ReturnValue_t insertInCommandMap(DeviceCommandId_t deviceCommand,
-                                   bool useAlternativeReply = false,
-                                   DeviceCommandId_t alternativeReplyId = 0);
+  ReturnValue_t insertInCommandMap(CmdCfg cfg);
 
   /**
    * Enables a periodic reply for a given command. It sets to delay cycles to the specified
diff --git a/src/fsfw/devicehandlers/DhbCfgHelpers.cpp b/src/fsfw/devicehandlers/DhbCfgHelpers.cpp
deleted file mode 100644
index c8a60bb1..00000000
--- a/src/fsfw/devicehandlers/DhbCfgHelpers.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "DhbCfgHelpers.h"
diff --git a/src/fsfw/devicehandlers/DhbCfgHelpers.h b/src/fsfw/devicehandlers/DhbCfgHelpers.h
index b560f445..8301db16 100644
--- a/src/fsfw/devicehandlers/DhbCfgHelpers.h
+++ b/src/fsfw/devicehandlers/DhbCfgHelpers.h
@@ -1,12 +1,67 @@
 #ifndef FSFW_SRC_FSFW_DEVICEHANDLERS_DHBCFGHELPERS_H_
 #define FSFW_SRC_FSFW_DEVICEHANDLERS_DHBCFGHELPERS_H_
 
-struct CfgBase {};
+/**
+ * @brief   This is the base class for configuration related to both DHB commands, replies and their
+ *          combination
+ */
+struct CfgBase {
+public:
+  explicit CfgBase(DeviceCommandId_t cmdAndOrReplyId): cmdAndOrReplyId(cmdAndOrReplyId) {};
+  DeviceCommandId_t cmdAndOrReplyId;
+};
 
-struct CmdCfg {};
+/**
+ * @brief   Configuration class for commands
+ */
+struct CmdCfg {
+public:
+  explicit CmdCfg(DeviceCommandId_t cmdId): baseCfg(cmdId) {};
 
-struct ReplyCfg {};
+  CfgBase baseCfg;
+  //! This can be used if a command can trigger multiple replies
+  std::pair<bool, DeviceCommandId_t> alternativeReply = {false, DeviceHandlerIF::NO_COMMAND_ID};
+};
 
-struct CmdReplyCfg {};
+/**
+ * @brief   Configuration class for replies
+ */
+struct ReplyCfg {
+public:
+  ReplyCfg(DeviceCommandId_t replyId, uint16_t maxDelayCycles);
+  ReplyCfg(DeviceCommandId_t replyId, uint16_t maxDelayCycles);
+  CfgBase baseCfg;
+  //! A data set can be mapped to a reply ID. This allows to omit the #getDataSetHandle
+  //! override in a user device handler as this pointer will be passed as long as the device
+  //! command ID is equal to the set ID.
+  LocalPoolDataSetBase* dataSet = nullptr;
+  //! For Command-Reply combinations:
+  //! The maximum number of cycles the handler should wait for a reply
+  //! to this command.
+  //!
+  //! Reply Only:
+  //! For periodic replies, this variable will be the number of delay cycles between the replies.
+  //! For the non-periodic variant, this variable is not used as there is no meaningful
+  //! definition for delay
+  uint16_t maxDelayCycles = 0;
+  //! First parameter: Specify whether reply is arriving periodically
+  //! Second parameter: Specify whether periodic reply should be enabled immediately
+  std::pair<bool, bool> periodicCfg = {false, false};
+  //! If a reply needs to be requested with a specific length, the length can be specified here
+  size_t replyLen = 0;
+  //! It is also possible to use a time based instead of a cycle based mechanism to specify
+  //! how long a reply takes. For non-periodic replies without a command, this variable is not used.
+  Countdown* countdown = nullptr;
+};
+
+/**
+ * @brief   Configuration class for commands and replies
+ */
+struct CmdReplyCfg {
+public:
+  CmdReplyCfg(CmdCfg cmdCfg, ReplyCfg replyCfg): cmdCfg(cmdCfg), replyCfg(replyCfg) {}
+  CmdCfg cmdCfg;
+  ReplyCfg replyCfg;
+};
 
 #endif /* FSFW_SRC_FSFW_DEVICEHANDLERS_DHBCFGHELPERS_H_ */
-- 
2.43.0


From bb640f87580da53b3cef3a3804f7a0df4add26ab Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Fri, 13 May 2022 18:15:15 +0200
Subject: [PATCH 3/4] some ctors

---
 src/fsfw/devicehandlers/DeviceHandlerBase.h |  5 +++--
 src/fsfw/devicehandlers/DhbCfgHelpers.h     | 23 +++++++++++++--------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/fsfw/devicehandlers/DeviceHandlerBase.h b/src/fsfw/devicehandlers/DeviceHandlerBase.h
index 3174fb0b..254d7db8 100644
--- a/src/fsfw/devicehandlers/DeviceHandlerBase.h
+++ b/src/fsfw/devicehandlers/DeviceHandlerBase.h
@@ -8,7 +8,6 @@
 #include "DeviceHandlerIF.h"
 #include "DeviceHandlerThermalSet.h"
 #include "DhbCfgHelpers.h"
-
 #include "fsfw/action/ActionHelper.h"
 #include "fsfw/action/HasActionsIF.h"
 #include "fsfw/datapool/PoolVariableIF.h"
@@ -490,7 +489,9 @@ class DeviceHandlerBase : public DeviceHandlerIF,
    * @return - @c RETURN_OK when the command was successfully inserted,
    *         - @c RETURN_FAILED else.
    */
-  ReturnValue_t insertInCommandMap(CmdCfg cfg);
+  ReturnValue_t insertInCommandMap(
+      DeviceCommandId_t deviceCommand, bool useAlternativeReply = false,
+      DeviceCommandId_t alternativeReplyId = DeviceHandlerIF::NO_COMMAND_ID);
 
   /**
    * Enables a periodic reply for a given command. It sets to delay cycles to the specified
diff --git a/src/fsfw/devicehandlers/DhbCfgHelpers.h b/src/fsfw/devicehandlers/DhbCfgHelpers.h
index 8301db16..fd838297 100644
--- a/src/fsfw/devicehandlers/DhbCfgHelpers.h
+++ b/src/fsfw/devicehandlers/DhbCfgHelpers.h
@@ -6,8 +6,8 @@
  *          combination
  */
 struct CfgBase {
-public:
-  explicit CfgBase(DeviceCommandId_t cmdAndOrReplyId): cmdAndOrReplyId(cmdAndOrReplyId) {};
+ public:
+  explicit CfgBase(DeviceCommandId_t cmdAndOrReplyId) : cmdAndOrReplyId(cmdAndOrReplyId){};
   DeviceCommandId_t cmdAndOrReplyId;
 };
 
@@ -15,8 +15,8 @@ public:
  * @brief   Configuration class for commands
  */
 struct CmdCfg {
-public:
-  explicit CmdCfg(DeviceCommandId_t cmdId): baseCfg(cmdId) {};
+ public:
+  explicit CmdCfg(DeviceCommandId_t cmdId) : baseCfg(cmdId){};
 
   CfgBase baseCfg;
   //! This can be used if a command can trigger multiple replies
@@ -27,9 +27,14 @@ public:
  * @brief   Configuration class for replies
  */
 struct ReplyCfg {
-public:
-  ReplyCfg(DeviceCommandId_t replyId, uint16_t maxDelayCycles);
-  ReplyCfg(DeviceCommandId_t replyId, uint16_t maxDelayCycles);
+ public:
+  ReplyCfg(DeviceCommandId_t replyId, uint16_t maxDelayCycles)
+      : baseCfg(replyId), maxDelayCycles(maxDelayCycles){};
+  ReplyCfg(DeviceCommandId_t replyId, uint16_t maxDelayCycles, LocalPoolDataSetBase* set)
+      : ReplyCfg(replyId, maxDelayCycles) {
+    dataSet = set;
+  };
+
   CfgBase baseCfg;
   //! A data set can be mapped to a reply ID. This allows to omit the #getDataSetHandle
   //! override in a user device handler as this pointer will be passed as long as the device
@@ -58,8 +63,8 @@ public:
  * @brief   Configuration class for commands and replies
  */
 struct CmdReplyCfg {
-public:
-  CmdReplyCfg(CmdCfg cmdCfg, ReplyCfg replyCfg): cmdCfg(cmdCfg), replyCfg(replyCfg) {}
+ public:
+  CmdReplyCfg(CmdCfg cmdCfg, ReplyCfg replyCfg) : cmdCfg(cmdCfg), replyCfg(replyCfg) {}
   CmdCfg cmdCfg;
   ReplyCfg replyCfg;
 };
-- 
2.43.0


From 1e8ff8d02c3f2319d2c2e19b57eee1e87b6d76b0 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Fri, 8 Jul 2022 17:38:43 +0200
Subject: [PATCH 4/4] tweak changelog

---
 CHANGELOG.md | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ba6d754..1676b812 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,12 +19,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Bump C++ required version to C++17. Every project which uses the FSFW and every modern
   compiler supports it
   PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/622
-- HAL Linux SPI: Set the Clock Default State when setting new SPI speed
-  and mode
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/573
-- GPIO HAL: `Direction`, `GpioOperation` and `Levels` are enum classes now, which prevents
-  name clashes with Windows defines.
-  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/572
 - New CMake option `FSFW_HAL_LINUX_ADD_LIBGPIOD` to specifically exclude `gpiod` code.
   PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/572
 - HAL Devicehandlers: Periodic printout is run-time configurable now
@@ -91,6 +85,7 @@ PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/636
   PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/572
 - HAL Linux Uart: Baudrate and bits per word are enums now, avoiding misconfigurations
   PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/585
+- Linux HAL: Add wiretapping option for I2C. Enabled with `FSFW_HAL_I2C_WIRETAPPING` defined to 1
 
 ### Time
 
@@ -139,7 +134,6 @@ https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/593
     - https://gitlab.kitware.com/cmake/cmake/-/issues/21696
   Easiest solution for now: Keep this option OFF by default.
   PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/616
-- Linux HAL: Add wiretapping option for I2C. Enabled with `FSFW_HAL_I2C_WIRETAPPING` defined to 1
 - Dedicated Version class and constant `fsfw::FSFW_VERSION` containing version information
   inside `fsfw/version.h`
   PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/559
-- 
2.43.0