From 8a5090b8ee4bedb2f926839db9676eb187e76e11 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Tue, 17 May 2022 13:40:19 +0200
Subject: [PATCH] apply new auto-formatter on all files

---
 CMakeLists.txt                                | 564 +++++++++---------
 bsp_egse/CMakeLists.txt                       |   6 +-
 bsp_egse/boardconfig/CMakeLists.txt           |   8 +-
 bsp_hosted/CMakeLists.txt                     |   6 +-
 bsp_hosted/boardconfig/CMakeLists.txt         |  11 +-
 bsp_hosted/comIF/CMakeLists.txt               |   9 +-
 bsp_hosted/fsfwconfig/CMakeLists.txt          |  24 +-
 bsp_linux_board/CMakeLists.txt                |   8 +-
 bsp_linux_board/boardconfig/CMakeLists.txt    |   8 +-
 bsp_linux_board/boardtest/CMakeLists.txt      |   7 +-
 bsp_q7s/CMakeLists.txt                        |  23 +-
 bsp_q7s/boardconfig/CMakeLists.txt            |  13 +-
 bsp_q7s/boardtest/CMakeLists.txt              |  11 +-
 bsp_q7s/callbacks/CMakeLists.txt              |   8 +-
 bsp_q7s/comIF/CMakeLists.txt                  |   7 +-
 bsp_q7s/core/CMakeLists.txt                   |  11 +-
 bsp_q7s/em/CMakeLists.txt                     |   4 +-
 bsp_q7s/memory/CMakeLists.txt                 |   8 +-
 bsp_q7s/simple/CMakeLists.txt                 |   4 +-
 bsp_q7s/xadc/CMakeLists.txt                   |   4 +-
 common/config/CMakeLists.txt                  |   8 +-
 common/config/ccsdsConfig.h                   |   9 +-
 common/config/commonClassIds.h                |  59 +-
 common/config/commonConfig.cpp                |   8 +-
 common/config/commonConfig.h.in               |   2 +-
 common/config/commonObjects.h                 | 211 ++++---
 common/config/commonSubsystemIds.h            |  59 +-
 common/config/devConf.h                       |   7 +-
 common/config/devices/heaterSwitcherList.h    |  22 +-
 common/config/eive/definitions.h              |   3 +-
 common/config/tmtc/apid.h                     |   3 +-
 fsfw                                          |   2 +-
 linux/CMakeLists.txt                          |   4 +-
 linux/boardtest/CMakeLists.txt                |  12 +-
 linux/callbacks/CMakeLists.txt                |   4 +-
 linux/csp/CMakeLists.txt                      |   9 +-
 linux/devices/CMakeLists.txt                  |   4 +-
 .../PlocSupervisorDefinitions.h               |   5 +-
 linux/devices/ploc/CMakeLists.txt             |  11 +-
 linux/devices/ploc/PlocSupervisorHandler.cpp  |   3 +-
 linux/devices/startracker/CMakeLists.txt      |  11 +-
 linux/fsfwconfig/CMakeLists.txt               |  26 +-
 linux/obc/CMakeLists.txt                      |  13 +-
 linux/utility/CMakeLists.txt                  |   8 +-
 mission/controller/CMakeLists.txt             |   4 +-
 mission/core/CMakeLists.txt                   |   6 +-
 mission/devices/CMakeLists.txt                |  42 +-
 mission/memory/CMakeLists.txt                 |   6 +-
 mission/system/CMakeLists.txt                 |  27 +-
 mission/system/fdir/CMakeLists.txt            |  10 +-
 mission/tmtc/CMakeLists.txt                   |   7 +-
 mission/utility/CMakeLists.txt                |  10 +-
 scripts/apply-clang-format.sh                 |  14 -
 scripts/auto-formatter.sh                     |  40 ++
 test/gpio/CMakeLists.txt                      |   8 +-
 test/testtasks/CMakeLists.txt                 |   8 +-
 tmtc                                          |   2 +-
 57 files changed, 634 insertions(+), 797 deletions(-)
 delete mode 100755 scripts/apply-clang-format.sh
 create mode 100755 scripts/auto-formatter.sh

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2443ec69..eb44bd41 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,12 +1,12 @@
-################################################################################
+# ##############################################################################
 # CMake support for the EIVE OBSW
-# 
+#
 # Author: R. Mueller
-################################################################################
+# ##############################################################################
 
-################################################################################
+# ##############################################################################
 # Pre-Project preparation
-################################################################################
+# ##############################################################################
 cmake_minimum_required(VERSION 3.13)
 
 set(OBSW_VERSION_MAJOR_IF_GIT_FAILS 0)
@@ -15,28 +15,36 @@ set(OBSW_VERSION_REVISION_IF_GIT_FAILS 0)
 
 # set(CMAKE_VERBOSE TRUE)
 
-option(EIVE_HARDCODED_TOOLCHAIN_FILE "\
+option(
+  EIVE_HARDCODED_TOOLCHAIN_FILE
+  "\
 For Linux Board Target BSPs, a default toolchain file will be set. Should be set to OFF \
-if a different toolchain file is set externally" ON
-)
+if a different toolchain file is set externally"
+  ON)
 
 if(NOT FSFW_OSAL)
-    set(FSFW_OSAL linux CACHE STRING "OS for the FSFW.")
+  set(FSFW_OSAL
+      linux
+      CACHE STRING "OS for the FSFW.")
 endif()
 
 if(TGT_BSP)
-    if(TGT_BSP MATCHES "arm/q7s" OR TGT_BSP MATCHES "arm/raspberrypi" OR TGT_BSP MATCHES "arm/beagleboneblack")
-        option(LINUX_CROSS_COMPILE ON)
-    endif()
-    if(TGT_BSP MATCHES "arm/raspberrypi" OR TGT_BSP MATCHES "arm/beagleboneblack")
-        option(EIVE_BUILD_GPSD_GPS_HANDLER "Build GPSD dependent GPS Handler" OFF)
-    elseif(TGT_BSP MATCHES "arm/q7s")
-        option(EIVE_Q7S_EM "Build configuration for the EM" OFF)
-        option(EIVE_BUILD_GPSD_GPS_HANDLER "Build GPSD dependent GPS Handler" ON)
-    endif()
-    option(EIVE_CREATE_UNIQUE_OBSW_BIN "Append username to generated binary name" ON)
+  if(TGT_BSP MATCHES "arm/q7s"
+     OR TGT_BSP MATCHES "arm/raspberrypi"
+     OR TGT_BSP MATCHES "arm/beagleboneblack")
+    option(LINUX_CROSS_COMPILE ON)
+  endif()
+  if(TGT_BSP MATCHES "arm/raspberrypi" OR TGT_BSP MATCHES "arm/beagleboneblack")
+    option(EIVE_BUILD_GPSD_GPS_HANDLER "Build GPSD dependent GPS Handler" OFF)
+  elseif(TGT_BSP MATCHES "arm/q7s")
+    option(EIVE_Q7S_EM "Build configuration for the EM" OFF)
+    option(EIVE_BUILD_GPSD_GPS_HANDLER "Build GPSD dependent GPS Handler" ON)
+  endif()
+  option(EIVE_CREATE_UNIQUE_OBSW_BIN "Append username to generated binary name"
+         ON)
 else()
-    option(EIVE_CREATE_UNIQUE_OBSW_BIN "Append username to generated binary name" OFF)
+  option(EIVE_CREATE_UNIQUE_OBSW_BIN "Append username to generated binary name"
+         OFF)
 endif()
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
@@ -57,60 +65,96 @@ option(EIVE_ADD_ETL_LIB "Add ETL library" ON)
 option(EIVE_ADD_JSON_LIB "Add JSON library" ON)
 
 if(EIVE_Q7S_EM)
-    set(OBSW_Q7S_EM 1 CACHE STRING "Q7S EM configuration")
-    set(INIT_VAL 0)
+  set(OBSW_Q7S_EM
+      1
+      CACHE STRING "Q7S EM configuration")
+  set(INIT_VAL 0)
 else()
-    set(OBSW_Q7S_EM 0 CACHE STRING "Q7S EM configuration")
-    set(INIT_VAL 1)
+  set(OBSW_Q7S_EM
+      0
+      CACHE STRING "Q7S EM configuration")
+  set(INIT_VAL 1)
 endif()
-set(OBSW_ADD_MGT ${INIT_VAL} CACHE STRING "Add MGT module" )
-set(OBSW_ADD_BPX_BATTERY_HANDLER ${INIT_VAL} CACHE STRING "Add MGT module")
-set(OBSW_ADD_STAR_TRACKER ${INIT_VAL} CACHE STRING "Add Startracker module")
-set(OBSW_ADD_SUN_SENSORS ${INIT_VAL} CACHE STRING "Add sun sensor module")
-set(OBSW_ADD_SUS_BOARD_ASS ${INIT_VAL} CACHE STRING "Add sun sensor board assembly")
-set(OBSW_ADD_ACS_BOARD ${INIT_VAL} CACHE STRING "Add ACS board module")
-set(OBSW_ADD_ACS_HANDLERS ${INIT_VAL} CACHE STRING "Add ACS handlers")
-set(OBSW_ADD_RTD_DEVICES ${INIT_VAL} CACHE STRING "Add RTD devices")
-set(OBSW_ADD_RAD_SENSORS ${INIT_VAL} CACHE STRING "Add Rad Sensor module")
-set(OBSW_ADD_PL_PCDU ${INIT_VAL} CACHE STRING "Add Payload PCDU modukle")
-set(OBSW_ADD_SYRLINKS ${INIT_VAL} CACHE STRING "Add Syrlinks module")
-set(OBSW_ADD_TMP_DEVICES ${INIT_VAL} CACHE STRING "Add TMP devices")
-set(OBSW_ADD_GOMSPACE_PCDU ${INIT_VAL} CACHE STRING "Add GomSpace PCDU modules")
-set(OBSW_ADD_RW ${INIT_VAL} CACHE STRING "Add RW modules")
+set(OBSW_ADD_MGT
+    ${INIT_VAL}
+    CACHE STRING "Add MGT module")
+set(OBSW_ADD_BPX_BATTERY_HANDLER
+    ${INIT_VAL}
+    CACHE STRING "Add MGT module")
+set(OBSW_ADD_STAR_TRACKER
+    ${INIT_VAL}
+    CACHE STRING "Add Startracker module")
+set(OBSW_ADD_SUN_SENSORS
+    ${INIT_VAL}
+    CACHE STRING "Add sun sensor module")
+set(OBSW_ADD_SUS_BOARD_ASS
+    ${INIT_VAL}
+    CACHE STRING "Add sun sensor board assembly")
+set(OBSW_ADD_ACS_BOARD
+    ${INIT_VAL}
+    CACHE STRING "Add ACS board module")
+set(OBSW_ADD_ACS_HANDLERS
+    ${INIT_VAL}
+    CACHE STRING "Add ACS handlers")
+set(OBSW_ADD_RTD_DEVICES
+    ${INIT_VAL}
+    CACHE STRING "Add RTD devices")
+set(OBSW_ADD_RAD_SENSORS
+    ${INIT_VAL}
+    CACHE STRING "Add Rad Sensor module")
+set(OBSW_ADD_PL_PCDU
+    ${INIT_VAL}
+    CACHE STRING "Add Payload PCDU modukle")
+set(OBSW_ADD_SYRLINKS
+    ${INIT_VAL}
+    CACHE STRING "Add Syrlinks module")
+set(OBSW_ADD_TMP_DEVICES
+    ${INIT_VAL}
+    CACHE STRING "Add TMP devices")
+set(OBSW_ADD_GOMSPACE_PCDU
+    ${INIT_VAL}
+    CACHE STRING "Add GomSpace PCDU modules")
+set(OBSW_ADD_RW
+    ${INIT_VAL}
+    CACHE STRING "Add RW modules")
 
-################################################################################
+# ##############################################################################
 # Pre-Sources preparation
-################################################################################
+# ##############################################################################
 
 # Version handling
 set(GIT_VER_HANDLING_OK FALSE)
 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
-    determine_version_with_git("--exclude" "docker_*")
-    set(GIT_INFO ${GIT_INFO} CACHE STRING "Version information retrieved with git describe")
-    if(GIT_INFO)
-        set(GIT_INFO ${GIT_INFO} CACHE STRING "Version information retrieved with git describe")
-        list(GET GIT_INFO 1 OBSW_VERSION_MAJOR)
-        list(GET GIT_INFO 2 OBSW_VERSION_MINOR)
-        list(GET GIT_INFO 3 OBSW_VERSION_REVISION)
-        list(GET GIT_INFO 4 OBSW_VERSION_CST_GIT_SHA1)
-        if(NOT OBSW_VERSION_MAJOR)
-            set(OBSW_VERSION_MAJOR ${OBSW_VERSION_MAJOR_IF_GIT_FAILS})
-        endif()
-        if(NOT OBSW_VERSION_MINOR)
-            set(FSFW_SUBVERSION ${OBSW_VERSION_MINOR_IF_GIT_FAILS})
-        endif()
-        if(NOT OBSW_VERSION_REVISION)
-            set(FSFW_REVISION ${OBSW_VERSION_REVISION_IF_GIT_FAILS})
-        endif()
-        set(GIT_VER_HANDLING_OK TRUE)
-   else()
-        set(GIT_VER_HANDLING_OK FALSE)
-   endif()
+  determine_version_with_git("--exclude" "docker_*")
+  set(GIT_INFO
+      ${GIT_INFO}
+      CACHE STRING "Version information retrieved with git describe")
+  if(GIT_INFO)
+    set(GIT_INFO
+        ${GIT_INFO}
+        CACHE STRING "Version information retrieved with git describe")
+    list(GET GIT_INFO 1 OBSW_VERSION_MAJOR)
+    list(GET GIT_INFO 2 OBSW_VERSION_MINOR)
+    list(GET GIT_INFO 3 OBSW_VERSION_REVISION)
+    list(GET GIT_INFO 4 OBSW_VERSION_CST_GIT_SHA1)
+    if(NOT OBSW_VERSION_MAJOR)
+      set(OBSW_VERSION_MAJOR ${OBSW_VERSION_MAJOR_IF_GIT_FAILS})
+    endif()
+    if(NOT OBSW_VERSION_MINOR)
+      set(FSFW_SUBVERSION ${OBSW_VERSION_MINOR_IF_GIT_FAILS})
+    endif()
+    if(NOT OBSW_VERSION_REVISION)
+      set(FSFW_REVISION ${OBSW_VERSION_REVISION_IF_GIT_FAILS})
+    endif()
+    set(GIT_VER_HANDLING_OK TRUE)
+  else()
+    set(GIT_VER_HANDLING_OK FALSE)
+  endif()
 endif()
 if(NOT GIT_VER_HANDLING_OK)
-    set(OBSW_VERSION_MAJOR ${OBSW_VERSION_MAJOR_IF_GIT_FAILS})
-    set(OBSW_VERSION_MINOR ${OBSW_VERSION_MINOR_IF_GIT_FAILS})
-    set(OBSW_VERSION_REVISION ${OBSW_VERSION_REVISION_IF_GIT_FAILS})
+  set(OBSW_VERSION_MAJOR ${OBSW_VERSION_MAJOR_IF_GIT_FAILS})
+  set(OBSW_VERSION_MINOR ${OBSW_VERSION_MINOR_IF_GIT_FAILS})
+  set(OBSW_VERSION_REVISION ${OBSW_VERSION_REVISION_IF_GIT_FAILS})
 endif()
 
 # Set names and variables
@@ -156,119 +200,113 @@ set(EIVE_ADD_LINUX_FILES False)
 pre_source_hw_os_config()
 
 if(TGT_BSP)
+  set(LIBGPS_VERSION_MAJOR 3)
+  # I assume a newer version than 3.17 will be installed on other Linux board
+  # than the Q7S
+  set(LIBGPS_VERSION_MINOR 20)
+  if(TGT_BSP MATCHES "arm/q7s"
+     OR TGT_BSP MATCHES "arm/raspberrypi"
+     OR TGT_BSP MATCHES "arm/beagleboneblack"
+     OR TGT_BSP MATCHES "arm/egse"
+     OR TGT_BSP MATCHES "arm/te0720-1cfa")
+    find_library(${LIB_GPS} gps)
+    set(FSFW_CONFIG_PATH "linux/fsfwconfig")
+    if(NOT BUILD_Q7S_SIMPLE_MODE)
+      set(EIVE_ADD_LINUX_FILES TRUE)
+      set(ADD_CSP_LIB TRUE)
+      set(FSFW_HAL_ADD_LINUX ON)
+    endif()
+  endif()
+
+  if(TGT_BSP MATCHES "arm/raspberrypi")
+    # Used by configure file
+    set(RASPBERRY_PI ON)
+    set(FSFW_HAL_ADD_RASPBERRY_PI ON)
+  endif()
+
+  if(TGT_BSP MATCHES "arm/egse")
+    # Used by configure file
+    set(EGSE ON)
+    set(FSFW_HAL_LINUX_ADD_LIBGPIOD OFF)
+    set(OBSW_ADD_STAR_TRACKER 1)
+    set(OBSW_DEBUG_STARTRACKER 1)
+  endif()
+
+  if(TGT_BSP MATCHES "arm/beagleboneblack")
+    # Used by configure file
+    set(BEAGLEBONEBLACK ON)
+  endif()
+
+  if(TGT_BSP MATCHES "arm/q7s")
+    # Used by configure file
+    set(XIPHOS_Q7S ON)
     set(LIBGPS_VERSION_MAJOR 3)
-    # I assume a newer version than 3.17 will be installed on other Linux board than the Q7S
-    set(LIBGPS_VERSION_MINOR 20)
-    if(TGT_BSP MATCHES "arm/q7s" OR TGT_BSP MATCHES "arm/raspberrypi"
-        OR TGT_BSP MATCHES "arm/beagleboneblack" OR TGT_BSP MATCHES "arm/egse" 
-        OR TGT_BSP MATCHES "arm/te0720-1cfa"
-    )
-        find_library(${LIB_GPS} gps)
-        set(FSFW_CONFIG_PATH "linux/fsfwconfig")
-        if(NOT BUILD_Q7S_SIMPLE_MODE)
-            set(EIVE_ADD_LINUX_FILES TRUE)
-            set(ADD_CSP_LIB TRUE)
-            set(FSFW_HAL_ADD_LINUX ON)
-        endif()
-    endif()
-   
-    if(TGT_BSP MATCHES "arm/raspberrypi" )
-        # Used by configure file
-        set(RASPBERRY_PI ON)
-        set(FSFW_HAL_ADD_RASPBERRY_PI ON)
-    endif()
+    set(LIBGPS_VERSION_MINOR 17)
+  endif()
 
-    if(TGT_BSP MATCHES "arm/egse")
-        # Used by configure file
-        set(EGSE ON)
-        set(FSFW_HAL_LINUX_ADD_LIBGPIOD OFF)
-        set(OBSW_ADD_STAR_TRACKER 1)
-        set(OBSW_DEBUG_STARTRACKER 1)
-    endif()
-    
-    if(TGT_BSP MATCHES "arm/beagleboneblack")
-        # Used by configure file
-        set(BEAGLEBONEBLACK ON)
-    endif()
-    
-    if(TGT_BSP MATCHES "arm/q7s")
-        # Used by configure file
-        set(XIPHOS_Q7S ON)
-        set(LIBGPS_VERSION_MAJOR 3)
-        set(LIBGPS_VERSION_MINOR 17)
-    endif()
-    
-    if(TGT_BSP MATCHES "arm/te0720-1cfa")
-        set(TE0720_1CFA ON)
-    endif()
+  if(TGT_BSP MATCHES "arm/te0720-1cfa")
+    set(TE0720_1CFA ON)
+  endif()
 else()
-    # Required by FSFW library
-    set(FSFW_CONFIG_PATH "${BSP_PATH}/fsfwconfig")
+  # Required by FSFW library
+  set(FSFW_CONFIG_PATH "${BSP_PATH}/fsfwconfig")
 endif()
 
-
 # Configuration files
 configure_file(${COMMON_CONFIG_PATH}/commonConfig.h.in commonConfig.h)
 configure_file(${FSFW_CONFIG_PATH}/FSFWConfig.h.in FSFWConfig.h)
 configure_file(${BSP_PATH}/OBSWConfig.h.in OBSWConfig.h)
 if(TGT_BSP MATCHES "arm/q7s")
-    configure_file(${BSP_PATH}/boardconfig/q7sConfig.h.in q7sConfig.h)
+  configure_file(${BSP_PATH}/boardconfig/q7sConfig.h.in q7sConfig.h)
 elseif(TGT_BSP MATCHES "arm/raspberrypi" OR TGT_BSP MATCHES "arm/egse")
-    configure_file(${BSP_PATH}/boardconfig/rpiConfig.h.in rpiConfig.h)
+  configure_file(${BSP_PATH}/boardconfig/rpiConfig.h.in rpiConfig.h)
 endif()
 
 configure_file(${WATCHDOG_PATH}/watchdogConf.h.in watchdogConf.h)
 
 # Set common config path for FSFW
-set(FSFW_ADDITIONAL_INC_PATHS 
-    "${COMMON_PATH}/config"
-    ${CMAKE_CURRENT_BINARY_DIR}
-)
+set(FSFW_ADDITIONAL_INC_PATHS "${COMMON_PATH}/config"
+                              ${CMAKE_CURRENT_BINARY_DIR})
 
-################################################################################
+# ##############################################################################
 # Executable and Sources
-################################################################################
+# ##############################################################################
 
-#global compiler options need to be set before adding executables
+# global compiler options need to be set before adding executables
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    add_compile_options(
-        "-Wall"
-        "-Wextra"
-        "-Wimplicit-fallthrough=1"
-        "-Wno-unused-parameter"
-        "-Wno-psabi"
-        "-Wduplicated-cond" # check for duplicate conditions
-        "-Wduplicated-branches" # check for duplicate branches
-        "-Wlogical-op" # Search for bitwise operations instead of logical
-        "-Wnull-dereference" # Search for NULL dereference
-        "-Wundef" # Warn if undefind marcos are used
-        "-Wformat=2" # Format string problem detection
-        "-Wformat-overflow=2" # Formatting issues in printf
-        "-Wformat-truncation=2" # Formatting issues in printf
-        "-Wformat-security" # Search for dangerous printf operations
-        "-Wstrict-overflow=3" # Warn if integer overflows might happen
-        "-Warray-bounds=2" # Some array bounds violations will be found
-        "-Wshift-overflow=2" # Search for bit left shift overflows (<c++14)
-        "-Wcast-qual" # Warn if the constness is cast away
-        "-Wstringop-overflow=4"
-        # -Wstack-protector # Emits a few false positives for low level access
-        # -Wconversion # Creates many false positives
-        # -Warith-conversion # Use with Wconversion to find more implicit conversions
-        # -fanalyzer # Should be used to look through problems
-    )
-    # Remove unused sections.
-    add_compile_options(
-        "-ffunction-sections"
-        "-fdata-sections"
-    )
+  add_compile_options(
+    "-Wall"
+    "-Wextra"
+    "-Wimplicit-fallthrough=1"
+    "-Wno-unused-parameter"
+    "-Wno-psabi"
+    "-Wduplicated-cond" # check for duplicate conditions
+    "-Wduplicated-branches" # check for duplicate branches
+    "-Wlogical-op" # Search for bitwise operations instead of logical
+    "-Wnull-dereference" # Search for NULL dereference
+    "-Wundef" # Warn if undefind marcos are used
+    "-Wformat=2" # Format string problem detection
+    "-Wformat-overflow=2" # Formatting issues in printf
+    "-Wformat-truncation=2" # Formatting issues in printf
+    "-Wformat-security" # Search for dangerous printf operations
+    "-Wstrict-overflow=3" # Warn if integer overflows might happen
+    "-Warray-bounds=2" # Some array bounds violations will be found
+    "-Wshift-overflow=2" # Search for bit left shift overflows (<c++14)
+    "-Wcast-qual" # Warn if the constness is cast away
+    "-Wstringop-overflow=4"
+    # -Wstack-protector # Emits a few false positives for low level access
+    # -Wconversion # Creates many false positives -Warith-conversion # Use with
+    # Wconversion to find more implicit conversions -fanalyzer # Should be used
+    # to look through problems
+  )
+  # Remove unused sections.
+  add_compile_options("-ffunction-sections" "-fdata-sections")
 
-    # Removed unused sections.
-    add_link_options(
-        "-Wl,--gc-sections"
-    )
+  # Removed unused sections.
+  add_link_options("-Wl,--gc-sections")
 
 elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-	set(COMPILER_FLAGS "/permissive-")
+  set(COMPILER_FLAGS "/permissive-")
 endif()
 
 add_library(${LIB_EIVE_MISSION})
@@ -281,42 +319,39 @@ set_target_properties(${OBSW_NAME} PROPERTIES OUTPUT_NAME ${OBSW_BIN_NAME})
 
 # Watchdog
 if(TGT_BSP MATCHES "arm/q7s")
-    add_executable(${WATCHDOG_NAME})
+  add_executable(${WATCHDOG_NAME})
 else()
-    add_executable(${WATCHDOG_NAME} EXCLUDE_FROM_ALL)
+  add_executable(${WATCHDOG_NAME} EXCLUDE_FROM_ALL)
 endif()
 
-add_subdirectory(${WATCHDOG_PATH}) 
-target_link_libraries(${WATCHDOG_NAME} PUBLIC
-    ${LIB_CXX_FS}
-)
-target_include_directories(${WATCHDOG_NAME} PUBLIC
-    ${CMAKE_BINARY_DIR}
-)
+add_subdirectory(${WATCHDOG_PATH})
+target_link_libraries(${WATCHDOG_NAME} PUBLIC ${LIB_CXX_FS})
+target_include_directories(${WATCHDOG_NAME} PUBLIC ${CMAKE_BINARY_DIR})
 
 # unittests
 if(NOT TGT_BSP)
-    add_executable(${UNITTEST_NAME})
+  add_executable(${UNITTEST_NAME})
 else()
-    add_executable(${UNITTEST_NAME} EXCLUDE_FROM_ALL)
+  add_executable(${UNITTEST_NAME} EXCLUDE_FROM_ALL)
 endif()
 
 if(EIVE_ADD_ETL_LIB)
+
 endif()
 
 if(EIVE_ADD_JSON_LIB)
-    add_subdirectory(${LIB_JSON_PATH})
+  add_subdirectory(${LIB_JSON_PATH})
 endif()
- 
+
 add_subdirectory(thirdparty/rapidcsv)
 
 if(EIVE_ADD_LINUX_FILES)
-    add_subdirectory(${LIB_ARCSEC_PATH})
-    add_subdirectory(${LINUX_PATH})
+  add_subdirectory(${LIB_ARCSEC_PATH})
+  add_subdirectory(${LINUX_PATH})
 endif()
 add_subdirectory(${BSP_PATH})
 if(ADD_CSP_LIB)
-    add_subdirectory(${LIB_CSP_PATH})
+  add_subdirectory(${LIB_CSP_PATH})
 endif()
 
 add_subdirectory(${COMMON_PATH})
@@ -328,175 +363,144 @@ add_subdirectory(${TEST_PATH})
 
 add_subdirectory(${UNITTEST_PATH})
 
-# This should have already been downloaded by the FSFW
-# Still include it to be safe
+# This should have already been downloaded by the FSFW Still include it to be
+# safe
 find_package(etl ${FSFW_ETL_LIB_MAJOR_VERSION} CONFIG QUIET)
 # Not installed, so use FetchContent to download and provide etl
 if(NOT etl_FOUND)
-    message(STATUS
-        "No ETL installation was found with find_package. Installing and providing "
-        "etl with FindPackage"
-    )
-    include(FetchContent)
-    FetchContent_Declare(
-        etl
-        GIT_REPOSITORY https://github.com/ETLCPP/etl
-        GIT_TAG        ${FSFW_ETL_LIB_VERSION}
-    )
-    list(APPEND FSFW_FETCH_CONTENT_TARGETS etl)
+  message(
+    STATUS
+      "No ETL installation was found with find_package. Installing and providing "
+      "etl with FindPackage")
+  include(FetchContent)
+  FetchContent_Declare(
+    etl
+    GIT_REPOSITORY https://github.com/ETLCPP/etl
+    GIT_TAG ${FSFW_ETL_LIB_VERSION})
+  list(APPEND FSFW_FETCH_CONTENT_TARGETS etl)
 endif()
 
 # Use same Catch2 version as framework
-if (NOT(TGT_BSP MATCHES "arm/te0720-1cfa") AND NOT(TGT_BSP MATCHES "arm/q7s")
-        AND NOT (TGT_BSP MATCHES "arm/raspberrypi"))
-    # Check whether the user has already installed Catch2 first
-    find_package(Catch2 ${FSFW_CATCH2_LIB_MAJOR_VERSION} CONFIG QUIET)
-    # Not installed, so use FetchContent to download and provide Catch2
-    if(NOT Catch2_FOUND)
-        message(STATUS "${MSG_PREFIX} Catch2 installation not found. Downloading Catch2 library with FetchContent")
-        include(FetchContent)
+if(NOT (TGT_BSP MATCHES "arm/te0720-1cfa")
+   AND NOT (TGT_BSP MATCHES "arm/q7s")
+   AND NOT (TGT_BSP MATCHES "arm/raspberrypi"))
+  # Check whether the user has already installed Catch2 first
+  find_package(Catch2 ${FSFW_CATCH2_LIB_MAJOR_VERSION} CONFIG QUIET)
+  # Not installed, so use FetchContent to download and provide Catch2
+  if(NOT Catch2_FOUND)
+    message(
+      STATUS
+        "${MSG_PREFIX} Catch2 installation not found. Downloading Catch2 library with FetchContent"
+    )
+    include(FetchContent)
 
-        FetchContent_Declare(
-            Catch2
-            GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-            GIT_TAG        ${FSFW_CATCH2_LIB_VERSION}
-        )
+    FetchContent_Declare(
+      Catch2
+      GIT_REPOSITORY https://github.com/catchorg/Catch2.git
+      GIT_TAG ${FSFW_CATCH2_LIB_VERSION})
 
-        list(APPEND FSFW_FETCH_CONTENT_TARGETS Catch2)
-    endif()
+    list(APPEND FSFW_FETCH_CONTENT_TARGETS Catch2)
+  endif()
 endif()
 
 # The documentation for FetchContent recommends declaring all the dependencies
 # before making them available. We make all declared dependency available here
 # after their declaration
 if(FSFW_FETCH_CONTENT_TARGETS)
-    FetchContent_MakeAvailable(${FSFW_FETCH_CONTENT_TARGETS})
-    if(TARGET etl)
-        add_library(${LIB_ETL_TARGET} ALIAS etl)
-    endif()
-    if(TARGET Catch2)
-        # Fixes regression -preview4, to be confirmed in later releases
-        # Related GitHub issue: https://github.com/catchorg/Catch2/issues/2417
-        set_target_properties(Catch2 PROPERTIES DEBUG_POSTFIX "")
-        set_target_properties(Catch2 PROPERTIES EXCLUDE_FROM_ALL "true")
-        set_target_properties(Catch2WithMain PROPERTIES EXCLUDE_FROM_ALL "true")
-    endif()
+  FetchContent_MakeAvailable(${FSFW_FETCH_CONTENT_TARGETS})
+  if(TARGET etl)
+    add_library(${LIB_ETL_TARGET} ALIAS etl)
+  endif()
+  if(TARGET Catch2)
+    # Fixes regression -preview4, to be confirmed in later releases Related
+    # GitHub issue: https://github.com/catchorg/Catch2/issues/2417
+    set_target_properties(Catch2 PROPERTIES DEBUG_POSTFIX "")
+    set_target_properties(Catch2 PROPERTIES EXCLUDE_FROM_ALL "true")
+    set_target_properties(Catch2WithMain PROPERTIES EXCLUDE_FROM_ALL "true")
+  endif()
 endif()
 
-################################################################################
+# ##############################################################################
 # Post-Sources preparation
-################################################################################
+# ##############################################################################
 
 # Add libraries
-target_link_libraries(${LIB_EIVE_MISSION} PUBLIC
-    ${LIB_FSFW_NAME}
-    ${LIB_LWGPS_NAME}
-    ${LIB_OS_NAME}
-)
+target_link_libraries(${LIB_EIVE_MISSION}
+                      PUBLIC ${LIB_FSFW_NAME} ${LIB_LWGPS_NAME} ${LIB_OS_NAME})
 
-target_link_libraries(${OBSW_NAME} PRIVATE
-    ${LIB_EIVE_MISSION}
-)
+target_link_libraries(${OBSW_NAME} PRIVATE ${LIB_EIVE_MISSION})
 
 if(TGT_BSP MATCHES "arm/q7s")
-    target_link_libraries(${LIB_EIVE_MISSION} PUBLIC
-        ${LIB_GPS}
-        ${LIB_ARCSEC}
-    )
+  target_link_libraries(${LIB_EIVE_MISSION} PUBLIC ${LIB_GPS} ${LIB_ARCSEC})
 endif()
 
-target_link_libraries(${UNITTEST_NAME} PRIVATE
-    Catch2
-    ${LIB_EIVE_MISSION}
-    rapidcsv
-)
+target_link_libraries(${UNITTEST_NAME} PRIVATE Catch2 ${LIB_EIVE_MISSION}
+                                               rapidcsv)
 
 if(TGT_BSP MATCHES "arm/egse")
-    target_link_libraries(${OBSW_NAME} PRIVATE
-	    ${LIB_ARCSEC}
-	)
+  target_link_libraries(${OBSW_NAME} PRIVATE ${LIB_ARCSEC})
 endif()
 
 if(ADD_CSP_LIB)
-    target_link_libraries(${OBSW_NAME} PRIVATE
-        ${LIB_CSP_NAME}
-    )
+  target_link_libraries(${OBSW_NAME} PRIVATE ${LIB_CSP_NAME})
 endif()
 
-
 if(EIVE_ADD_ETL_LIB)
-    target_link_libraries(${LIB_EIVE_MISSION} PUBLIC
-        ${LIB_ETL_TARGET}
-    )
+  target_link_libraries(${LIB_EIVE_MISSION} PUBLIC ${LIB_ETL_TARGET})
 endif()
 
 if(EIVE_ADD_JSON_LIB)
-    target_link_libraries(${LIB_EIVE_MISSION} PUBLIC
-        ${LIB_JSON_NAME}
-    )
+  target_link_libraries(${LIB_EIVE_MISSION} PUBLIC ${LIB_JSON_NAME})
 endif()
 
-target_link_libraries(${LIB_EIVE_MISSION} PUBLIC
-    ${LIB_CXX_FS}
-)
+target_link_libraries(${LIB_EIVE_MISSION} PUBLIC ${LIB_CXX_FS})
 
 # Add include paths for all sources.
-target_include_directories(${LIB_EIVE_MISSION} PUBLIC
-	${CMAKE_CURRENT_SOURCE_DIR}
-	${FSFW_CONFIG_PATH}
-	${CMAKE_CURRENT_BINARY_DIR}
-	${LIB_ARCSEC_PATH}
-)
+target_include_directories(
+  ${LIB_EIVE_MISSION} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${FSFW_CONFIG_PATH}
+                             ${CMAKE_CURRENT_BINARY_DIR} ${LIB_ARCSEC_PATH})
 
 if(TGT_BSP MATCHES "arm/q7s" OR TGT_BSP MATCHES "arm/egse")
-    target_include_directories(${LIB_EIVE_MISSION} PUBLIC
-        ${ARCSEC_LIB_PATH}
-    )
+  target_include_directories(${LIB_EIVE_MISSION} PUBLIC ${ARCSEC_LIB_PATH})
 endif()
 
 if(CMAKE_VERBOSE)
-	message(STATUS "Warning flags: ${WARNING_FLAGS}")
+  message(STATUS "Warning flags: ${WARNING_FLAGS}")
 endif()
 
-
-
 if(CMAKE_CROSSCOMPILING)
-	include (HardwareOsPostConfig)
-	post_source_hw_os_config()
+  include(HardwareOsPostConfig)
+  post_source_hw_os_config()
 endif()
 
 if(NOT CMAKE_SIZE)
-	set(CMAKE_SIZE size)
-	if(WIN32)
-		set(FILE_SUFFIX ".exe")
-	endif()
+  set(CMAKE_SIZE size)
+  if(WIN32)
+    set(FILE_SUFFIX ".exe")
+  endif()
 endif()
 
 if(EIVE_BUILD_WATCHDOG)
-    set(TARGET_STRING "OBSW Watchdog")
+  set(TARGET_STRING "OBSW Watchdog")
 else()
-    if(TGT_BSP)
-        set(TARGET_STRING "Target BSP: ${TGT_BSP}")
-    else()
-        set(TARGET_STRING "Target BSP: Hosted")
-    endif()
+  if(TGT_BSP)
+    set(TARGET_STRING "Target BSP: ${TGT_BSP}")
+  else()
+    set(TARGET_STRING "Target BSP: Hosted")
+  endif()
 endif()
 
 install(TARGETS ${OBSW_NAME} RUNTIME DESTINATION bin)
 
-string(CONCAT POST_BUILD_COMMENT
-    "Build directory: ${CMAKE_BINARY_DIR}\n"
-    "Target OSAL: ${FSFW_OSAL}\n"
-    "Target Build Type: ${CMAKE_BUILD_TYPE}\n"
-    "${TARGET_STRING}"
-)
+string(CONCAT POST_BUILD_COMMENT "Build directory: ${CMAKE_BINARY_DIR}\n"
+              "Target OSAL: ${FSFW_OSAL}\n"
+              "Target Build Type: ${CMAKE_BUILD_TYPE}\n" "${TARGET_STRING}")
 
 add_custom_command(
-   TARGET ${OBSW_NAME}
-   POST_BUILD
-   COMMAND ${CMAKE_SIZE} ${OBSW_BIN_NAME}${FILE_SUFFIX}
-   COMMENT ${POST_BUILD_COMMENT}
-)
+  TARGET ${OBSW_NAME}
+  POST_BUILD
+  COMMAND ${CMAKE_SIZE} ${OBSW_BIN_NAME}${FILE_SUFFIX}
+  COMMENT ${POST_BUILD_COMMENT})
 
-include (BuildType)
+include(BuildType)
 set_build_type()
diff --git a/bsp_egse/CMakeLists.txt b/bsp_egse/CMakeLists.txt
index cb02f937..d104354f 100644
--- a/bsp_egse/CMakeLists.txt
+++ b/bsp_egse/CMakeLists.txt
@@ -1,7 +1,3 @@
-target_sources(${OBSW_NAME} PUBLIC
-	InitMission.cpp
-	main.cpp
-	ObjectFactory.cpp
-)
+target_sources(${OBSW_NAME} PUBLIC InitMission.cpp main.cpp ObjectFactory.cpp)
 
 add_subdirectory(boardconfig)
diff --git a/bsp_egse/boardconfig/CMakeLists.txt b/bsp_egse/boardconfig/CMakeLists.txt
index f9136e3e..f08670d6 100644
--- a/bsp_egse/boardconfig/CMakeLists.txt
+++ b/bsp_egse/boardconfig/CMakeLists.txt
@@ -1,7 +1,3 @@
-target_sources(${OBSW_NAME} PRIVATE
-	print.c
-)
+target_sources(${OBSW_NAME} PRIVATE print.c)
 
-target_include_directories(${OBSW_NAME} PUBLIC
-	${CMAKE_CURRENT_SOURCE_DIR}
-)
+target_include_directories(${OBSW_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/bsp_hosted/CMakeLists.txt b/bsp_hosted/CMakeLists.txt
index 7787cf7e..2804977d 100644
--- a/bsp_hosted/CMakeLists.txt
+++ b/bsp_hosted/CMakeLists.txt
@@ -1,8 +1,4 @@
-target_sources(${OBSW_NAME} PUBLIC
-	InitMission.cpp
-	main.cpp
-	ObjectFactory.cpp
-)
+target_sources(${OBSW_NAME} PUBLIC InitMission.cpp main.cpp ObjectFactory.cpp)
 
 add_subdirectory(fsfwconfig)
 add_subdirectory(boardconfig)
diff --git a/bsp_hosted/boardconfig/CMakeLists.txt b/bsp_hosted/boardconfig/CMakeLists.txt
index 81c8c93d..f08670d6 100644
--- a/bsp_hosted/boardconfig/CMakeLists.txt
+++ b/bsp_hosted/boardconfig/CMakeLists.txt
@@ -1,10 +1,3 @@
-target_sources(${OBSW_NAME} PRIVATE
-	print.c
-)
-
-target_include_directories(${OBSW_NAME} PUBLIC
-	${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-
+target_sources(${OBSW_NAME} PRIVATE print.c)
 
+target_include_directories(${OBSW_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/bsp_hosted/comIF/CMakeLists.txt b/bsp_hosted/comIF/CMakeLists.txt
index eb416f75..9301d6b0 100644
--- a/bsp_hosted/comIF/CMakeLists.txt
+++ b/bsp_hosted/comIF/CMakeLists.txt
@@ -1,8 +1 @@
-target_sources(${TARGET_NAME} PUBLIC
-	ArduinoComIF.cpp
-	ArduinoCookie.cpp
-)
-
-
-
-
+target_sources(${TARGET_NAME} PUBLIC ArduinoComIF.cpp ArduinoCookie.cpp)
diff --git a/bsp_hosted/fsfwconfig/CMakeLists.txt b/bsp_hosted/fsfwconfig/CMakeLists.txt
index 4a483eb7..d5b5e7e5 100644
--- a/bsp_hosted/fsfwconfig/CMakeLists.txt
+++ b/bsp_hosted/fsfwconfig/CMakeLists.txt
@@ -1,27 +1,15 @@
-target_sources(${OBSW_NAME} PRIVATE
-	ipc/MissionMessageTypes.cpp
-)
+target_sources(${OBSW_NAME} PRIVATE ipc/MissionMessageTypes.cpp)
 
-target_include_directories(${OBSW_NAME} PUBLIC
-	${CMAKE_CURRENT_SOURCE_DIR}
-)
+target_include_directories(${OBSW_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 # If a special translation file for object IDs exists, compile it.
 if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/objects/translateObjects.cpp")
-    target_sources(${OBSW_NAME} PRIVATE
-        objects/translateObjects.cpp
-    )
-    target_sources(${UNITTEST_NAME} PRIVATE
-        objects/translateObjects.cpp
-    )
+  target_sources(${OBSW_NAME} PRIVATE objects/translateObjects.cpp)
+  target_sources(${UNITTEST_NAME} PRIVATE objects/translateObjects.cpp)
 endif()
 
 # If a special translation file for events exists, compile it.
 if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/objects/translateObjects.cpp")
-    target_sources(${OBSW_NAME} PRIVATE
-        events/translateEvents.cpp
-    )
-    target_sources(${UNITTEST_NAME} PRIVATE
-        events/translateEvents.cpp
-    )
+  target_sources(${OBSW_NAME} PRIVATE events/translateEvents.cpp)
+  target_sources(${UNITTEST_NAME} PRIVATE events/translateEvents.cpp)
 endif()
diff --git a/bsp_linux_board/CMakeLists.txt b/bsp_linux_board/CMakeLists.txt
index 9884b983..24e81b42 100644
--- a/bsp_linux_board/CMakeLists.txt
+++ b/bsp_linux_board/CMakeLists.txt
@@ -1,9 +1,5 @@
-target_sources(${OBSW_NAME} PUBLIC
-	InitMission.cpp
-	main.cpp
-	gpioInit.cpp
-	ObjectFactory.cpp
-)
+target_sources(${OBSW_NAME} PUBLIC InitMission.cpp main.cpp gpioInit.cpp
+                                   ObjectFactory.cpp)
 
 add_subdirectory(boardconfig)
 add_subdirectory(boardtest)
diff --git a/bsp_linux_board/boardconfig/CMakeLists.txt b/bsp_linux_board/boardconfig/CMakeLists.txt
index f9136e3e..f08670d6 100644
--- a/bsp_linux_board/boardconfig/CMakeLists.txt
+++ b/bsp_linux_board/boardconfig/CMakeLists.txt
@@ -1,7 +1,3 @@
-target_sources(${OBSW_NAME} PRIVATE
-	print.c
-)
+target_sources(${OBSW_NAME} PRIVATE print.c)
 
-target_include_directories(${OBSW_NAME} PUBLIC
-	${CMAKE_CURRENT_SOURCE_DIR}
-)
+target_include_directories(${OBSW_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/bsp_linux_board/boardtest/CMakeLists.txt b/bsp_linux_board/boardtest/CMakeLists.txt
index fe4910f2..431972e8 100644
--- a/bsp_linux_board/boardtest/CMakeLists.txt
+++ b/bsp_linux_board/boardtest/CMakeLists.txt
@@ -1,6 +1 @@
-target_sources(${OBSW_NAME} PRIVATE
-)
-
-
-
-
+target_sources(${OBSW_NAME} PRIVATE)
diff --git a/bsp_q7s/CMakeLists.txt b/bsp_q7s/CMakeLists.txt
index cf3425c9..f6dbf590 100644
--- a/bsp_q7s/CMakeLists.txt
+++ b/bsp_q7s/CMakeLists.txt
@@ -1,20 +1,13 @@
-#simple mode
+# simple mode
 add_executable(${SIMPLE_OBSW_NAME} EXCLUDE_FROM_ALL)
 target_compile_definitions(${SIMPLE_OBSW_NAME} PRIVATE "Q7S_SIMPLE_MODE")
-target_sources(${SIMPLE_OBSW_NAME} PUBLIC
-	main.cpp
-)
-#I think this is unintentional? (produces linker errors for stuff in /linux)
-target_link_libraries(${SIMPLE_OBSW_NAME} PUBLIC
-    ${LIB_FSFW_NAME}
-)
+target_sources(${SIMPLE_OBSW_NAME} PUBLIC main.cpp)
+# I think this is unintentional? (produces linker errors for stuff in /linux)
+target_link_libraries(${SIMPLE_OBSW_NAME} PUBLIC ${LIB_FSFW_NAME})
 target_compile_definitions(${SIMPLE_OBSW_NAME} PRIVATE "Q7S_SIMPLE_MODE")
 add_subdirectory(simple)
 
-target_sources(${OBSW_NAME} PUBLIC
-	main.cpp
-    obsw.cpp
-)
+target_sources(${OBSW_NAME} PUBLIC main.cpp obsw.cpp)
 
 add_subdirectory(boardtest)
 
@@ -23,11 +16,9 @@ add_subdirectory(comIF)
 add_subdirectory(core)
 
 if(EIVE_Q7S_EM)
-    add_subdirectory(em)
+  add_subdirectory(em)
 else()
-    target_sources(${OBSW_NAME} PUBLIC
-        fmObjectFactory.cpp
-    )
+  target_sources(${OBSW_NAME} PUBLIC fmObjectFactory.cpp)
 endif()
 
 add_subdirectory(memory)
diff --git a/bsp_q7s/boardconfig/CMakeLists.txt b/bsp_q7s/boardconfig/CMakeLists.txt
index feefbe5a..3224d759 100644
--- a/bsp_q7s/boardconfig/CMakeLists.txt
+++ b/bsp_q7s/boardconfig/CMakeLists.txt
@@ -1,12 +1,5 @@
-target_sources(${OBSW_NAME} PRIVATE
-	print.c
-)
+target_sources(${OBSW_NAME} PRIVATE print.c)
 
-target_sources(${SIMPLE_OBSW_NAME} PRIVATE
-	print.c
-)
+target_sources(${SIMPLE_OBSW_NAME} PRIVATE print.c)
 
-
-target_include_directories(${OBSW_NAME} PUBLIC
-	${CMAKE_CURRENT_SOURCE_DIR}
-)
+target_include_directories(${OBSW_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/bsp_q7s/boardtest/CMakeLists.txt b/bsp_q7s/boardtest/CMakeLists.txt
index 29c9f1e1..9520a629 100644
--- a/bsp_q7s/boardtest/CMakeLists.txt
+++ b/bsp_q7s/boardtest/CMakeLists.txt
@@ -1,10 +1,5 @@
-target_sources(${OBSW_NAME} PRIVATE
-    FileSystemTest.cpp
-    Q7STestTask.cpp
-)
+target_sources(${OBSW_NAME} PRIVATE FileSystemTest.cpp Q7STestTask.cpp)
 
 if(EIVE_BUILD_Q7S_SIMPLE_MODE)
-    target_sources(${SIMPLE_OBSW_NAME} PRIVATE
-        FileSystemTest.cpp
-    )
-endif()
\ No newline at end of file
+  target_sources(${SIMPLE_OBSW_NAME} PRIVATE FileSystemTest.cpp)
+endif()
diff --git a/bsp_q7s/callbacks/CMakeLists.txt b/bsp_q7s/callbacks/CMakeLists.txt
index 584e6026..ed2e16f1 100644
--- a/bsp_q7s/callbacks/CMakeLists.txt
+++ b/bsp_q7s/callbacks/CMakeLists.txt
@@ -1,6 +1,2 @@
-target_sources(${OBSW_NAME} PRIVATE
-	rwSpiCallback.cpp
-	gnssCallback.cpp
-	pcduSwitchCb.cpp
-	q7sGpioCallbacks.cpp
-)
+target_sources(${OBSW_NAME} PRIVATE rwSpiCallback.cpp gnssCallback.cpp
+                                    pcduSwitchCb.cpp q7sGpioCallbacks.cpp)
diff --git a/bsp_q7s/comIF/CMakeLists.txt b/bsp_q7s/comIF/CMakeLists.txt
index fe4910f2..431972e8 100644
--- a/bsp_q7s/comIF/CMakeLists.txt
+++ b/bsp_q7s/comIF/CMakeLists.txt
@@ -1,6 +1 @@
-target_sources(${OBSW_NAME} PRIVATE
-)
-
-
-
-
+target_sources(${OBSW_NAME} PRIVATE)
diff --git a/bsp_q7s/core/CMakeLists.txt b/bsp_q7s/core/CMakeLists.txt
index 344112b6..b4050d73 100644
--- a/bsp_q7s/core/CMakeLists.txt
+++ b/bsp_q7s/core/CMakeLists.txt
@@ -1,9 +1,4 @@
-target_sources(${OBSW_NAME} PRIVATE
-    CoreController.cpp
-    InitMission.cpp
-    ObjectFactory.cpp
-)
+target_sources(${OBSW_NAME} PRIVATE CoreController.cpp InitMission.cpp
+                                    ObjectFactory.cpp)
 
-target_sources(${SIMPLE_OBSW_NAME} PRIVATE
-    InitMission.cpp
-)
+target_sources(${SIMPLE_OBSW_NAME} PRIVATE InitMission.cpp)
diff --git a/bsp_q7s/em/CMakeLists.txt b/bsp_q7s/em/CMakeLists.txt
index 066b807f..5ac6819f 100644
--- a/bsp_q7s/em/CMakeLists.txt
+++ b/bsp_q7s/em/CMakeLists.txt
@@ -1,3 +1 @@
-target_sources(${OBSW_NAME} PRIVATE
-    emObjectFactory.cpp
-)
+target_sources(${OBSW_NAME} PRIVATE emObjectFactory.cpp)
diff --git a/bsp_q7s/memory/CMakeLists.txt b/bsp_q7s/memory/CMakeLists.txt
index a0d4f66f..d8ba4347 100644
--- a/bsp_q7s/memory/CMakeLists.txt
+++ b/bsp_q7s/memory/CMakeLists.txt
@@ -1,6 +1,2 @@
-target_sources(${OBSW_NAME} PRIVATE
-    FileSystemHandler.cpp
-    SdCardManager.cpp
-    scratchApi.cpp
-    FilesystemHelper.cpp
-)
\ No newline at end of file
+target_sources(${OBSW_NAME} PRIVATE FileSystemHandler.cpp SdCardManager.cpp
+                                    scratchApi.cpp FilesystemHelper.cpp)
diff --git a/bsp_q7s/simple/CMakeLists.txt b/bsp_q7s/simple/CMakeLists.txt
index 77cbd076..b5c44433 100644
--- a/bsp_q7s/simple/CMakeLists.txt
+++ b/bsp_q7s/simple/CMakeLists.txt
@@ -1,3 +1 @@
-target_sources(${SIMPLE_OBSW_NAME} PRIVATE
-    simple.cpp
-)
+target_sources(${SIMPLE_OBSW_NAME} PRIVATE simple.cpp)
diff --git a/bsp_q7s/xadc/CMakeLists.txt b/bsp_q7s/xadc/CMakeLists.txt
index 0f2ea7df..a8d61811 100644
--- a/bsp_q7s/xadc/CMakeLists.txt
+++ b/bsp_q7s/xadc/CMakeLists.txt
@@ -1,3 +1 @@
-target_sources(${OBSW_NAME} PRIVATE
-    Xadc.cpp
-)
\ No newline at end of file
+target_sources(${OBSW_NAME} PRIVATE Xadc.cpp)
diff --git a/common/config/CMakeLists.txt b/common/config/CMakeLists.txt
index 00848561..ca296222 100644
--- a/common/config/CMakeLists.txt
+++ b/common/config/CMakeLists.txt
@@ -1,7 +1,3 @@
-target_include_directories(${OBSW_NAME} PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-)
+target_include_directories(${OBSW_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
-target_sources(${OBSW_NAME} PRIVATE
-    commonConfig.cpp
-)
\ No newline at end of file
+target_sources(${OBSW_NAME} PRIVATE commonConfig.cpp)
diff --git a/common/config/ccsdsConfig.h b/common/config/ccsdsConfig.h
index 8466a9fa..9736ae56 100644
--- a/common/config/ccsdsConfig.h
+++ b/common/config/ccsdsConfig.h
@@ -2,14 +2,7 @@
 #define COMMON_CONFIG_CCSDSCONFIG_H_
 
 namespace ccsds {
-enum {
-    VC0,
-    VC1,
-    VC2,
-    VC3
-};
+enum { VC0, VC1, VC2, VC3 };
 }
 
-
-
 #endif /* COMMON_CONFIG_CCSDSCONFIG_H_ */
diff --git a/common/config/commonClassIds.h b/common/config/commonClassIds.h
index dc440c4d..aeb05815 100644
--- a/common/config/commonClassIds.h
+++ b/common/config/commonClassIds.h
@@ -2,39 +2,40 @@
 #define COMMON_CONFIG_COMMONCLASSIDS_H_
 
 #include <fsfw/returnvalues/FwClassIds.h>
+
 #include <cstdint>
 
 namespace CLASS_ID {
-enum commonClassIds: uint8_t {
+enum commonClassIds : uint8_t {
   COMMON_CLASS_ID_START = FW_CLASS_ID_COUNT,
-  PCDU_HANDLER, //PCDU
-  HEATER_HANDLER, //HEATER
-  SYRLINKS_HANDLER, //SYRLINKS
-  IMTQ_HANDLER, //IMTQ
-  RW_HANDLER, //RWHA
-  STR_HANDLER, //STRH
-  DWLPWRON_CMD, //DWLPWRON
-  MPSOC_TM, //MPTM
-  PLOC_SUPERVISOR_HANDLER, //PLSV
-  PLOC_SUPV_HELPER, //PLSPVhLP
-  SUS_HANDLER, //SUSS
-  CCSDS_IP_CORE_BRIDGE, //IPCI
-  PTME, //PTME
-  PLOC_UPDATER, //PLUD
-  STR_HELPER, //STRHLP
-  GOM_SPACE_HANDLER, //GOMS
-  PLOC_MEMORY_DUMPER, //PLMEMDUMP
-  PDEC_HANDLER, //PDEC
-  CCSDS_HANDLER, //CCSDS
-  RATE_SETTER, //RS
-  ARCSEC_JSON_BASE, //JSONBASE
-  NVM_PARAM_BASE, //NVMB
-  FILE_SYSTEM_HELPER, //FSHLP
-  PLOC_MPSOC_HELPER, // PLMPHLP
-  SA_DEPL_HANDLER, //SADPL
-  MPSOC_RETURN_VALUES_IF, //MPSOCRTVIF
-  SUPV_RETURN_VALUES_IF, //SPVRTVIF
-  COMMON_CLASS_ID_END // [EXPORT] : [END]
+  PCDU_HANDLER,             // PCDU
+  HEATER_HANDLER,           // HEATER
+  SYRLINKS_HANDLER,         // SYRLINKS
+  IMTQ_HANDLER,             // IMTQ
+  RW_HANDLER,               // RWHA
+  STR_HANDLER,              // STRH
+  DWLPWRON_CMD,             // DWLPWRON
+  MPSOC_TM,                 // MPTM
+  PLOC_SUPERVISOR_HANDLER,  // PLSV
+  PLOC_SUPV_HELPER,         // PLSPVhLP
+  SUS_HANDLER,              // SUSS
+  CCSDS_IP_CORE_BRIDGE,     // IPCI
+  PTME,                     // PTME
+  PLOC_UPDATER,             // PLUD
+  STR_HELPER,               // STRHLP
+  GOM_SPACE_HANDLER,        // GOMS
+  PLOC_MEMORY_DUMPER,       // PLMEMDUMP
+  PDEC_HANDLER,             // PDEC
+  CCSDS_HANDLER,            // CCSDS
+  RATE_SETTER,              // RS
+  ARCSEC_JSON_BASE,         // JSONBASE
+  NVM_PARAM_BASE,           // NVMB
+  FILE_SYSTEM_HELPER,       // FSHLP
+  PLOC_MPSOC_HELPER,        // PLMPHLP
+  SA_DEPL_HANDLER,          // SADPL
+  MPSOC_RETURN_VALUES_IF,   // MPSOCRTVIF
+  SUPV_RETURN_VALUES_IF,    // SPVRTVIF
+  COMMON_CLASS_ID_END       // [EXPORT] : [END]
 };
 
 }
diff --git a/common/config/commonConfig.cpp b/common/config/commonConfig.cpp
index cb2b9666..0fd78a61 100644
--- a/common/config/commonConfig.cpp
+++ b/common/config/commonConfig.cpp
@@ -1,6 +1,8 @@
 #include "commonConfig.h"
-#include "tmtc/apid.h"
-#include "fsfw/tmtcpacket/SpacePacket.h"
 
-const Version common::OBSW_VERSION { OBSW_VERSION_MAJOR, OBSW_VERSION_MINOR, OBSW_VERSION_REVISION, OBSW_VERSION_CST_GIT_SHA1 };
+#include "fsfw/tmtcpacket/SpacePacket.h"
+#include "tmtc/apid.h"
+
+const fsfw::Version common::OBSW_VERSION{OBSW_VERSION_MAJOR, OBSW_VERSION_MINOR,
+                                         OBSW_VERSION_REVISION, OBSW_VERSION_CST_GIT_SHA1};
 const uint16_t common::PUS_PACKET_ID = spacepacket::getTcSpacePacketIdFromApid(apid::EIVE_OBSW);
diff --git a/common/config/commonConfig.h.in b/common/config/commonConfig.h.in
index ebd6563b..ad19e135 100644
--- a/common/config/commonConfig.h.in
+++ b/common/config/commonConfig.h.in
@@ -33,7 +33,7 @@ static constexpr uint8_t OBSW_VERSION_REVISION = @OBSW_VERSION_REVISION@;
 // CST: Commits since tag
 static const char OBSW_VERSION_CST_GIT_SHA1[] = "@OBSW_VERSION_CST_GIT_SHA1@";
 
-extern const Version OBSW_VERSION;
+extern const fsfw::Version OBSW_VERSION;
 
 extern const uint16_t PUS_PACKET_ID;
 
diff --git a/common/config/commonObjects.h b/common/config/commonObjects.h
index bacd5b9b..4a4594f4 100644
--- a/common/config/commonObjects.h
+++ b/common/config/commonObjects.h
@@ -4,126 +4,125 @@
 #include <cstdint>
 
 namespace objects {
-enum commonObjects: uint32_t {
-	/* First Byte 0x50-0x52 reserved for PUS Services **/
-    CCSDS_PACKET_DISTRIBUTOR = 0x50000100,
-    PUS_PACKET_DISTRIBUTOR = 0x50000200,
-    TMTC_BRIDGE = 0x50000300,
-    TMTC_POLLING_TASK = 0x50000400,
-    FILE_SYSTEM_HANDLER = 0x50000500,
-    SDC_MANAGER = 0x50000550,
-    PTME = 0x50000600,
-    PDEC_HANDLER = 0x50000700,
-    CCSDS_HANDLER = 0x50000800,
+enum commonObjects : uint32_t {
+  /* First Byte 0x50-0x52 reserved for PUS Services **/
+  CCSDS_PACKET_DISTRIBUTOR = 0x50000100,
+  PUS_PACKET_DISTRIBUTOR = 0x50000200,
+  TMTC_BRIDGE = 0x50000300,
+  TMTC_POLLING_TASK = 0x50000400,
+  FILE_SYSTEM_HANDLER = 0x50000500,
+  SDC_MANAGER = 0x50000550,
+  PTME = 0x50000600,
+  PDEC_HANDLER = 0x50000700,
+  CCSDS_HANDLER = 0x50000800,
 
-    /* 0x43 ('C') for Controllers */
-    THERMAL_CONTROLLER = 0x43400001,
-    ACS_CONTROLLER = 0x43100002,
-    CORE_CONTROLLER = 0x43000003,
+  /* 0x43 ('C') for Controllers */
+  THERMAL_CONTROLLER = 0x43400001,
+  ACS_CONTROLLER = 0x43100002,
+  CORE_CONTROLLER = 0x43000003,
 
-    /* 0x44 ('D') for device handlers */
-    MGM_0_LIS3_HANDLER = 0x44120006,
-    MGM_1_RM3100_HANDLER = 0x44120107,
-    MGM_2_LIS3_HANDLER = 0x44120208,
-    MGM_3_RM3100_HANDLER = 0x44120309,
-    GYRO_0_ADIS_HANDLER = 0x44120010,
-    GYRO_1_L3G_HANDLER = 0x44120111,
-    GYRO_2_ADIS_HANDLER = 0x44120212,
-    GYRO_3_L3G_HANDLER = 0x44120313,
-    RW1 = 0x44120047,
-    RW2 = 0x44120148,
-    RW3 = 0x44120249,
-    RW4 = 0x44120350,
-    STAR_TRACKER = 0x44130001,
-    GPS_CONTROLLER = 0x44130045,
+  /* 0x44 ('D') for device handlers */
+  MGM_0_LIS3_HANDLER = 0x44120006,
+  MGM_1_RM3100_HANDLER = 0x44120107,
+  MGM_2_LIS3_HANDLER = 0x44120208,
+  MGM_3_RM3100_HANDLER = 0x44120309,
+  GYRO_0_ADIS_HANDLER = 0x44120010,
+  GYRO_1_L3G_HANDLER = 0x44120111,
+  GYRO_2_ADIS_HANDLER = 0x44120212,
+  GYRO_3_L3G_HANDLER = 0x44120313,
+  RW1 = 0x44120047,
+  RW2 = 0x44120148,
+  RW3 = 0x44120249,
+  RW4 = 0x44120350,
+  STAR_TRACKER = 0x44130001,
+  GPS_CONTROLLER = 0x44130045,
 
-    IMTQ_HANDLER = 0x44140014,
-    TMP1075_HANDLER_1 = 0x44420004,
-    TMP1075_HANDLER_2 = 0x44420005,
-    PCDU_HANDLER = 0x442000A1,
-    P60DOCK_HANDLER = 0x44250000,
-    PDU1_HANDLER = 0x44250001,
-    PDU2_HANDLER = 0x44250002,
-    ACU_HANDLER = 0x44250003,
-    BPX_BATT_HANDLER = 0x44260000,
-    PLPCDU_HANDLER = 0x44300000,
-    RAD_SENSOR = 0x443200A5,
-    PLOC_UPDATER = 0x44330000,
-    PLOC_MEMORY_DUMPER = 0x44330001,
-    STR_HELPER = 0x44330002,
-    PLOC_MPSOC_HELPER = 0x44330003,
-    AXI_PTME_CONFIG = 0x44330004,
-    PTME_CONFIG = 0x44330005,
-    PLOC_MPSOC_HANDLER = 0x44330015,
-    PLOC_SUPERVISOR_HANDLER = 0x44330016,
-    PLOC_SUPERVISOR_HELPER = 0x44330017,
-    SOLAR_ARRAY_DEPL_HANDLER = 0x444100A2,
-    HEATER_HANDLER = 0x444100A4,
+  IMTQ_HANDLER = 0x44140014,
+  TMP1075_HANDLER_1 = 0x44420004,
+  TMP1075_HANDLER_2 = 0x44420005,
+  PCDU_HANDLER = 0x442000A1,
+  P60DOCK_HANDLER = 0x44250000,
+  PDU1_HANDLER = 0x44250001,
+  PDU2_HANDLER = 0x44250002,
+  ACU_HANDLER = 0x44250003,
+  BPX_BATT_HANDLER = 0x44260000,
+  PLPCDU_HANDLER = 0x44300000,
+  RAD_SENSOR = 0x443200A5,
+  PLOC_UPDATER = 0x44330000,
+  PLOC_MEMORY_DUMPER = 0x44330001,
+  STR_HELPER = 0x44330002,
+  PLOC_MPSOC_HELPER = 0x44330003,
+  AXI_PTME_CONFIG = 0x44330004,
+  PTME_CONFIG = 0x44330005,
+  PLOC_MPSOC_HANDLER = 0x44330015,
+  PLOC_SUPERVISOR_HANDLER = 0x44330016,
+  PLOC_SUPERVISOR_HELPER = 0x44330017,
+  SOLAR_ARRAY_DEPL_HANDLER = 0x444100A2,
+  HEATER_HANDLER = 0x444100A4,
 
-    /**
-     * Not yet specified which pt1000 will measure which device/location in the satellite.
-     * Therefore object ids are named according to the IC naming of the RTDs in the schematic.
-     */
-    RTD_0_IC3_PLOC_HEATSPREADER = 0x44420016,
-    RTD_1_IC4_PLOC_MISSIONBOARD = 0x44420017,
-    RTD_2_IC5_4K_CAMERA = 0x44420018,
-    RTD_3_IC6_DAC_HEATSPREADER = 0x44420019,
-    RTD_4_IC7_STARTRACKER = 0x44420020,
-    RTD_5_IC8_RW1_MX_MY = 0x44420021,
-    RTD_6_IC9_DRO = 0x44420022,
-    RTD_7_IC10_SCEX = 0x44420023,
-    RTD_8_IC11_X8 = 0x44420024,
-    RTD_9_IC12_HPA = 0x44420025,
-    RTD_10_IC13_PL_TX = 0x44420026,
-    RTD_11_IC14_MPA = 0x44420027,
-    RTD_12_IC15_ACU = 0x44420028,
-    RTD_13_IC16_PLPCDU_HEATSPREADER = 0x44420029,
-    RTD_14_IC17_TCS_BOARD = 0x44420030,
-    RTD_15_IC18_IMTQ = 0x44420031,
+  /**
+   * Not yet specified which pt1000 will measure which device/location in the satellite.
+   * Therefore object ids are named according to the IC naming of the RTDs in the schematic.
+   */
+  RTD_0_IC3_PLOC_HEATSPREADER = 0x44420016,
+  RTD_1_IC4_PLOC_MISSIONBOARD = 0x44420017,
+  RTD_2_IC5_4K_CAMERA = 0x44420018,
+  RTD_3_IC6_DAC_HEATSPREADER = 0x44420019,
+  RTD_4_IC7_STARTRACKER = 0x44420020,
+  RTD_5_IC8_RW1_MX_MY = 0x44420021,
+  RTD_6_IC9_DRO = 0x44420022,
+  RTD_7_IC10_SCEX = 0x44420023,
+  RTD_8_IC11_X8 = 0x44420024,
+  RTD_9_IC12_HPA = 0x44420025,
+  RTD_10_IC13_PL_TX = 0x44420026,
+  RTD_11_IC14_MPA = 0x44420027,
+  RTD_12_IC15_ACU = 0x44420028,
+  RTD_13_IC16_PLPCDU_HEATSPREADER = 0x44420029,
+  RTD_14_IC17_TCS_BOARD = 0x44420030,
+  RTD_15_IC18_IMTQ = 0x44420031,
 
-    // Name convention for SUS devices
-    // SUS_<IDX>_<N/R>_LOC_X<F/M/B>Y<F/M/B>Z<F/M/B>_PT_<DIR><F/B>
-    // LOC: Location
-    // PT: Pointing
-    // N/R: Nominal/Redundant
-    // F/M/B: Forward/Middle/Backwards
-    SUS_0_N_LOC_XFYFZM_PT_XF = 0x44120032,
-    SUS_6_R_LOC_XFYBZM_PT_XF = 0x44120038,
+  // Name convention for SUS devices
+  // SUS_<IDX>_<N/R>_LOC_X<F/M/B>Y<F/M/B>Z<F/M/B>_PT_<DIR><F/B>
+  // LOC: Location
+  // PT: Pointing
+  // N/R: Nominal/Redundant
+  // F/M/B: Forward/Middle/Backwards
+  SUS_0_N_LOC_XFYFZM_PT_XF = 0x44120032,
+  SUS_6_R_LOC_XFYBZM_PT_XF = 0x44120038,
 
-    SUS_1_N_LOC_XBYFZM_PT_XB = 0x44120033,
-    SUS_7_R_LOC_XBYBZM_PT_XB = 0x44120039,
+  SUS_1_N_LOC_XBYFZM_PT_XB = 0x44120033,
+  SUS_7_R_LOC_XBYBZM_PT_XB = 0x44120039,
 
-    SUS_2_N_LOC_XFYBZB_PT_YB = 0x44120034,
-    SUS_8_R_LOC_XBYBZB_PT_YB = 0x44120040,
+  SUS_2_N_LOC_XFYBZB_PT_YB = 0x44120034,
+  SUS_8_R_LOC_XBYBZB_PT_YB = 0x44120040,
 
-    SUS_3_N_LOC_XFYBZF_PT_YF = 0x44120035,
-    SUS_9_R_LOC_XBYBZB_PT_YF = 0x44120041,
+  SUS_3_N_LOC_XFYBZF_PT_YF = 0x44120035,
+  SUS_9_R_LOC_XBYBZB_PT_YF = 0x44120041,
 
-    SUS_4_N_LOC_XMYFZF_PT_ZF = 0x44120036,
-    SUS_10_N_LOC_XMYBZF_PT_ZF = 0x44120042,
+  SUS_4_N_LOC_XMYFZF_PT_ZF = 0x44120036,
+  SUS_10_N_LOC_XMYBZF_PT_ZF = 0x44120042,
 
-    SUS_5_N_LOC_XFYMZB_PT_ZB = 0x44120037,
-    SUS_11_R_LOC_XBYMZB_PT_ZB = 0x44120043,
+  SUS_5_N_LOC_XFYMZB_PT_ZB = 0x44120037,
+  SUS_11_R_LOC_XBYMZB_PT_ZB = 0x44120043,
 
-    SYRLINKS_HK_HANDLER = 0x445300A3,
+  SYRLINKS_HK_HANDLER = 0x445300A3,
 
-    // 0x60 for other stuff
-    HEATER_0_PLOC_PROC_BRD = 0x60000000,
-    HEATER_1_PCDU_BRD = 0x60000001,
-    HEATER_2_ACS_BRD = 0x60000002,
-    HEATER_3_OBC_BRD = 0x60000003,
-    HEATER_4_CAMERA = 0x60000004,
-    HEATER_5_STR = 0x60000005,
-    HEATER_6_DRO = 0x60000006,
-    HEATER_7_HPA = 0x60000007,
+  // 0x60 for other stuff
+  HEATER_0_PLOC_PROC_BRD = 0x60000000,
+  HEATER_1_PCDU_BRD = 0x60000001,
+  HEATER_2_ACS_BRD = 0x60000002,
+  HEATER_3_OBC_BRD = 0x60000003,
+  HEATER_4_CAMERA = 0x60000004,
+  HEATER_5_STR = 0x60000005,
+  HEATER_6_DRO = 0x60000006,
+  HEATER_7_HPA = 0x60000007,
 
-    // 0x73 ('s') for assemblies and system/subsystem components
-    ACS_BOARD_ASS = 0x73000001,
-    SUS_BOARD_ASS = 0x73000002,
-    TCS_BOARD_ASS = 0x73000003,
-    RW_ASS = 0x73000004
+  // 0x73 ('s') for assemblies and system/subsystem components
+  ACS_BOARD_ASS = 0x73000001,
+  SUS_BOARD_ASS = 0x73000002,
+  TCS_BOARD_ASS = 0x73000003,
+  RW_ASS = 0x73000004
 };
 }
 
-
 #endif /* COMMON_CONFIG_COMMONOBJECTS_H_ */
diff --git a/common/config/commonSubsystemIds.h b/common/config/commonSubsystemIds.h
index 0d255574..001f6d50 100644
--- a/common/config/commonSubsystemIds.h
+++ b/common/config/commonSubsystemIds.h
@@ -4,37 +4,36 @@
 #include <fsfw/events/fwSubsystemIdRanges.h>
 
 namespace SUBSYSTEM_ID {
-enum: uint8_t {
-	COMMON_SUBSYSTEM_ID_START = FW_SUBSYSTEM_ID_RANGE,
-	ACS_SUBSYSTEM = 112,
-	PCDU_HANDLER = 113,
-	HEATER_HANDLER = 114,
-	SA_DEPL_HANDLER = 115,
-	PLOC_MPSOC_HANDLER = 116,
-	IMTQ_HANDLER = 117,
-	RW_HANDLER = 118,
-	STR_HANDLER = 119,
-	PLOC_SUPERVISOR_HANDLER = 120,
-	FILE_SYSTEM = 121,
-	PLOC_UPDATER = 122,
-	PLOC_MEMORY_DUMPER = 123,
-	PDEC_HANDLER = 124,
-	STR_HELPER = 125,
-	PLOC_MPSOC_HELPER = 126,
-	PL_PCDU_HANDLER = 127,
-	ACS_BOARD_ASS = 128,
-	SUS_BOARD_ASS = 129,
-	TCS_BOARD_ASS = 130,
-	GPS_HANDLER = 131,
-	P60_DOCK_HANDLER = 132,
-	PDU1_HANDLER = 133,
-	PDU2_HANDLER = 134,
-	ACU_HANDLER = 135,
-	PLOC_SUPV_HELPER = 136,
-	SYRLINKS = 137,
-	COMMON_SUBSYSTEM_ID_END
+enum : uint8_t {
+  COMMON_SUBSYSTEM_ID_START = FW_SUBSYSTEM_ID_RANGE,
+  ACS_SUBSYSTEM = 112,
+  PCDU_HANDLER = 113,
+  HEATER_HANDLER = 114,
+  SA_DEPL_HANDLER = 115,
+  PLOC_MPSOC_HANDLER = 116,
+  IMTQ_HANDLER = 117,
+  RW_HANDLER = 118,
+  STR_HANDLER = 119,
+  PLOC_SUPERVISOR_HANDLER = 120,
+  FILE_SYSTEM = 121,
+  PLOC_UPDATER = 122,
+  PLOC_MEMORY_DUMPER = 123,
+  PDEC_HANDLER = 124,
+  STR_HELPER = 125,
+  PLOC_MPSOC_HELPER = 126,
+  PL_PCDU_HANDLER = 127,
+  ACS_BOARD_ASS = 128,
+  SUS_BOARD_ASS = 129,
+  TCS_BOARD_ASS = 130,
+  GPS_HANDLER = 131,
+  P60_DOCK_HANDLER = 132,
+  PDU1_HANDLER = 133,
+  PDU2_HANDLER = 134,
+  ACU_HANDLER = 135,
+  PLOC_SUPV_HELPER = 136,
+  SYRLINKS = 137,
+  COMMON_SUBSYSTEM_ID_END
 };
 }
 
-
 #endif /* COMMON_CONFIG_COMMONSUBSYSTEMIDS_H_ */
diff --git a/common/config/devConf.h b/common/config/devConf.h
index c3971958..37e10bf3 100644
--- a/common/config/devConf.h
+++ b/common/config/devConf.h
@@ -1,10 +1,11 @@
 #ifndef COMMON_CONFIG_DEVCONF_H_
 #define COMMON_CONFIG_DEVCONF_H_
 
-#include <cstdint>
 #include <fsfw_hal/linux/spi/spiDefinitions.h>
 #include <fsfw_hal/linux/uart/UartCookie.h>
 
+#include <cstdint>
+
 /**
  * SPI configuration will be contained here to let the device handlers remain independent
  * of SPI specific properties.
@@ -45,7 +46,7 @@ static constexpr spi::SpiModes RW_MODE = spi::SpiModes::MODE_0;
 static constexpr uint32_t RTD_SPEED = 2'000'000;
 static constexpr spi::SpiModes RTD_MODE = spi::SpiModes::MODE_3;
 
-}
+}  // namespace spi
 
 namespace uart {
 
@@ -56,6 +57,6 @@ static constexpr UartBaudRate PLOC_MPSOC_BAUD = UartBaudRate::RATE_115200;
 static constexpr UartBaudRate PLOC_SUPV_BAUD = UartBaudRate::RATE_115200;
 static constexpr UartBaudRate STAR_TRACKER_BAUD = UartBaudRate::RATE_921600;
 
-}
+}  // namespace uart
 
 #endif /* COMMON_CONFIG_DEVCONF_H_ */
diff --git a/common/config/devices/heaterSwitcherList.h b/common/config/devices/heaterSwitcherList.h
index 256e5c88..68034117 100644
--- a/common/config/devices/heaterSwitcherList.h
+++ b/common/config/devices/heaterSwitcherList.h
@@ -4,17 +4,17 @@
 #include <cstdint>
 
 namespace heater {
-	enum Switchers: uint8_t {
-		HEATER_0_OBC_BRD,
-		HEATER_1_PLOC_PROC_BRD,
-		HEATER_2_ACS_BRD,
-		HEATER_3_PCDU_PDU,
-		HEATER_4_CAMERA,
-		HEATER_5_STR,
-		HEATER_6_DRO,
-		HEATER_7_HPA,
-		NUMBER_OF_SWITCHES
-	};
+enum Switchers : uint8_t {
+  HEATER_0_OBC_BRD,
+  HEATER_1_PLOC_PROC_BRD,
+  HEATER_2_ACS_BRD,
+  HEATER_3_PCDU_PDU,
+  HEATER_4_CAMERA,
+  HEATER_5_STR,
+  HEATER_6_DRO,
+  HEATER_7_HPA,
+  NUMBER_OF_SWITCHES
+};
 }
 
 #endif /* FSFWCONFIG_DEVICES_HEATERSWITCHERLIST_H_ */
diff --git a/common/config/eive/definitions.h b/common/config/eive/definitions.h
index db430540..6a7bad05 100644
--- a/common/config/eive/definitions.h
+++ b/common/config/eive/definitions.h
@@ -19,7 +19,6 @@ static constexpr uint8_t LIVE_TM = 0;
 static constexpr uint32_t MAX_PATH_SIZE = 100;
 static constexpr uint32_t MAX_FILENAME_SIZE = 50;
 
-}
-
+}  // namespace config
 
 #endif /* COMMON_CONFIG_DEFINITIONS_H_ */
diff --git a/common/config/tmtc/apid.h b/common/config/tmtc/apid.h
index 00aabee1..8fbb4203 100644
--- a/common/config/tmtc/apid.h
+++ b/common/config/tmtc/apid.h
@@ -12,8 +12,7 @@
  * APID is a 11 bit number
  */
 namespace apid {
-	static const uint16_t EIVE_OBSW = 0x65;
+static const uint16_t EIVE_OBSW = 0x65;
 }
 
-
 #endif /* FSFWCONFIG_TMTC_APID_H_ */
diff --git a/fsfw b/fsfw
index 4841d5d9..e8023886 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 4841d5d92d721383e92b521b584c7d0e62c9873d
+Subproject commit e8023886f60ba3af0a63279da8dbc0d3eb0939a7
diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt
index c183ea60..e1d80966 100644
--- a/linux/CMakeLists.txt
+++ b/linux/CMakeLists.txt
@@ -6,6 +6,4 @@ add_subdirectory(devices)
 add_subdirectory(fsfwconfig)
 add_subdirectory(obc)
 
-target_sources(${OBSW_NAME} PUBLIC
-    ObjectFactory.cpp
-)
\ No newline at end of file
+target_sources(${OBSW_NAME} PUBLIC ObjectFactory.cpp)
diff --git a/linux/boardtest/CMakeLists.txt b/linux/boardtest/CMakeLists.txt
index 1fa4b290..0ec55120 100644
--- a/linux/boardtest/CMakeLists.txt
+++ b/linux/boardtest/CMakeLists.txt
@@ -1,10 +1,2 @@
-target_sources(${OBSW_NAME} PRIVATE
-	LibgpiodTest.cpp
-	I2cTestClass.cpp
-	SpiTestClass.cpp
-	UartTestClass.cpp
-)
-
-
-
-
+target_sources(${OBSW_NAME} PRIVATE LibgpiodTest.cpp I2cTestClass.cpp
+                                    SpiTestClass.cpp UartTestClass.cpp)
diff --git a/linux/callbacks/CMakeLists.txt b/linux/callbacks/CMakeLists.txt
index 89bb24bb..49a71c15 100644
--- a/linux/callbacks/CMakeLists.txt
+++ b/linux/callbacks/CMakeLists.txt
@@ -1,3 +1 @@
-target_sources(${OBSW_NAME} PRIVATE
-	gpioCallbacks.cpp
-)
+target_sources(${OBSW_NAME} PRIVATE gpioCallbacks.cpp)
diff --git a/linux/csp/CMakeLists.txt b/linux/csp/CMakeLists.txt
index f1ebb028..71906a69 100644
--- a/linux/csp/CMakeLists.txt
+++ b/linux/csp/CMakeLists.txt
@@ -1,8 +1 @@
-target_sources(${OBSW_NAME} PUBLIC
-	CspComIF.cpp
-	CspCookie.cpp
-)
-
-
-
-
+target_sources(${OBSW_NAME} PUBLIC CspComIF.cpp CspCookie.cpp)
diff --git a/linux/devices/CMakeLists.txt b/linux/devices/CMakeLists.txt
index 00d407e8..45f44537 100644
--- a/linux/devices/CMakeLists.txt
+++ b/linux/devices/CMakeLists.txt
@@ -1,7 +1,5 @@
 if(EIVE_BUILD_GPSD_GPS_HANDLER)
-    target_sources(${OBSW_NAME} PRIVATE
-        GPSHyperionLinuxController.cpp
-    )
+  target_sources(${OBSW_NAME} PRIVATE GPSHyperionLinuxController.cpp)
 endif()
 
 add_subdirectory(ploc)
diff --git a/linux/devices/devicedefinitions/PlocSupervisorDefinitions.h b/linux/devices/devicedefinitions/PlocSupervisorDefinitions.h
index 4cefc552..e0efda35 100644
--- a/linux/devices/devicedefinitions/PlocSupervisorDefinitions.h
+++ b/linux/devices/devicedefinitions/PlocSupervisorDefinitions.h
@@ -309,9 +309,8 @@ class ApidOnlyPacket : public SpacePacket {
  */
 class MPSoCBootSelect : public SpacePacket {
  public:
-
-	static const uint8_t NVM0 = 0;
-	static const uint8_t NVM1 = 1;
+  static const uint8_t NVM0 = 0;
+  static const uint8_t NVM1 = 1;
 
   /**
    * @brief   Constructor
diff --git a/linux/devices/ploc/CMakeLists.txt b/linux/devices/ploc/CMakeLists.txt
index bd3d6b6e..f085eab3 100644
--- a/linux/devices/ploc/CMakeLists.txt
+++ b/linux/devices/ploc/CMakeLists.txt
@@ -1,7 +1,4 @@
-target_sources(${OBSW_NAME} PRIVATE
-    PlocSupervisorHandler.cpp
-    PlocMemoryDumper.cpp
-    PlocMPSoCHandler.cpp
-    PlocMPSoCHelper.cpp
-    PlocSupvHelper.cpp
-)
+target_sources(
+  ${OBSW_NAME}
+  PRIVATE PlocSupervisorHandler.cpp PlocMemoryDumper.cpp PlocMPSoCHandler.cpp
+          PlocMPSoCHelper.cpp PlocSupvHelper.cpp)
diff --git a/linux/devices/ploc/PlocSupervisorHandler.cpp b/linux/devices/ploc/PlocSupervisorHandler.cpp
index cb1e0b09..4a71fae1 100644
--- a/linux/devices/ploc/PlocSupervisorHandler.cpp
+++ b/linux/devices/ploc/PlocSupervisorHandler.cpp
@@ -1062,7 +1062,8 @@ ReturnValue_t PlocSupervisorHandler::handleBootStatusReport(const uint8_t* data)
   nextReplyId = supv::EXE_REPORT;
 
 #if OBSW_VERBOSE_LEVEL >= 1 && OBSW_DEBUG_PLOC_SUPERVISOR == 1
-  sif::info << "PlocSupervisorHandler::handleBootStatusReport: SoC State (0 - off, 1 - booting, 2 - Update, 3 "
+  sif::info << "PlocSupervisorHandler::handleBootStatusReport: SoC State (0 - off, 1 - booting, 2 "
+               "- Update, 3 "
                "- operating, 4 - Shutdown, 5 - Reset): "
             << static_cast<unsigned int>(bootStatusReport.socState.value) << std::endl;
   sif::info << "PlocSupervisorHandler::handleBootStatusReport: Power Cycles: "
diff --git a/linux/devices/startracker/CMakeLists.txt b/linux/devices/startracker/CMakeLists.txt
index be2bf861..963b2a44 100644
--- a/linux/devices/startracker/CMakeLists.txt
+++ b/linux/devices/startracker/CMakeLists.txt
@@ -1,7 +1,4 @@
-target_sources(${OBSW_NAME} PRIVATE
-    StarTrackerHandler.cpp
-    StarTrackerJsonCommands.cpp
-    ArcsecDatalinkLayer.cpp
-    ArcsecJsonParamBase.cpp
-    StrHelper.cpp
-)
\ No newline at end of file
+target_sources(
+  ${OBSW_NAME}
+  PRIVATE StarTrackerHandler.cpp StarTrackerJsonCommands.cpp
+          ArcsecDatalinkLayer.cpp ArcsecJsonParamBase.cpp StrHelper.cpp)
diff --git a/linux/fsfwconfig/CMakeLists.txt b/linux/fsfwconfig/CMakeLists.txt
index 8d13e67b..bfede452 100644
--- a/linux/fsfwconfig/CMakeLists.txt
+++ b/linux/fsfwconfig/CMakeLists.txt
@@ -1,28 +1,16 @@
-target_sources(${OBSW_NAME} PRIVATE
-	ipc/MissionMessageTypes.cpp
-	pollingsequence/pollingSequenceFactory.cpp
-)
+target_sources(${OBSW_NAME} PRIVATE ipc/MissionMessageTypes.cpp
+                                    pollingsequence/pollingSequenceFactory.cpp)
 
-target_include_directories(${OBSW_NAME} PUBLIC
-	${CMAKE_CURRENT_SOURCE_DIR}
-)
+target_include_directories(${OBSW_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 # If a special translation file for object IDs exists, compile it.
 if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/objects/translateObjects.cpp")
-    target_sources(${OBSW_NAME} PRIVATE
-        objects/translateObjects.cpp
-    )
-    target_sources(${UNITTEST_NAME} PRIVATE
-        objects/translateObjects.cpp
-    )
+  target_sources(${OBSW_NAME} PRIVATE objects/translateObjects.cpp)
+  target_sources(${UNITTEST_NAME} PRIVATE objects/translateObjects.cpp)
 endif()
 
 # If a special translation file for events exists, compile it.
 if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/objects/translateObjects.cpp")
-    target_sources(${OBSW_NAME} PRIVATE
-        events/translateEvents.cpp
-    )
-    target_sources(${UNITTEST_NAME} PRIVATE
-        events/translateEvents.cpp
-    )
+  target_sources(${OBSW_NAME} PRIVATE events/translateEvents.cpp)
+  target_sources(${UNITTEST_NAME} PRIVATE events/translateEvents.cpp)
 endif()
diff --git a/linux/obc/CMakeLists.txt b/linux/obc/CMakeLists.txt
index 6d5c4436..e45a1fe2 100644
--- a/linux/obc/CMakeLists.txt
+++ b/linux/obc/CMakeLists.txt
@@ -1,10 +1,3 @@
-target_sources(${OBSW_NAME} PUBLIC
-	PapbVcInterface.cpp
-	Ptme.cpp
-	PdecHandler.cpp
-	PdecConfig.cpp
-	PtmeConfig.cpp
-	AxiPtmeConfig.cpp
-)
-
-
+target_sources(
+  ${OBSW_NAME} PUBLIC PapbVcInterface.cpp Ptme.cpp PdecHandler.cpp
+                      PdecConfig.cpp PtmeConfig.cpp AxiPtmeConfig.cpp)
diff --git a/linux/utility/CMakeLists.txt b/linux/utility/CMakeLists.txt
index 56937cea..f0d4e69c 100644
--- a/linux/utility/CMakeLists.txt
+++ b/linux/utility/CMakeLists.txt
@@ -1,7 +1 @@
-target_sources(${OBSW_NAME} PUBLIC
-    utility.cpp
-)
-
-
-
-
+target_sources(${OBSW_NAME} PUBLIC utility.cpp)
diff --git a/mission/controller/CMakeLists.txt b/mission/controller/CMakeLists.txt
index 2b0bac62..9587a704 100644
--- a/mission/controller/CMakeLists.txt
+++ b/mission/controller/CMakeLists.txt
@@ -1,3 +1 @@
-target_sources(${LIB_EIVE_MISSION} PRIVATE
-	ThermalController.cpp
-)
+target_sources(${LIB_EIVE_MISSION} PRIVATE ThermalController.cpp)
diff --git a/mission/core/CMakeLists.txt b/mission/core/CMakeLists.txt
index 1fdc146e..c7be4ac9 100644
--- a/mission/core/CMakeLists.txt
+++ b/mission/core/CMakeLists.txt
@@ -1,5 +1 @@
-target_sources(${LIB_EIVE_MISSION} PRIVATE
-	GenericFactory.cpp
-)
-
-
+target_sources(${LIB_EIVE_MISSION} PRIVATE GenericFactory.cpp)
diff --git a/mission/devices/CMakeLists.txt b/mission/devices/CMakeLists.txt
index 2919ff1f..b19efbc6 100644
--- a/mission/devices/CMakeLists.txt
+++ b/mission/devices/CMakeLists.txt
@@ -1,21 +1,21 @@
-target_sources(${LIB_EIVE_MISSION} PRIVATE
-    GomspaceDeviceHandler.cpp
-    BpxBatteryHandler.cpp
-    Tmp1075Handler.cpp
-    PCDUHandler.cpp
-    P60DockHandler.cpp
-    PDU1Handler.cpp
-    PDU2Handler.cpp
-    ACUHandler.cpp
-    SyrlinksHkHandler.cpp
-    Max31865PT1000Handler.cpp
-    IMTQHandler.cpp
-    HeaterHandler.cpp
-    RadiationSensorHandler.cpp
-    GyroADIS1650XHandler.cpp
-    RwHandler.cpp
-    max1227.cpp
-    SusHandler.cpp
-    PayloadPcduHandler.cpp
-    SolarArrayDeploymentHandler.cpp
-)
+target_sources(
+  ${LIB_EIVE_MISSION}
+  PRIVATE GomspaceDeviceHandler.cpp
+          BpxBatteryHandler.cpp
+          Tmp1075Handler.cpp
+          PCDUHandler.cpp
+          P60DockHandler.cpp
+          PDU1Handler.cpp
+          PDU2Handler.cpp
+          ACUHandler.cpp
+          SyrlinksHkHandler.cpp
+          Max31865PT1000Handler.cpp
+          IMTQHandler.cpp
+          HeaterHandler.cpp
+          RadiationSensorHandler.cpp
+          GyroADIS1650XHandler.cpp
+          RwHandler.cpp
+          max1227.cpp
+          SusHandler.cpp
+          PayloadPcduHandler.cpp
+          SolarArrayDeploymentHandler.cpp)
diff --git a/mission/memory/CMakeLists.txt b/mission/memory/CMakeLists.txt
index cd0938f2..132f0551 100644
--- a/mission/memory/CMakeLists.txt
+++ b/mission/memory/CMakeLists.txt
@@ -1,5 +1 @@
-target_sources(${LIB_EIVE_MISSION} PRIVATE
-	NVMParameterBase.cpp
-)
-
-
+target_sources(${LIB_EIVE_MISSION} PRIVATE NVMParameterBase.cpp)
diff --git a/mission/system/CMakeLists.txt b/mission/system/CMakeLists.txt
index 71161e91..21a2fd72 100644
--- a/mission/system/CMakeLists.txt
+++ b/mission/system/CMakeLists.txt
@@ -1,16 +1,15 @@
-target_sources(${LIB_EIVE_MISSION} PRIVATE
-    EiveSystem.cpp
-    AcsSubsystem.cpp
-    ComSubsystem.cpp
-    PayloadSubsystem.cpp
-
-    AcsBoardAssembly.cpp
-    RwAssembly.cpp
-    SusAssembly.cpp
-    DualLanePowerStateMachine.cpp
-    PowerStateMachineBase.cpp
-    DualLaneAssemblyBase.cpp
-    TcsBoardAssembly.cpp
-)
+target_sources(
+  ${LIB_EIVE_MISSION}
+  PRIVATE EiveSystem.cpp
+          AcsSubsystem.cpp
+          ComSubsystem.cpp
+          PayloadSubsystem.cpp
+          AcsBoardAssembly.cpp
+          RwAssembly.cpp
+          SusAssembly.cpp
+          DualLanePowerStateMachine.cpp
+          PowerStateMachineBase.cpp
+          DualLaneAssemblyBase.cpp
+          TcsBoardAssembly.cpp)
 
 add_subdirectory(fdir)
diff --git a/mission/system/fdir/CMakeLists.txt b/mission/system/fdir/CMakeLists.txt
index c5414fe8..37b2c290 100644
--- a/mission/system/fdir/CMakeLists.txt
+++ b/mission/system/fdir/CMakeLists.txt
@@ -1,7 +1,3 @@
-target_sources(${LIB_EIVE_MISSION} PRIVATE
-    AcsBoardFdir.cpp
-    RtdFdir.cpp
-    SusFdir.cpp
-    SyrlinksFdir.cpp
-    GomspacePowerFdir.cpp
-)
+target_sources(
+  ${LIB_EIVE_MISSION} PRIVATE AcsBoardFdir.cpp RtdFdir.cpp SusFdir.cpp
+                              SyrlinksFdir.cpp GomspacePowerFdir.cpp)
diff --git a/mission/tmtc/CMakeLists.txt b/mission/tmtc/CMakeLists.txt
index 1d3baae7..96b02307 100644
--- a/mission/tmtc/CMakeLists.txt
+++ b/mission/tmtc/CMakeLists.txt
@@ -1,6 +1 @@
-target_sources(${LIB_EIVE_MISSION} PRIVATE
-	CCSDSHandler.cpp
- 	VirtualChannel.cpp
-)
-
-
+target_sources(${LIB_EIVE_MISSION} PRIVATE CCSDSHandler.cpp VirtualChannel.cpp)
diff --git a/mission/utility/CMakeLists.txt b/mission/utility/CMakeLists.txt
index a6b2b7a7..11aff92d 100644
--- a/mission/utility/CMakeLists.txt
+++ b/mission/utility/CMakeLists.txt
@@ -1,8 +1,2 @@
-target_sources(${LIB_EIVE_MISSION} PRIVATE
-	TmFunnel.cpp
-	Timestamp.cpp
-	ProgressPrinter.cpp
-	Filenaming.cpp
-)
-
-
+target_sources(${LIB_EIVE_MISSION} PRIVATE TmFunnel.cpp Timestamp.cpp
+                                           ProgressPrinter.cpp Filenaming.cpp)
diff --git a/scripts/apply-clang-format.sh b/scripts/apply-clang-format.sh
deleted file mode 100755
index eb2f4931..00000000
--- a/scripts/apply-clang-format.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-if [[ ! -f README.md ]]; then
-	cd ..
-fi
-
-find ./mission -iname *.h -o -iname *.cpp -o -iname *.c | xargs clang-format --style=file -i
-find ./linux -iname *.h -o -iname *.cpp -o -iname *.c | xargs clang-format --style=file -i
-find ./bsp_q7s -iname *.h -o -iname *.cpp -o -iname *.c | xargs clang-format --style=file -i
-find ./bsp_linux_board -iname *.h -o -iname *.cpp -o -iname *.c | xargs clang-format --style=file -i
-find ./bsp_hosted -iname *.h -o -iname *.cpp -o -iname *.c | xargs clang-format --style=file -i
-find ./bsp_egse -iname *.h -o -iname *.cpp -o -iname *.c | xargs clang-format --style=file -i
-find ./test -iname *.h -o -iname *.cpp -o -iname *.c | xargs clang-format --style=file -i
-find ./unittest -iname *.h -o -iname *.cpp -o -iname *.c -o -type d -name build -prune | \
-	xargs clang-format --style=file -i
diff --git a/scripts/auto-formatter.sh b/scripts/auto-formatter.sh
new file mode 100755
index 00000000..9d2efbad
--- /dev/null
+++ b/scripts/auto-formatter.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+if [[ ! -f README.md ]]; then
+	cd ..
+fi
+
+folder_list=(
+  "./mission"
+  "./linux"
+  "./bsp_q7s"
+  "./bsp_linux_board"
+  "./bsp_hosted"
+  "./bsp_egse"
+  "./test"
+  "./common"
+)
+
+cmake_fmt="cmake-format"
+file_selectors="-iname CMakeLists.txt"
+if command -v ${cmake_fmt} &> /dev/null; then
+  echo "Auto-formatting all CMakeLists.txt files"
+  ${cmake_fmt} -i CMakeLists.txt
+  for dir in ${folder_list[@]}; do
+  	find ${dir} ${file_selectors} | xargs ${cmake_fmt} -i
+  done
+else
+  echo "No ${cmake_fmt} tool found, not formatting CMake files"
+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
+  for dir in ${folder_list[@]}; do
+    echo "Auto-formatting C/C++ files in ${dir} recursively"
+    find ${dir} ${file_selectors} | xargs ${cpp_format} --style=file -i
+  done
+  find ./unittest ${file_selectors} -o -type d -name build -prune | \
+	xargs clang-format --style=file -i
+else
+  echo "No ${cpp_format} tool found, not formatting C++/C files"
+fi
diff --git a/test/gpio/CMakeLists.txt b/test/gpio/CMakeLists.txt
index 880f097c..4ba24fd5 100644
--- a/test/gpio/CMakeLists.txt
+++ b/test/gpio/CMakeLists.txt
@@ -1,7 +1,3 @@
-target_sources(${OBSW_NAME} PUBLIC
-	DummyGpioIF.cpp
-)
+target_sources(${OBSW_NAME} PUBLIC DummyGpioIF.cpp)
 
-target_include_directories(${OBSW_NAME} PUBLIC
-	${CMAKE_CURRENT_SOURCE_DIR}
-)
\ No newline at end of file
+target_include_directories(${OBSW_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/test/testtasks/CMakeLists.txt b/test/testtasks/CMakeLists.txt
index 628e3c52..c0d6ed09 100644
--- a/test/testtasks/CMakeLists.txt
+++ b/test/testtasks/CMakeLists.txt
@@ -1,7 +1,3 @@
-target_sources(${OBSW_NAME} PUBLIC
-	TestTask.cpp
-)
+target_sources(${OBSW_NAME} PUBLIC TestTask.cpp)
 
-target_include_directories(${OBSW_NAME} PUBLIC
-	${CMAKE_CURRENT_SOURCE_DIR}
-)
\ No newline at end of file
+target_include_directories(${OBSW_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/tmtc b/tmtc
index b81f756e..0ebf0444 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit b81f756e4b70e55a443cba50bab0a519a0dc3591
+Subproject commit 0ebf04449668909a8f570891d27e89b93f0105c3