Merge pull request 'v1.11.0' (#243) from develop into main

Reviewed-on: #243

.gitignore

@@ -1,4 +1,5 @@
 /build*
+/cmake-build*
 
 # Eclipse
 .settings

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "etl"]
-	path = thirdparty/etl
-	url = https://github.com/ETLCPP/etl.git
 [submodule "arduino"]
 	path = arduino
 	url = https://egit.irs.uni-stuttgart.de/eive/eive_arduino_interface.git

CHANGELOG.md

@@ -3,8 +3,7 @@ Change Log
 
 All notable changes to this project will be documented in this file.
 
-The format is based on [Keep a Changelog](http://keepachangelog.com/)
-and this project adheres to [Semantic Versioning](http://semver.org/).
+The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 The [milestone](https://egit.irs.uni-stuttgart.de/eive/eive-obsw/milestones)
 list yields a list of all related PRs for each release.
@@ -13,12 +12,59 @@ list yields a list of all related PRs for each release.
 
 # [v1.11.0]
 
+## Fixed
+
+- Host build working again
+
+## Added
+
+- Custom Syrlinks FDIR which disabled most of the default FDIR functionality
+  PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/232
+- Custom Gomspace FDIR which disabled most of the default FDIR functionality
+- Custom Syrlinks FDIR which disabled most of the default FDIR functionality
+
 ## Changed
 
+- PCDU handler only called once in PST, but can handle multiple messages now
+  PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/221
+  Bugfix: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/235
 - Update rootfs base of Linux, all related OBSW changes
-- Use gpsd version 3.17 now. Includes API changes
 - Add `/usr/local/bin` to PATH. All shell scripts are there now
+- Add Syrlinks and TMP devices to Software by default
+- Update GPS Linux Hyperion Handler to use socket interface. Still allows switching
+  back to SHM interface, but the SHM interface is a possible cause of SW crashes
+- Updated code for changed FSFW HAL GPIO API: `readGpio` prototype has changed
+  PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/240 and
+  https://egit.irs.uni-stuttgart.de/eive/fsfw/pulls/76
+
+### GPS
+
+PRs: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/239
+
 - Rename GPS device to `/dev/gps0`
+- Use gpsd version 3.17 now. Includes API changes
+
+### EM and FM splitup & Build Workflow improvements
+
+PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/238
+
+- Split up `bsp_q7s` in separate EM and FM build with module loading set to different
+  default values. The EM object factory is unique which allows building a parallel setup
+  with dummy components
+- All major BSPs have an own `OBSWConfig.h.in` file which simplifies the file significantly
+- Renamed Q7S primary build folders:
+  - `cmake-build-debug-q7s` for primary development build
+  - `cmake-build-release-q7s` for primary release build
+  - `cmake-build-debug-q7s-em` for primary development build of the EM software
+  - `cmake-build-release-q7s-em` for primary release build of the EM software
+- Refactored Q7S helper script handling. It is now intended and preferred to copy the environment
+  script to the same folder level as the `eive-obsw` and source it. This will also
+  add the path containing the shell helper scripts to `PATH`
+- The actual helper shell scripts were renamed as well to `q7s-<buildSystem>-<buildType>.sh`
+
+# [v1.10.1]
+
+Version bump
 
 # [v1.10.0]
 

CMakeLists.txt

@@ -9,54 +9,109 @@
 ################################################################################
 cmake_minimum_required(VERSION 3.13)
 
+set(OBSW_VERSION_MAJOR_IF_GIT_FAILS 0)
+set(OBSW_VERSION_MINOR_IF_GIT_FAILS 0)
+set(OBSW_VERSION_REVISION_IF_GIT_FAILS 0)
+
 # set(CMAKE_VERBOSE TRUE)
 
-set(CMAKE_SCRIPT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-
-
-option(EIVE_ADD_ETL_LIB "Add ETL library" ON)
-option(EIVE_ADD_JSON_LIB "Add JSON library" ON)
 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
 )
-option(EIVE_SYSROOT_MAGIC "Perform sysroot magic which might not be necessary" OFF)
-option(EIVE_CREATE_UNIQUE_OBSW_BIN "Append username to generated binary name" ON)
-
-set(OBSW_ADD_STAR_TRACKER 0)
-set(OBSW_DEBUG_STARTRACKER 0)
 
 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/raspberrypi" OR TGT_BSP MATCHES "arm/beagleboneblack")
+    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)
 endif()
 
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 # Perform steps like loading toolchain files where applicable.
-include(${CMAKE_SCRIPT_PATH}/PreProjectConfig.cmake)
+include(PreProjectConfig)
 pre_project_config()
 
-# Check whether the user has already installed Catch2 first. This has to come before
-# the project call. We could also exclude doing this when the Q7S primary OBSW is built..
-find_package(Catch2 3 CONFIG QUIET)
-
 # Project Name
 project(eive-obsw)
 
+# Specify the C++ standard
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED True)
+
+include(EiveHelpers)
+
+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)
+else()
+    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")
+
 ################################################################################
 # Pre-Sources preparation
 ################################################################################
 
-# Specify the C++ standard
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED True)
+# 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()
+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})
+endif()
 
 # Set names and variables
 set(OBSW_NAME ${CMAKE_PROJECT_NAME})
@@ -65,7 +120,7 @@ set(SIMPLE_OBSW_NAME eive-simple)
 set(UNITTEST_NAME eive-unittest)
 set(LIB_FSFW_NAME fsfw)
 set(LIB_EIVE_MISSION eive-mission)
-set(LIB_ETL_NAME etl)
+set(LIB_ETL_TARGET etl::etl)
 set(LIB_CSP_NAME libcsp)
 set(LIB_LWGPS_NAME lwgps)
 set(LIB_ARCSEC wire)
@@ -98,7 +153,6 @@ set(EIVE_ADD_LINUX_FILES False)
 
 # Analyse different OS and architecture/target options, determine BSP_PATH,
 # display information about compiler etc.
-include (${CMAKE_SCRIPT_PATH}/HardwareOsPreConfig.cmake)
 pre_source_hw_os_config()
 
 if(TGT_BSP)
@@ -156,7 +210,7 @@ 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(${FSFW_CONFIG_PATH}/OBSWConfig.h.in OBSWConfig.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)
 elseif(TGT_BSP MATCHES "arm/raspberrypi" OR TGT_BSP MATCHES "arm/egse")
@@ -217,30 +271,8 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
 	set(COMPILER_FLAGS "/permissive-")
 endif()
 
-if (NOT(TGT_BSP MATCHES "arm/te0720-1cfa") AND NOT(TGT_BSP MATCHES "arm/q7s"))
-# Not installed, so use FetchContent to download and provide Catch2
-if(NOT Catch2_FOUND)
-    message(STATUS "Did not find a valid Catch2 installation. Using FetchContent to install it")
-    include(FetchContent)
-
-    FetchContent_Declare(
-        Catch2
-        GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-        GIT_TAG        v3.0.0-preview4
-    )
-
-    FetchContent_MakeAvailable(Catch2)
-    #fixes regression -preview4, to be confirmed in later releases
-    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()
-
-
 add_library(${LIB_EIVE_MISSION})
 
-
 # Add main executable
 add_executable(${OBSW_NAME})
 if(EIVE_CREATE_UNIQUE_OBSW_BIN)
@@ -265,20 +297,15 @@ target_include_directories(${WATCHDOG_NAME} PUBLIC
     ${CMAKE_BINARY_DIR}
 )
 
-#unittests
+# unittests
 add_executable(${UNITTEST_NAME} EXCLUDE_FROM_ALL)
 
-
-
 if(EIVE_ADD_ETL_LIB)
-    add_subdirectory(${LIB_ETL_PATH})
 endif()
 
 if(EIVE_ADD_JSON_LIB)
     add_subdirectory(${LIB_JSON_PATH})
 endif()
-
-
  
 if(EIVE_ADD_LINUX_FILES)
     add_subdirectory(${LIB_ARCSEC_PATH})
@@ -289,26 +316,74 @@ if(ADD_CSP_LIB)
     add_subdirectory(${LIB_CSP_PATH})
 endif()
 
-
 add_subdirectory(${COMMON_PATH})
 
-
-
 add_subdirectory(${LIB_LWGPS_PATH})
 add_subdirectory(${FSFW_PATH})
 add_subdirectory(${LIB_EIVE_MISSION_PATH})
 add_subdirectory(${TEST_PATH})
 
-
 add_subdirectory(${UNITTEST_PATH})
 
+# 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)
+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)
+
+        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()
+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()
+endif()
 
 ################################################################################
 # Post-Sources preparation
 ################################################################################
 
-
-
 # Add libraries
 target_link_libraries(${LIB_EIVE_MISSION} PUBLIC
     ${LIB_FSFW_NAME}
@@ -347,7 +422,7 @@ endif()
 
 if(EIVE_ADD_ETL_LIB)
     target_link_libraries(${LIB_EIVE_MISSION} PUBLIC
-        ${LIB_ETL_NAME}
+        ${LIB_ETL_TARGET}
     )
 endif()
 
@@ -382,7 +457,7 @@ endif()
 
 
 if(CMAKE_CROSSCOMPILING)
-	include (${CMAKE_SCRIPT_PATH}/HardwareOsPostConfig.cmake)
+	include (HardwareOsPostConfig)
 	post_source_hw_os_config()
 endif()
 
@@ -419,5 +494,5 @@ add_custom_command(
    COMMENT ${POST_BUILD_COMMENT}
 )
 
-include (${CMAKE_SCRIPT_PATH}/BuildType.cmake)
+include (BuildType)
 set_build_type()

README.md

@@ -39,12 +39,14 @@ Target systems:
      the [Xiphos Traq Platform](https://trac2.xiphos.ca/eive-q7). Press on index to find all
      relevant pages. The most recent datasheet can be found 
      [here](https://trac2.xiphos.ca/manual/wiki/Q7RevB/UserManual).
-   * Linux OS built with Yocto 2.5
+   * Linux OS built with Yocto 2.5. SDK and root filesystem can be rebuilt with
+     [yocto](https://egit.irs.uni-stuttgart.de/eive/q7s-yocto)
    * [Linux Kernel](https://github.com/XiphosSystemsCorp/linux-xlnx.git) . EIVE version can be found
      [here](https://github.com/spacefisch/linux-xlnx) . Pre-compiled files can be
      found [here](https://eive-cloud.irs.uni-stuttgart.de/index.php/apps/files/?dir=/EIVE_IRS/Software/q7s-linux-components&fileid=777299).
    * Q7S base project can be found [here](https://egit.irs.uni-stuttgart.de/eive/q7s-base)
-   * Minimal base project files can be found [here](https://eive-cloud.irs.uni-stuttgart.de/index.php/apps/files/?dir=/EIVE_IRS/Software/xiphos-q7s-sdk&fileid=510908)
+   * Minimal base project files and Xiphos SDK can be found
+     [here](https://eive-cloud.irs.uni-stuttgart.de/index.php/apps/files/?dir=/EIVE_IRS/Software/xiphos-q7s-sdk&fileid=510908)
 * Host System
 	* Generic software components which are not dependant on hardware can also
 	be run on a host system. All host code is contained in the `bsp_hosted` folder
@@ -55,7 +57,8 @@ Target systems:
 The steps in the primary README are related to the main OBC target Q7S.
 The CMake build system can be used to generate build systems as well (see helper scripts in `cmake/scripts`:
 
-- Linux (Raspberry Pi): See special section below.
+- Linux Raspberry Pi: See special section below. Uses the `bsp_linux_board` folder
+- Linux Trenz TE7020_1CFA: Uses the `bsp_te0720_1cfa` folder
 - Linux Host:  Uses the `bsp_hosted` BSP folder and the CMake Unix Makefiles generator.
 - Windows Host: Uses the `bsp_hosted` BSP folder, the CMake MinGW Makefiles generator and MSYS2.
 
@@ -68,7 +71,7 @@ prerequisites.
 
 1. ARM cross-compiler installed, either as part of [Vivado 2018.2 installation](#vivado) or
    as a [separate download](#arm-toolchain)
-2. [Q7S sysroot](#q7s-sysroot) on local development machine
+2. [Q7S sysroot](#sysroot) on local development machine
 3. Recommended: Eclipse or [Vivado 2018.2 SDK](#vivado) for OBSW development
 3. [TCF agent](https://wiki.eclipse.org/TCF) running on Q7S
 
@@ -96,38 +99,55 @@ When using Windows, run theses steps in MSYS2.
    git submodule update
    ```
 
-3. Ensure that the cross-compiler is working with `arm-linux-gnueabihf-gcc --version`.
-   It is recommended to set up a shell script which takes care of setting up the environment
-   for convenience or to set up the 
-   [PATH and the CROSS_COMPILE variable permanently](https://unix.stackexchange.com/questions/26047/how-to-correctly-add-a-path-to-path)
-   in the `.profile` file.
+3. Ensure that the cross-compiler is working with `arm-linux-gnueabihf-gcc --version` and that
+   the sysroot environmental variables have been set like specified in the
+   [root filesystem chapter](#sysroot).
 
 4. Run the CMake configuration to create the build system in a `build-Debug-Q7S` folder.
    Add `-G "MinGW Makefiles` in MinGW64 on Windows.
 
    ```sh
-   mkdir build-Debug-Q7S && cd build-Debug-Q7S
+   mkdir cmake-build-debug-q7s && cd cmake-build-debug-q7s
    cmake -DTGT_BSP="arm/q7s" -DCMAKE_BUILD_TYPE=Debug ..
    cmake --build . -j
    ```
 
-   You can also use provided shell scripts to perform these commands
-
+   You can also use provided shell scripts to perform these commands.
    ```sh
-   cd cmake/scripts/Q7S
-   ./make_debug_cfg.sh
-   cd ../../..
+   cp scripts/q7s-env.sh ..
+   cp scripts/q7s-env-em.sh ..
    ```
 
-   This will invoke a Python script which in turn invokes CMake with the correct
-   arguments to configure CMake for Q7S cross-compilation.
+   Adapt these scripts for your needs by editing the `CROSS_COMPILE_BIN_PATH`
+   and `ZYNQ_7020_SYSROOT`. After that, you can run the following commands to set up
+   the FM build
+
+   ```sh
+   cd ..
+   ./q7s-env.sh
+   q7s-make-debug.sh
+   ```
+
+   You can build the EM setup by running
+
+   ```sh
+   export EIVE_Q7S_EM=1
+   ```
+
+   or by running the `q7s-env-em.sh` script instead before setting up the build
+   configuration.
+
+   The shell scripts will invoke a Python script which in turn invokes CMake with the correct
+   arguments to configure CMake for Q7S cross-compilation. You can look into the command
+   output to see which commands were run exactly.
    
    There are also different values for `-DTGT_BSP` to build for the Raspberry Pi
    or the Beagle Bone Black: `arm/raspberrypi` and `arm/beagleboneblack`.
    
 5. Build the software with
+
    ```sh
-   cd build-Debug-Q7S
+   cd cmake-build-debug-q7s
    cmake --build . -j
    ```
 
@@ -166,7 +186,7 @@ The EIVE OBSW is the default target if no target is specified.
 **Debug**
 
 ```sh
-mkdir build-Debug-Q7S && cd build-Debug-Q7S
+mkdir cmake-build-debug-q7s && cd cmake-build-debug-q7s
 cmake -DTGT_BSP=arm/q7s -DCMAKE_BUILD_TYPE=Debug ..
 cmake --build . -j
 ```
@@ -174,7 +194,7 @@ cmake --build . -j
 **Release**
 
 ```sh
-mkdir build-Release-Q7S && cd build-Release-Q7S
+mkdir cmake-build-release-q7s && cd cmake-build-release-q7s
 cmake -DTGT_BSP=arm/q7s -DCMAKE_BUILD_TYPE=Release ..
 cmake --build . -j
 ```
@@ -189,7 +209,7 @@ You can also use the FSFW OSAL `host` to build on Windows or for generic OSes.
 Note: Currently this is not supported.
 
 ```sh
-mkdir build-Debug-Host && cd build-Debug-Host
+mkdir cmake-build-debug && cd cmake-build-debug
 cmake -DFSFW_OSAL=host -DCMAKE_BUILD_TYPE=Debug ..
 cmake --build . -j
 ```
@@ -200,7 +220,7 @@ To build the unittests, the corresponding target must be specified in the build
 The configure steps do not need to be repeated if the folder has already been configured.
 
 ```sh
-mkdir build-Debug-Unittest && cd build-Debug-Unittest
+mkdir cmake-build-debug && cd cmake-build-debug
 cmake ..
 cmake --build . --target eive-unittests -j
 ```
@@ -230,18 +250,19 @@ A serial console session is up permanently in a `tmux` session
 
 ### Serial console
 
-You can check whether the sessions exist with `tmux ls`
+You can check whether the sessions exist with `tmux ls`.
+This is the command to connect to the serial interface of the FM using the
+RS422 interface of the flight preparation panel:
 
 ```sh
-tmux a -t q7s-serial
+tmux a -t q7s-fm-fpp
 ```
 
 If the session does not exist, you can create it like this
 
 ```sh
-tmux new -s q7s-serial
-/bin/bash
-q7s_serial
+tmux new -s q7s-fm-fpp -t /bin/bash
+launch-q7s-fpp
 ```
 
 Other useful tmux commands:
@@ -261,55 +282,50 @@ Other useful tmux commands:
 You can use the following command to connect to the Q7S with `ssh`:
 
 ```sh
-q7s_ssh
+q7s-fm-ssh
 ```
 
-## Port forwarding for connection to TCF agent
-
-This is a required step to connect to the `tcf-agent` on the Q7S, which is required for convenient
-remote debugging. Assuming the IPv6
-
-```sh
-ssh -L 1534:192.168.133.10:1534 eive@2001:7c0:2018:1099:babe:0:e1fe:f1a5 -t /bin/bash
-```
-
-You then need to connect to `localhost` with port `1534`.
-
-## Port forwarding for file transfers with `scp`
-
-```sh
-ssh -L 1535:192.168.133.10:22 eive@2001:7c0:2018:1099:babe:0:e1fe:f1a5 -t /bin/bash
-```
-
-You then need to run `scp` with the `-P 1535` flag with `localhost` as the target IP address.
-
-## Port forwarding for TMTC commanding
-
-You can enable port forwarding for TMTC commanding with the following command:
-
-```sh
-ssh -L 1536:192.168.133.10:7301 eive@2001:7c0:2018:1099:babe:0:e1fe:f1a5 -t /bin/bash
-```
-
-This forwards TMTC packets on port `1536` of localhost to the TMTC reception port of the Q7S.
-
 ## Set up all port forwarding at once
 
+Port forwarding is necessary for remote-debugging using the `tcf-agent`, copying files
+with `scp` & `q7s-cp.py` and sending TMTC commands.
 You can specify the `-L` option multiple times to set up all port forwarding at once.
-Example for using the UDP communication interface:
 
 ```sh
-ssh -L 1534:192.168.133.10:1534 \
-   -L 1535:192.168.133.10:22 \
-   -L 1536:192.168.133.10:7301 \
+ssh -L 1534:192.168.155.55:1534 \
+   -L 1535:192.168.155.55:22 \
+   -L 1536:192.168.155.55:7301 \
+   -L 1537:127.0.0.1:7100 \
+   -L 1538:192.168.133.10:1534 \
+   -L 1539:192.168.133.10:22 \
+   -L 1540:192.168.133.10:7301 \
    eive@2001:7c0:2018:1099:babe:0:e1fe:f1a5 \
-   -t 'export CONSOLE_PREFIX="[Q7S Tunnel] /bin/bash'
+   -t 'CONSOLE_PREFIX="[Q7S Tunnel]" /bin/bash'
 ```
 
 There is also a shell script called `q7s-port.sh` which can be used to achieve the same.
 
 # <a id="set-up-prereq"></a> Setting up prerequisites
 
+## <a id="sysroot"></a> Getting system root for Linux cross-compilation
+
+Cross-compiling any program for an embedded Linux board generally required parts of the target root
+file system on the development/host computer. For the Q7S, you can install the cross-compilation
+root file system by simply installing the SDK. You can find the most recent SDK
+[here](https://eive-cloud.irs.uni-stuttgart.de/index.php/apps/files/?dir=/EIVE_IRS/Software/xiphos-q7s-sdk).
+
+If you are compiling for the Q7S or the TE7020, the `ZYNQ_7020_SYSROOT` environment variable
+must be set to the location of the SDK compile sysroot. Here is an example on how to do this
+in Ubuntu, assuming the SDK was installed in the default location
+
+```sh
+export ZYNQ_7020_SYSROOT="/opt/xiphos/sdk/ark/sysroots/cortexa9hf-neon-xiphos-linux-gnueabi"
+```
+
+If you are comiling for the Raspberry Pi, you have to set the `LINUX_ROOTFS` environmental
+variable instead. You can find a base root filesystem for the Raspberry Pi
+[here](https://eive-cloud.irs.uni-stuttgart.de/index.php/apps/files/?dir=/EIVE_IRS/Software/rootfs).
+
 ## <a id="vivado"></a> Installing Vivado the the Xilinx development tools
 
 It's also possible to perform debugging with a normal Eclipse installation by installing 
@@ -348,7 +364,9 @@ twice) and generate this list manually with the following commands, according to
    sudo apt install libncurses5
    ```
 
-2. ```sh 
+2. Execute the following command
+
+   ```sh 
    sudo <installRoot>/Vivado/2018.2/bin/vivado -nolog -nojournal -mode batch -source 
    <installRoot>/.xinstall/Vivado_2018.2/scripts/xlpartinfo.tcl -tclargs 
    <installRoot>/Vivado/2018.2/data/parts/installed_devices.txt
@@ -422,21 +440,6 @@ You can download the toolchains for Windows and Linux
    ```sh
    sudo apt-get install cmake
    ```` 
-   
-## <a id="q7s-sysroot"></a> Getting the Q7S system root
-
-It is necessary to copy the Q7S system root to your local development machine for libraries
-like `libgpio`. You can find the system root for the Q7S, the Raspberry Pi and the
-Beagle Bone Black for download here
-[here](https://eive-cloud.irs.uni-stuttgart.de/index.php/apps/files/?dir=/EIVE_IRS/Software/rootfs&fileid=831849). 
-Download it and unzip it somewhere in the Xilinx installation folder.
-You can use the following command if `wget` can be used or for CI/CD:
-
-```sh
-wget https://eive-cloud.irs.uni-stuttgart.de/index.php/s/SyXpdBBQX32xPgE/download/cortexa9hf-neon-xiphos-linux-gnueabi.tar.gz
-```
-
-Then, create a new environmental variables `Q7S_SYSROOT` and set it to the local system root path.
 
 ### Updating system root for CI
 
@@ -727,7 +730,10 @@ More detailed information about the used q7s commands can be found in the Q7S us
 
 # <a id="q7s"></a> Q7S OBC
 
-## Launching an application at start-up
+## Launching an application at start-up - deprecated
+
+This way to enable auto-startup is deprecated. It is instead recommended to tweak the yocto
+recipes file for the related `systemd` service to enable auto-startup with `SYSTEMD_AUTO_ENABLE`.
 
 You can also do the steps performed here on a host computer inside the `q7s-rootfs` directory
 of the [Q7S base repository](https://egit.irs.uni-stuttgart.de/eive/q7s-base). This might
@@ -829,10 +835,9 @@ If a timeout occurs, this special file will be deleted as well.
 The watchdog and its configuration will be directly integrated into this repostory, which
 makes adaptions easy.
 
-### `tcfagent`
+### `tcf-agent`
 
-This starts the `/usr/bin/agent` program to allows remote debugging. Might not be part of
-the mission code
+This starts the `/usr/bin/tcf-agent` program to allows remote debugging
 
 ### `eive-early-config`
 
@@ -1196,8 +1201,11 @@ Alternatively, changes from other upstreams (forks) and branches can be merged l
 in the same way.
 
 # <a id="coding-style"></a> Coding Style
+
 * the formatting is based on the clang-format tools
+
 ## Setting up eclipse auto-fromatter with clang-format
+
 1. Help &rarr; Install New Software &rarr; Add
 2. In location insert the link http://www.cppstyle.com/luna
 3. The software package CppStyle should now be available for installation

bsp_hosted/OBSWConfig.h.in

@@ -0,0 +1,122 @@
+/**
+ * @brief   This file can be used to add preprocessor define for conditional
+ *          code inclusion exclusion or various other project constants and
+ *          properties in one place.
+ */
+#ifndef FSFWCONFIG_OBSWCONFIG_H_
+#define FSFWCONFIG_OBSWCONFIG_H_
+
+#include "commonConfig.h"
+#include "OBSWVersion.h"
+    
+/*******************************************************************/
+/** All of the following flags should be enabled for mission code  */
+/*******************************************************************/
+
+#define OBSW_ENABLE_TIMERS                          1
+#define OBSW_ADD_STAR_TRACKER                       0
+#define OBSW_ADD_PLOC_SUPERVISOR                    0
+#define OBSW_ADD_PLOC_MPSOC                         0
+#define OBSW_ADD_SUN_SENSORS                        0
+#define OBSW_ADD_MGT                                0
+#define OBSW_ADD_ACS_BOARD                          0
+#define OBSW_ADD_ACS_HANDLERS                       0
+#define OBSW_ADD_GPS_0                              0
+#define OBSW_ADD_GPS_1                              0
+#define OBSW_ADD_RW                                 0
+#define OBSW_ADD_BPX_BATTERY_HANDLER                0
+#define OBSW_ADD_RTD_DEVICES                        0
+#define OBSW_ADD_PL_PCDU                            0
+#define OBSW_ADD_TMP_DEVICES                        0
+#define OBSW_ADD_RAD_SENSORS                        0
+#define OBSW_ADD_SYRLINKS                           0
+#define OBSW_STAR_TRACKER_GROUND_CONFIG             1
+
+// This is a really tricky switch.. It initializes the PCDU switches to their default states
+// at powerup. I think it would be better
+// to leave it off for now. It makes testing a lot more difficult and it might mess with
+// something the operators might want to do by giving the software too much intelligence
+// at the wrong place. The system component might command all the Switches accordingly anyway
+#define OBSW_INITIALIZE_SWITCHES                    0
+#define OBSW_ENABLE_PERIODIC_HK                     0
+
+/*******************************************************************/
+/** All of the following flags should be disabled for mission code */
+/*******************************************************************/
+
+// Can be used to switch device to NORMAL mode immediately
+#define OBSW_SWITCH_TO_NORMAL_MODE_AFTER_STARTUP    1
+#define OBSW_PRINT_MISSED_DEADLINES                 1
+
+#define OBSW_SYRLINKS_SIMULATED                     1
+#define OBSW_ADD_TEST_CODE                          0
+#define OBSW_ADD_TEST_TASK                          0
+#define OBSW_ADD_TEST_PST                           0
+// If this is enabled, all other SPI code should be disabled
+#define OBSW_ADD_SPI_TEST_CODE                      0
+// If this is enabled, all other I2C code should be disabled
+#define OBSW_ADD_I2C_TEST_CODE                      0
+#define OBSW_ADD_UART_TEST_CODE                     0
+
+#define OBSW_TEST_ACS                               0
+#define OBSW_DEBUG_ACS                              0
+#define OBSW_TEST_SUS                               0
+#define OBSW_DEBUG_SUS                              0
+#define OBSW_TEST_RTD                               0
+#define OBSW_DEBUG_RTD                              0
+#define OBSW_TEST_RAD_SENSOR                        0
+#define OBSW_DEBUG_RAD_SENSOR                       0
+#define OBSW_TEST_PL_PCDU                           0
+#define OBSW_DEBUG_PL_PCDU                          0
+#define OBSW_TEST_BPX_BATT                          0
+#define OBSW_DEBUG_BPX_BATT                         0
+#define OBSW_TEST_IMTQ                              0
+#define OBSW_DEBUG_IMTQ                             0
+#define OBSW_TEST_RW                                0
+#define OBSW_DEBUG_RW                               0
+
+#define OBSW_TEST_LIBGPIOD                          0
+#define OBSW_TEST_PLOC_HANDLER                      0
+#define OBSW_TEST_CCSDS_BRIDGE                      0
+#define OBSW_TEST_CCSDS_PTME                        0
+#define OBSW_TEST_TE7020_HEATER                     0
+#define OBSW_TEST_GPIO_OPEN_BY_LABEL                0
+#define OBSW_TEST_GPIO_OPEN_BY_LINE_NAME            0
+#define OBSW_DEBUG_P60DOCK                          0
+
+#define OBSW_PRINT_CORE_HK                          0
+#define OBSW_DEBUG_PDU1                             0
+#define OBSW_DEBUG_PDU2                             0
+#define OBSW_DEBUG_GPS                              0
+#define OBSW_DEBUG_ACU                              0
+#define OBSW_DEBUG_SYRLINKS                         0
+
+#define OBSW_DEBUG_PDEC_HANDLER                     0
+#define OBSW_DEBUG_PLOC_SUPERVISOR                  0
+#define OBSW_DEBUG_PLOC_MPSOC                       0
+#define OBSW_DEBUG_STARTRACKER                      0
+#define OBSW_TCP_SERVER_WIRETAPPING                 0
+
+/*******************************************************************/
+/** CMake Defines                                                  */
+/*******************************************************************/
+#cmakedefine EIVE_BUILD_GPSD_GPS_HANDLER
+
+#cmakedefine LIBGPS_VERSION_MAJOR @LIBGPS_VERSION_MAJOR@
+#cmakedefine LIBGPS_VERSION_MINOR @LIBGPS_VERSION_MINOR@
+
+#ifdef RASPBERRY_PI
+#include "rpiConfig.h"
+#elif defined(XIPHOS_Q7S)
+#include "q7sConfig.h"
+#endif
+
+#ifdef __cplusplus
+
+#include "objects/systemObjectList.h"
+#include "events/subsystemIdRanges.h"
+#include "returnvalues/classIds.h"
+
+#endif
+
+#endif /* FSFWCONFIG_OBSWCONFIG_H_ */

bsp_hosted/ObjectFactory.cpp

@@ -7,6 +7,7 @@
 #include <objects/systemObjectList.h>
 #include <tmtc/apid.h>
 #include <tmtc/pusIds.h>
+#include "fsfw_tests/integration/task/TestTask.h"
 
 #include "OBSWConfig.h"
 

bsp_hosted/bsp_hosted.mk

@@ -1,11 +0,0 @@
-# add main and others
-CXXSRC += $(wildcard $(CURRENTPATH)/*.cpp)
-CSRC += $(wildcard $(CURRENTPATH)/*.c)
-
-CSRC += $(wildcard $(CURRENTPATH)/boardconfig/*.c)
-
-CXXSRC += $(wildcard $(CURRENTPATH)/comIF/*.cpp)
-CSRC += $(wildcard $(CURRENTPATH)/comIF/*.c)
-
-INCLUDES += $(CURRENTPATH)/boardconfig
-INCLUDES += $(CURRENTPATH)/fsfwconfig

bsp_hosted/fsfwconfig/OBSWConfig.h.in

@@ -8,11 +8,13 @@
 
 #include "commonConfig.h"
 
-#define OBSW_ADD_TEST_CODE      1
+#define OBSW_PRINT_MISSED_DEADLINES                 1
+
+#define OBSW_ADD_TEST_CODE                          1
 
 /* These defines should be disabled for mission code but are useful for
 debugging. */
-#define OBSW_VEBOSE_LEVEL       1
+#define OBSW_VEBOSE_LEVEL                           1
 
 #define OBSW_USE_CCSDS_IP_CORE                      0
 // Set to 1 if all telemetry should be sent to the PTME IP Core
@@ -20,6 +22,12 @@ debugging. */
 // Set to 1 if telecommands are received via the PDEC IP Core
 #define OBSW_TC_FROM_PDEC                           0
 
+#define OBSW_SYRLINKS_SIMULATED                     0
+
+#define OBSW_INITIALIZE_SWITCHES                    0
+
+#define OBSW_TCP_SERVER_WIRETAPPING                 0
+
 #ifdef __cplusplus
 
 #include "objects/systemObjectList.h"

bsp_hosted/main.cpp

@@ -1,7 +1,7 @@
 #include <iostream>
 
 #include "InitMission.h"
-#include "OBSWVersion.h"
+#include "commonConfig.h"
 #include "fsfw/FSFWVersion.h"
 #include "fsfw/tasks/TaskFactory.h"
 #ifdef WIN32
@@ -19,9 +19,9 @@ static const char* COMPILE_PRINTOUT = "unknown OS";
 int main(void) {
   std::cout << "-- EIVE OBSW --" << std::endl;
   std::cout << "-- Compiled for " << COMPILE_PRINTOUT << " --" << std::endl;
-  std::cout << "-- OBSW " << SW_NAME << " v" << SW_VERSION << "." << SW_SUBVERSION << "."
-            << SW_REVISION << ", FSFW v" << FSFW_VERSION << "." << FSFW_SUBVERSION << "."
-            << FSFW_REVISION << "--" << std::endl;
+  std::cout << "-- OBSW "
+            << "v" << common::OBSW_VERSION << " | FSFW v" << fsfw::FSFW_VERSION << " --"
+            << std::endl;
   std::cout << "-- " << __DATE__ << " " << __TIME__ << " --" << std::endl;
 
   initmission::initMission();

bsp_linux_board/OBSWConfig.h.in

@@ -0,0 +1,122 @@
+/**
+ * @brief   This file can be used to add preprocessor define for conditional
+ *          code inclusion exclusion or various other project constants and
+ *          properties in one place.
+ */
+#ifndef FSFWCONFIG_OBSWCONFIG_H_
+#define FSFWCONFIG_OBSWCONFIG_H_
+
+#include "commonConfig.h"
+#include "OBSWVersion.h"
+     
+/*******************************************************************/
+/** All of the following flags should be enabled for mission code  */
+/*******************************************************************/
+
+#define OBSW_ENABLE_TIMERS                          1
+#define OBSW_ADD_STAR_TRACKER                       0
+#define OBSW_ADD_PLOC_SUPERVISOR                    0
+#define OBSW_ADD_PLOC_MPSOC                         0
+#define OBSW_ADD_SUN_SENSORS                        0
+#define OBSW_ADD_MGT                                0
+#define OBSW_ADD_ACS_BOARD                          0
+#define OBSW_ADD_ACS_HANDLERS                       0
+#define OBSW_ADD_GPS_0                              0
+#define OBSW_ADD_GPS_1                              0
+#define OBSW_ADD_RW                                 0
+#define OBSW_ADD_BPX_BATTERY_HANDLER                0
+#define OBSW_ADD_RTD_DEVICES                        0
+#define OBSW_ADD_PL_PCDU                            0
+#define OBSW_ADD_TMP_DEVICES                        0
+#define OBSW_ADD_RAD_SENSORS                        0
+#define OBSW_ADD_SYRLINKS                           0
+#define OBSW_STAR_TRACKER_GROUND_CONFIG             1
+
+// This is a really tricky switch.. It initializes the PCDU switches to their default states
+// at powerup. I think it would be better
+// to leave it off for now. It makes testing a lot more difficult and it might mess with
+// something the operators might want to do by giving the software too much intelligence
+// at the wrong place. The system component might command all the Switches accordingly anyway
+#define OBSW_INITIALIZE_SWITCHES                    0
+#define OBSW_ENABLE_PERIODIC_HK                     0
+
+/*******************************************************************/
+/** All of the following flags should be disabled for mission code */
+/*******************************************************************/
+
+// Can be used to switch device to NORMAL mode immediately
+#define OBSW_SWITCH_TO_NORMAL_MODE_AFTER_STARTUP    1
+#define OBSW_PRINT_MISSED_DEADLINES                 1
+
+#define OBSW_SYRLINKS_SIMULATED                     1
+#define OBSW_ADD_TEST_CODE                          0
+#define OBSW_ADD_TEST_TASK                          0
+#define OBSW_ADD_TEST_PST                           0
+// If this is enabled, all other SPI code should be disabled
+#define OBSW_ADD_SPI_TEST_CODE                      0
+// If this is enabled, all other I2C code should be disabled
+#define OBSW_ADD_I2C_TEST_CODE                      0
+#define OBSW_ADD_UART_TEST_CODE                     0
+
+#define OBSW_TEST_ACS                               0
+#define OBSW_DEBUG_ACS                              0
+#define OBSW_TEST_SUS                               0
+#define OBSW_DEBUG_SUS                              0
+#define OBSW_TEST_RTD                               0
+#define OBSW_DEBUG_RTD                              0
+#define OBSW_TEST_RAD_SENSOR                        0
+#define OBSW_DEBUG_RAD_SENSOR                       0
+#define OBSW_TEST_PL_PCDU                           0
+#define OBSW_DEBUG_PL_PCDU                          0
+#define OBSW_TEST_BPX_BATT                          0
+#define OBSW_DEBUG_BPX_BATT                         0
+#define OBSW_TEST_IMTQ                              0
+#define OBSW_DEBUG_IMTQ                             0
+#define OBSW_TEST_RW                                0
+#define OBSW_DEBUG_RW                               0
+
+#define OBSW_TEST_LIBGPIOD                          0
+#define OBSW_TEST_PLOC_HANDLER                      0
+#define OBSW_TEST_CCSDS_BRIDGE                      0
+#define OBSW_TEST_CCSDS_PTME                        0
+#define OBSW_TEST_TE7020_HEATER                     0
+#define OBSW_TEST_GPIO_OPEN_BY_LABEL                0
+#define OBSW_TEST_GPIO_OPEN_BY_LINE_NAME            0
+#define OBSW_DEBUG_P60DOCK                          0
+
+#define OBSW_PRINT_CORE_HK                          0
+#define OBSW_DEBUG_PDU1                             0
+#define OBSW_DEBUG_PDU2                             0
+#define OBSW_DEBUG_GPS                              0
+#define OBSW_DEBUG_ACU                              0
+#define OBSW_DEBUG_SYRLINKS                         0
+
+#define OBSW_DEBUG_PDEC_HANDLER                     0
+#define OBSW_DEBUG_PLOC_SUPERVISOR                  0
+#define OBSW_DEBUG_PLOC_MPSOC                       0
+#define OBSW_DEBUG_STARTRACKER                      0
+#define OBSW_TCP_SERVER_WIRETAPPING                 0
+
+/*******************************************************************/
+/** CMake Defines                                                  */
+/*******************************************************************/
+#cmakedefine EIVE_BUILD_GPSD_GPS_HANDLER
+
+#cmakedefine LIBGPS_VERSION_MAJOR @LIBGPS_VERSION_MAJOR@
+#cmakedefine LIBGPS_VERSION_MINOR @LIBGPS_VERSION_MINOR@
+
+#ifdef RASPBERRY_PI
+#include "rpiConfig.h"
+#elif defined(XIPHOS_Q7S)
+#include "q7sConfig.h"
+#endif
+
+#ifdef __cplusplus
+
+#include "objects/systemObjectList.h"
+#include "events/subsystemIdRanges.h"
+#include "returnvalues/classIds.h"
+
+#endif
+
+#endif /* FSFWCONFIG_OBSWCONFIG_H_ */

bsp_linux_board/ObjectFactory.cpp

@@ -121,7 +121,7 @@ void ObjectFactory::createRpiAcsBoard(GpioIF* gpioIF, std::string spiDev) {
   auto mgmLis3Handler =
       new MgmLIS3MDLHandler(objects::MGM_0_LIS3_HANDLER, objects::SPI_COM_IF, spiCookie, 0);
   mgmLis3Handler->setStartUpImmediately();
-#if FSFW_HAL_LIS3MDL_MGM_DEBUG == 1
+#if OBSW_TEST_ACS == 1
   mgmLis3Handler->setToGoToNormalMode(true);
 #endif
 
@@ -131,7 +131,7 @@ void ObjectFactory::createRpiAcsBoard(GpioIF* gpioIF, std::string spiDev) {
   auto mgmRm3100Handler =
       new MgmRM3100Handler(objects::MGM_1_RM3100_HANDLER, objects::SPI_COM_IF, spiCookie, 0);
   mgmRm3100Handler->setStartUpImmediately();
-#if FSFW_HAL_RM3100_MGM_DEBUG == 1
+#if OBSW_TEST_ACS == 1
   mgmRm3100Handler->setToGoToNormalMode(true);
 #endif
 
@@ -141,7 +141,7 @@ void ObjectFactory::createRpiAcsBoard(GpioIF* gpioIF, std::string spiDev) {
   mgmLis3Handler =
       new MgmLIS3MDLHandler(objects::MGM_2_LIS3_HANDLER, objects::SPI_COM_IF, spiCookie, 0);
   mgmLis3Handler->setStartUpImmediately();
-#if FSFW_HAL_LIS3MDL_MGM_DEBUG == 1
+#if OBSW_TEST_ACS == 1
   mgmLis3Handler->setToGoToNormalMode(true);
 #endif
 
@@ -151,7 +151,7 @@ void ObjectFactory::createRpiAcsBoard(GpioIF* gpioIF, std::string spiDev) {
   mgmRm3100Handler =
       new MgmRM3100Handler(objects::MGM_3_RM3100_HANDLER, objects::SPI_COM_IF, spiCookie, 0);
   mgmRm3100Handler->setStartUpImmediately();
-#if FSFW_HAL_RM3100_MGM_DEBUG == 1
+#if OBSW_TEST_ACS == 1
   mgmRm3100Handler->setToGoToNormalMode(true);
 #endif
 
@@ -167,7 +167,7 @@ void ObjectFactory::createRpiAcsBoard(GpioIF* gpioIF, std::string spiDev) {
   auto gyroL3gHandler =
       new GyroHandlerL3GD20H(objects::GYRO_1_L3G_HANDLER, objects::SPI_COM_IF, spiCookie, 0);
   gyroL3gHandler->setStartUpImmediately();
-#if FSFW_HAL_L3GD20_GYRO_DEBUG == 1
+#if OBSW_TEST_ACS == 1
   gyroL3gHandler->setToGoToNormalMode(true);
 #endif
 
@@ -184,7 +184,7 @@ void ObjectFactory::createRpiAcsBoard(GpioIF* gpioIF, std::string spiDev) {
   gyroL3gHandler =
       new GyroHandlerL3GD20H(objects::GYRO_3_L3G_HANDLER, objects::SPI_COM_IF, spiCookie, 0);
   gyroL3gHandler->setStartUpImmediately();
-#if FSFW_HAL_L3GD20_GYRO_DEBUG == 1
+#if OBSW_TEST_ACS == 1
   gyroL3gHandler->setToGoToNormalMode(true);
 #endif
 }

bsp_q7s/CMakeLists.txt

@@ -13,6 +13,7 @@ add_subdirectory(simple)
 
 target_sources(${OBSW_NAME} PUBLIC
 	main.cpp
+    obsw.cpp
 )
 
 add_subdirectory(boardtest)
@@ -20,6 +21,13 @@ add_subdirectory(boardtest)
 add_subdirectory(boardconfig)
 add_subdirectory(comIF)
 add_subdirectory(core)
+
+if(EIVE_Q7S_EM)
+    add_subdirectory(em)
+else()
+    add_subdirectory(fm)
+endif()
+
 add_subdirectory(memory)
 add_subdirectory(callbacks)
 add_subdirectory(xadc)

bsp_q7s/OBSWConfig.h.in

@@ -0,0 +1,126 @@
+/**
+ * @brief   This file can be used to add preprocessor define for conditional
+ *          code inclusion exclusion or various other project constants and
+ *          properties in one place.
+ */
+#ifndef FSFWCONFIG_OBSWCONFIG_H_
+#define FSFWCONFIG_OBSWCONFIG_H_
+
+#include "commonConfig.h"
+#include "q7sConfig.h"
+#include "OBSWVersion.h"
+
+/*******************************************************************/
+/** All of the following flags should be enabled for mission code  */
+/*******************************************************************/
+
+#define OBSW_USE_CCSDS_IP_CORE                      1
+// Set to 1 if all telemetry should be sent to the PTME IP Core
+#define OBSW_TM_TO_PTME                             0
+// Set to 1 if telecommands are received via the PDEC IP Core
+#define OBSW_TC_FROM_PDEC                           0
+
+#define OBSW_ENABLE_TIMERS                          1
+#define OBSW_ADD_GOMSPACE_PCDU                      @OBSW_ADD_GOMSPACE_PCDU@
+#define OBSW_ADD_MGT                                @OBSW_ADD_MGT@
+#define OBSW_ADD_BPX_BATTERY_HANDLER                @OBSW_ADD_BPX_BATTERY_HANDLER@
+#define OBSW_ADD_STAR_TRACKER                       @OBSW_ADD_STAR_TRACKER@
+#define OBSW_ADD_PLOC_SUPERVISOR                    0
+#define OBSW_ADD_PLOC_MPSOC                         0
+#define OBSW_ADD_SUN_SENSORS                        @OBSW_ADD_SUN_SENSORS@
+#define OBSW_ADD_SUS_BOARD_ASS                      @OBSW_ADD_SUS_BOARD_ASS@
+#define OBSW_ADD_ACS_BOARD                          @OBSW_ADD_ACS_BOARD@
+#define OBSW_ADD_ACS_HANDLERS                       @OBSW_ADD_ACS_HANDLERS@
+#define OBSW_ADD_RW                                 @OBSW_ADD_RW@
+#define OBSW_ADD_RTD_DEVICES                        @OBSW_ADD_RTD_DEVICES@
+#define OBSW_ADD_TMP_DEVICES                        @OBSW_ADD_TMP_DEVICES@
+#define OBSW_ADD_RAD_SENSORS                        @OBSW_ADD_RAD_SENSORS@
+#define OBSW_ADD_PL_PCDU                            @OBSW_ADD_PL_PCDU@
+#define OBSW_ADD_SYRLINKS                           @OBSW_ADD_SYRLINKS@
+#define OBSW_ENABLE_SYRLINKS_TRANSMIT_TIMEOUT       0
+
+// This is a really tricky switch.. It initializes the PCDU switches to their default states
+// at powerup. I think it would be better
+// to leave it off for now. It makes testing a lot more difficult and it might mess with
+// something the operators might want to do by giving the software too much intelligence
+// at the wrong place. The system component might command all the Switches accordingly anyway
+#define OBSW_INITIALIZE_SWITCHES                    0
+#define OBSW_ENABLE_PERIODIC_HK                     0
+
+/*******************************************************************/
+/** All of the following flags should be disabled for mission code */
+/*******************************************************************/
+
+// Can be used to switch device to NORMAL mode immediately
+#define OBSW_SWITCH_TO_NORMAL_MODE_AFTER_STARTUP    1
+#define OBSW_PRINT_MISSED_DEADLINES                 1
+
+#define OBSW_STAR_TRACKER_GROUND_CONFIG             1
+#define OBSW_SYRLINKS_SIMULATED                     1
+#define OBSW_ADD_TEST_CODE                          0
+#define OBSW_ADD_TEST_TASK                          0
+#define OBSW_ADD_TEST_PST                           0
+// If this is enabled, all other SPI code should be disabled
+#define OBSW_ADD_SPI_TEST_CODE                      0
+// If this is enabled, all other I2C code should be disabled
+#define OBSW_ADD_I2C_TEST_CODE                      0
+#define OBSW_ADD_UART_TEST_CODE                     0
+
+#define OBSW_TEST_ACS                               0
+#define OBSW_DEBUG_ACS                              0
+#define OBSW_TEST_SUS                               0
+#define OBSW_DEBUG_SUS                              0
+#define OBSW_TEST_RTD                               0
+#define OBSW_DEBUG_RTD                              0
+#define OBSW_TEST_RAD_SENSOR                        0
+#define OBSW_DEBUG_RAD_SENSOR                       0
+#define OBSW_TEST_PL_PCDU                           0
+#define OBSW_DEBUG_PL_PCDU                          0
+#define OBSW_TEST_BPX_BATT                          0
+#define OBSW_DEBUG_BPX_BATT                         0
+#define OBSW_TEST_IMTQ                              0
+#define OBSW_DEBUG_IMTQ                             0
+#define OBSW_TEST_RW                                0
+#define OBSW_DEBUG_RW                               0
+
+#define OBSW_TEST_LIBGPIOD                          0
+#define OBSW_TEST_PLOC_HANDLER                      0
+#define OBSW_TEST_CCSDS_BRIDGE                      0
+#define OBSW_TEST_CCSDS_PTME                        0
+#define OBSW_TEST_TE7020_HEATER                     0
+#define OBSW_TEST_GPIO_OPEN_BY_LABEL                0
+#define OBSW_TEST_GPIO_OPEN_BY_LINE_NAME            0
+#define OBSW_DEBUG_P60DOCK                          0
+
+#define OBSW_PRINT_CORE_HK                          0
+#define OBSW_DEBUG_PDU1                             0
+#define OBSW_DEBUG_PDU2                             0
+#define OBSW_DEBUG_GPS                              0
+#define OBSW_DEBUG_ACU                              0
+#define OBSW_DEBUG_SYRLINKS                         0
+
+#define OBSW_DEBUG_PDEC_HANDLER                     0
+#define OBSW_DEBUG_PLOC_SUPERVISOR                  0
+#define OBSW_DEBUG_PLOC_MPSOC                       0
+#define OBSW_DEBUG_STARTRACKER                      0
+
+#define OBSW_TCP_SERVER_WIRETAPPING                 0
+
+/*******************************************************************/
+/** CMake Defines                                                  */
+/*******************************************************************/
+#cmakedefine EIVE_BUILD_GPSD_GPS_HANDLER
+
+#cmakedefine LIBGPS_VERSION_MAJOR @LIBGPS_VERSION_MAJOR@
+#cmakedefine LIBGPS_VERSION_MINOR @LIBGPS_VERSION_MINOR@
+
+
+#ifdef __cplusplus
+
+#include "objects/systemObjectList.h"
+#include "events/subsystemIdRanges.h"
+#include "returnvalues/classIds.h"
+
+#endif
+
+#endif /* FSFWCONFIG_OBSWCONFIG_H_ */

bsp_q7s/boardconfig/q7sConfig.h.in

@@ -3,6 +3,8 @@
 
 #include <cstdint>
 
+#define OBSW_Q7S_EM                                 @OBSW_Q7S_EM@
+
 /*******************************************************************/
 /** All of the following flags should be enabled for mission code  */
 /*******************************************************************/

bsp_q7s/boardtest/Q7STestTask.cpp

@@ -23,8 +23,9 @@
 Q7STestTask::Q7STestTask(object_id_t objectId) : TestTask(objectId) {
   doTestSdCard = false;
   doTestScratchApi = false;
-  doTestGps = false;
-  doTestXadc = true;
+  doTestGpsShm = false;
+  doTestGpsSocket = false;
+  doTestXadc = false;
 }
 
 ReturnValue_t Q7STestTask::performOneShotAction() {
@@ -36,15 +37,20 @@ ReturnValue_t Q7STestTask::performOneShotAction() {
   }
   // testJsonLibDirect();
   // testDummyParams();
-  // testProtHandler();
+  if (doTestProtHandler) {
+    testProtHandler();
+  }
   FsOpCodes opCode = FsOpCodes::APPEND_TO_FILE;
   testFileSystemHandlerDirect(opCode);
   return TestTask::performOneShotAction();
 }
 
 ReturnValue_t Q7STestTask::performPeriodicAction() {
-  if (doTestGps) {
-    testGpsDaemon();
+  if (doTestGpsShm) {
+    testGpsDaemonShm();
+  }
+  if (doTestGpsSocket) {
+    testGpsDaemonSocket();
   }
   if (doTestXadc) {
     xadcTest();
@@ -150,13 +156,13 @@ void Q7STestTask::testDummyParams() {
   result = param.getValue<int>(DummyParameter::DUMMY_KEY_PARAM_1, test);
   if (result != HasReturnvaluesIF::RETURN_OK) {
     sif::warning << "Q7STestTask::testDummyParams: Key " << DummyParameter::DUMMY_KEY_PARAM_1
-                 << " does not exist" << std::endl;
+        << " does not exist" << std::endl;
   }
   std::string test2;
   result = param.getValue<std::string>(DummyParameter::DUMMY_KEY_PARAM_2, test2);
   if (result != HasReturnvaluesIF::RETURN_OK) {
     sif::warning << "Q7STestTask::testDummyParams: Key " << DummyParameter::DUMMY_KEY_PARAM_1
-                 << " does not exist" << std::endl;
+        << " does not exist" << std::endl;
   }
   sif::info << "Test value (3 expected): " << test << std::endl;
   sif::info << "Test value 2 (\"blirb\" expected): " << test2 << std::endl;
@@ -166,7 +172,7 @@ ReturnValue_t Q7STestTask::initialize() {
   coreController = ObjectManager::instance()->get<CoreController>(objects::CORE_CONTROLLER);
   if (coreController == nullptr) {
     sif::warning << "Q7STestTask::initialize: Could not retrieve CORE_CONTROLLER object"
-                 << std::endl;
+        << std::endl;
   }
   return TestTask::initialize();
 }
@@ -176,14 +182,14 @@ void Q7STestTask::testProtHandler() {
   ReturnValue_t result = HasReturnvaluesIF::RETURN_OK;
   // If any chips are unlocked, lock them here
   result = coreController->setBootCopyProtection(xsc::Chip::ALL_CHIP, xsc::Copy::ALL_COPY, true,
-                                                 opPerformed, true);
+      opPerformed, true);
   if (result != HasReturnvaluesIF::RETURN_OK) {
     sif::warning << "Q7STestTask::testProtHandler: Op failed" << std::endl;
   }
 
   // unlock own copy
   result = coreController->setBootCopyProtection(xsc::Chip::SELF_CHIP, xsc::Copy::SELF_COPY, false,
-                                                 opPerformed, true);
+      opPerformed, true);
   if (result != HasReturnvaluesIF::RETURN_OK) {
     sif::warning << "Q7STestTask::testProtHandler: Op failed" << std::endl;
   }
@@ -197,7 +203,7 @@ void Q7STestTask::testProtHandler() {
 
   // lock own copy
   result = coreController->setBootCopyProtection(xsc::Chip::SELF_CHIP, xsc::Copy::SELF_COPY, true,
-                                                 opPerformed, true);
+      opPerformed, true);
   if (result != HasReturnvaluesIF::RETURN_OK) {
     sif::warning << "Q7STestTask::testProtHandler: Op failed" << std::endl;
   }
@@ -211,7 +217,7 @@ void Q7STestTask::testProtHandler() {
 
   // unlock specific copy
   result = coreController->setBootCopyProtection(xsc::Chip::CHIP_1, xsc::Copy::COPY_1, false,
-                                                 opPerformed, true);
+      opPerformed, true);
   if (result != HasReturnvaluesIF::RETURN_OK) {
     sif::warning << "Q7STestTask::testProtHandler: Op failed" << std::endl;
   }
@@ -225,7 +231,7 @@ void Q7STestTask::testProtHandler() {
 
   // lock specific copy
   result = coreController->setBootCopyProtection(xsc::Chip::CHIP_1, xsc::Copy::COPY_1, true,
-                                                 opPerformed, true);
+      opPerformed, true);
   if (result != HasReturnvaluesIF::RETURN_OK) {
     sif::warning << "Q7STestTask::testProtHandler: Op failed" << std::endl;
   }
@@ -238,8 +244,8 @@ void Q7STestTask::testProtHandler() {
   }
 }
 
-void Q7STestTask::testGpsDaemon() {
-  gpsmm gpsmm(GPSD_SHARED_MEMORY, 0);
+void Q7STestTask::testGpsDaemonShm() {
+  gpsmm gpsmm(GPSD_SHARED_MEMORY, "");
   gps_data_t* gps;
   gps = gpsmm.read();
   if (gps == nullptr) {
@@ -266,11 +272,74 @@ void Q7STestTask::testGpsDaemon() {
   sif::info << "Speed(m/s): " << gps->fix.speed << std::endl;
 }
 
+void Q7STestTask::testGpsDaemonSocket() {
+  if(gpsmmShmPtr == nullptr) {
+    gpsmmShmPtr = new gpsmm("localhost", DEFAULT_GPSD_PORT);
+  }
+  // The data from the device will generally be read all at once. Therefore, we
+  // can set all field here
+  if (not gpsmmShmPtr->is_open()) {
+    if (gpsNotOpenSwitch) {
+      // Opening failed
+#if FSFW_VERBOSE_LEVEL >= 1
+      sif::warning << "Q7STestTask::testGpsDaemonSocket: Opening GPSMM failed | "
+          << "Error " << errno << " | " << gps_errstr(errno) << std::endl;
+#endif
+
+      gpsNotOpenSwitch = false;
+    }
+    return;
+  }
+  // Stopwatch watch;
+  gps_data_t *gps = nullptr;
+  gpsmmShmPtr->stream(WATCH_ENABLE | WATCH_JSON);
+  if(not gpsmmShmPtr->waiting(50000000)) {
+    return;
+  }
+  gps = gpsmmShmPtr->read();
+  if (gps == nullptr) {
+    if (gpsReadFailedSwitch) {
+      gpsReadFailedSwitch = false;
+      sif::warning << "Q7STestTask::testGpsDaemonSocket: Reading GPS data failed"
+          << std::endl;
+    }
+    return;
+  }
+  if (MODE_SET != (MODE_SET & gps->set)) {
+    if (noModeSetCntr >= 0) {
+      noModeSetCntr++;
+    }
+    if (noModeSetCntr == 10) {
+      // TODO: Trigger event here
+      sif::warning << "Q7STestTask::testGpsDaemonSocket: No mode could be "
+          "read for 10 consecutive reads"
+          << std::endl;
+      noModeSetCntr = -1;
+    }
+    return;
+  } else {
+    noModeSetCntr = 0;
+  }
+  sif::info << "-- Q7STestTask: GPS socket read test --" << std::endl;
+#if LIBGPS_VERSION_MINOR <= 17
+  time_t timeRaw = gps->fix.time;
+#else
+  time_t timeRaw = gps->fix.time.tv_sec;
+#endif
+  std::tm* time = gmtime(&timeRaw);
+  sif::info << "Time: " << std::put_time(time, "%c %Z") << std::endl;
+  sif::info << "Visible satellites: " << gps->satellites_visible << std::endl;
+  sif::info << "Satellites used: " << gps->satellites_used << std::endl;
+  sif::info << "Fix (0:Not Seen|1:No Fix|2:2D|3:3D): " << gps->fix.mode << std::endl;
+  sif::info << "Latitude: " << gps->fix.latitude << std::endl;
+  sif::info << "Longitude: " << gps->fix.longitude << std::endl;
+}
+
 void Q7STestTask::testFileSystemHandlerDirect(FsOpCodes opCode) {
   auto fsHandler = ObjectManager::instance()->get<FileSystemHandler>(objects::FILE_SYSTEM_HANDLER);
   if (fsHandler == nullptr) {
     sif::warning << "Q7STestTask::testFileSystemHandlerDirect: No FS handler running.."
-                 << std::endl;
+        << std::endl;
   }
   FileSystemHandler::FsCommandCfg cfg = {};
   ReturnValue_t result = HasReturnvaluesIF::RETURN_OK;
@@ -297,115 +366,115 @@ void Q7STestTask::testFileSystemHandlerDirect(FsOpCodes opCode) {
   };
 
   switch (opCode) {
-    case (FsOpCodes::CREATE_EMPTY_FILE_IN_TMP): {
-      // No mount prefix, cause file is created in tmp
-      cfg.useMountPrefix = false;
-      sif::info << "Creating empty file in /tmp folder" << std::endl;
-      // Do not delete file, user can check existence in shell
+  case (FsOpCodes::CREATE_EMPTY_FILE_IN_TMP): {
+    // No mount prefix, cause file is created in tmp
+    cfg.useMountPrefix = false;
+    sif::info << "Creating empty file in /tmp folder" << std::endl;
+    // Do not delete file, user can check existence in shell
+    fsHandler->createFile("/tmp/", "test.txt", nullptr, 0, &cfg);
+    break;
+  }
+  case (FsOpCodes::REMOVE_TMP_FILE): {
+    sif::info << "Deleting /tmp/test.txt sample file" << std::endl;
+    // No mount prefix, cause file is created in tmp
+    cfg.useMountPrefix = false;
+    if (not std::filesystem::exists("/tmp/test.txt")) {
+      // Creating sample file
+      sif::info << "Creating sample file /tmp/test.txt to delete" << std::endl;
       fsHandler->createFile("/tmp/", "test.txt", nullptr, 0, &cfg);
-      break;
     }
-    case (FsOpCodes::REMOVE_TMP_FILE): {
-      sif::info << "Deleting /tmp/test.txt sample file" << std::endl;
-      // No mount prefix, cause file is created in tmp
-      cfg.useMountPrefix = false;
-      if (not std::filesystem::exists("/tmp/test.txt")) {
-        // Creating sample file
-        sif::info << "Creating sample file /tmp/test.txt to delete" << std::endl;
-        fsHandler->createFile("/tmp/", "test.txt", nullptr, 0, &cfg);
-      }
-      result = fsHandler->removeFile("/tmp", "test.txt", &cfg);
-      if (result == HasReturnvaluesIF::RETURN_OK) {
-        sif::info << "File removed successfully" << std::endl;
-      } else {
-        sif::warning << "File removal failed!" << std::endl;
-      }
-      break;
+    result = fsHandler->removeFile("/tmp", "test.txt", &cfg);
+    if (result == HasReturnvaluesIF::RETURN_OK) {
+      sif::info << "File removed successfully" << std::endl;
+    } else {
+      sif::warning << "File removal failed!" << std::endl;
     }
-    case (FsOpCodes::CREATE_DIR_IN_TMP): {
-      // No mount prefix, cause file is created in tmp
-      cfg.useMountPrefix = false;
-      sif::info << "Creating empty file in /tmp folder" << std::endl;
-      // Do not delete file, user can check existence in shell
-      ReturnValue_t result = fsHandler->createDirectory("/tmp/", "test", false, &cfg);
-      if (result == HasReturnvaluesIF::RETURN_OK) {
-        sif::info << "Directory created successfully" << std::endl;
-      } else {
-        sif::warning << "Directory creation failed!" << std::endl;
-      }
-      break;
+    break;
+  }
+  case (FsOpCodes::CREATE_DIR_IN_TMP): {
+    // No mount prefix, cause file is created in tmp
+    cfg.useMountPrefix = false;
+    sif::info << "Creating empty file in /tmp folder" << std::endl;
+    // Do not delete file, user can check existence in shell
+    ReturnValue_t result = fsHandler->createDirectory("/tmp/", "test", false, &cfg);
+    if (result == HasReturnvaluesIF::RETURN_OK) {
+      sif::info << "Directory created successfully" << std::endl;
+    } else {
+      sif::warning << "Directory creation failed!" << std::endl;
     }
-    case (FsOpCodes::REMOVE_EMPTY_DIR_IN_TMP): {
-      // No mount prefix, cause file is created in tmp
-      cfg.useMountPrefix = false;
-      if (not std::filesystem::exists("/tmp/test")) {
-        result = fsHandler->createDirectory("/tmp", "test", false, &cfg);
-      } else {
-        // Delete any leftover files to regular dir removal works
-        std::remove("/tmp/test/*");
-      }
-      result = fsHandler->removeDirectory("/tmp/", "test", false, &cfg);
-      if (result == HasReturnvaluesIF::RETURN_OK) {
-        sif::info << "Directory removed successfully" << std::endl;
-      } else {
-        sif::warning << "Directory removal failed!" << std::endl;
-      }
-      break;
+    break;
+  }
+  case (FsOpCodes::REMOVE_EMPTY_DIR_IN_TMP): {
+    // No mount prefix, cause file is created in tmp
+    cfg.useMountPrefix = false;
+    if (not std::filesystem::exists("/tmp/test")) {
+      result = fsHandler->createDirectory("/tmp", "test", false, &cfg);
+    } else {
+      // Delete any leftover files to regular dir removal works
+      std::remove("/tmp/test/*");
     }
-    case (FsOpCodes::REMOVE_FILLED_DIR_IN_TMP): {
-      result = createNonEmptyTmpDir();
-      if (result != HasReturnvaluesIF::RETURN_OK) {
-        return;
-      }
-      result = fsHandler->removeDirectory("/tmp/", "test", true, &cfg);
-      if (result == HasReturnvaluesIF::RETURN_OK) {
-        sif::info << "Directory removed recursively successfully" << std::endl;
-      } else {
-        sif::warning << "Recursive directory removal failed!" << std::endl;
-      }
-      break;
+    result = fsHandler->removeDirectory("/tmp/", "test", false, &cfg);
+    if (result == HasReturnvaluesIF::RETURN_OK) {
+      sif::info << "Directory removed successfully" << std::endl;
+    } else {
+      sif::warning << "Directory removal failed!" << std::endl;
     }
-    case (FsOpCodes::ATTEMPT_DIR_REMOVAL_NON_EMPTY): {
-      result = createNonEmptyTmpDir();
-      if (result != HasReturnvaluesIF::RETURN_OK) {
-        return;
-      }
-      result = fsHandler->removeDirectory("/tmp/", "test", false, &cfg);
-      if (result != HasReturnvaluesIF::RETURN_OK) {
-        sif::info << "Directory removal attempt failed as expected" << std::endl;
-      } else {
-        sif::warning << "Directory removal worked when it should not have!" << std::endl;
-      }
-      break;
+    break;
+  }
+  case (FsOpCodes::REMOVE_FILLED_DIR_IN_TMP): {
+    result = createNonEmptyTmpDir();
+    if (result != HasReturnvaluesIF::RETURN_OK) {
+      return;
     }
-    case (FsOpCodes::RENAME_FILE): {
-      // No mount prefix, cause file is created in tmp
-      cfg.useMountPrefix = false;
-      if (std::filesystem::exists("/tmp/test.txt")) {
-        fsHandler->removeDirectory("/tmp/", "test", false, &cfg);
-      }
-      sif::info << "Creating empty file /tmp/test.txt and rename to /tmp/test2.txt" << std::endl;
-      // Do not delete file, user can check existence in shell
-      fsHandler->createFile("/tmp/", "test.txt", nullptr, 0, &cfg);
-      fsHandler->renameFile("/tmp/", "test.txt", "test2.txt", &cfg);
-      break;
+    result = fsHandler->removeDirectory("/tmp/", "test", true, &cfg);
+    if (result == HasReturnvaluesIF::RETURN_OK) {
+      sif::info << "Directory removed recursively successfully" << std::endl;
+    } else {
+      sif::warning << "Recursive directory removal failed!" << std::endl;
     }
-    case (FsOpCodes::APPEND_TO_FILE): {
-      // No mount prefix, cause file is created in tmp
-      cfg.useMountPrefix = false;
-      if (std::filesystem::exists("/tmp/test.txt")) {
-        fsHandler->removeDirectory("/tmp/", "test", false, &cfg);
-      }
-      if (std::filesystem::exists("/tmp/test.txt")) {
-        fsHandler->removeDirectory("/tmp/", "test", false, &cfg);
-      }
-      sif::info << "Creating empty file /tmp/test.txt and adding content" << std::endl;
-      std::string content = "Hello World\n";
-      // Do not delete file, user can check existence in shell
-      fsHandler->createFile("/tmp/", "test.txt", nullptr, 0, &cfg);
-      fsHandler->appendToFile("/tmp/", "test.txt", reinterpret_cast<const uint8_t*>(content.data()),
-                              content.size(), 0, &cfg);
+    break;
+  }
+  case (FsOpCodes::ATTEMPT_DIR_REMOVAL_NON_EMPTY): {
+    result = createNonEmptyTmpDir();
+    if (result != HasReturnvaluesIF::RETURN_OK) {
+      return;
     }
+    result = fsHandler->removeDirectory("/tmp/", "test", false, &cfg);
+    if (result != HasReturnvaluesIF::RETURN_OK) {
+      sif::info << "Directory removal attempt failed as expected" << std::endl;
+    } else {
+      sif::warning << "Directory removal worked when it should not have!" << std::endl;
+    }
+    break;
+  }
+  case (FsOpCodes::RENAME_FILE): {
+    // No mount prefix, cause file is created in tmp
+    cfg.useMountPrefix = false;
+    if (std::filesystem::exists("/tmp/test.txt")) {
+      fsHandler->removeDirectory("/tmp/", "test", false, &cfg);
+    }
+    sif::info << "Creating empty file /tmp/test.txt and rename to /tmp/test2.txt" << std::endl;
+    // Do not delete file, user can check existence in shell
+    fsHandler->createFile("/tmp/", "test.txt", nullptr, 0, &cfg);
+    fsHandler->renameFile("/tmp/", "test.txt", "test2.txt", &cfg);
+    break;
+  }
+  case (FsOpCodes::APPEND_TO_FILE): {
+    // No mount prefix, cause file is created in tmp
+    cfg.useMountPrefix = false;
+    if (std::filesystem::exists("/tmp/test.txt")) {
+      fsHandler->removeDirectory("/tmp/", "test", false, &cfg);
+    }
+    if (std::filesystem::exists("/tmp/test.txt")) {
+      fsHandler->removeDirectory("/tmp/", "test", false, &cfg);
+    }
+    sif::info << "Creating empty file /tmp/test.txt and adding content" << std::endl;
+    std::string content = "Hello World\n";
+    // Do not delete file, user can check existence in shell
+    fsHandler->createFile("/tmp/", "test.txt", nullptr, 0, &cfg);
+    fsHandler->appendToFile("/tmp/", "test.txt", reinterpret_cast<const uint8_t*>(content.data()),
+        content.size(), 0, &cfg);
+  }
   }
 }
 

bsp_q7s/boardtest/Q7STestTask.h

@@ -1,6 +1,7 @@
 #ifndef BSP_Q7S_BOARDTEST_Q7STESTTASK_H_
 #define BSP_Q7S_BOARDTEST_Q7STESTTASK_H_
 
+#include <libgpsmm.h>
 #include "test/testtasks/TestTask.h"
 
 class CoreController;
@@ -14,14 +15,22 @@ class Q7STestTask : public TestTask {
  private:
   bool doTestSdCard = false;
   bool doTestScratchApi = false;
-  bool doTestGps = false;
+  bool doTestGpsShm = false;
+  bool doTestGpsSocket = false;
+  bool doTestProtHandler = false;
   bool doTestXadc = false;
 
+  bool gpsNotOpenSwitch = false;
+  bool gpsReadFailedSwitch = false;
+  int32_t noModeSetCntr = 0;
+  gpsmm* gpsmmShmPtr = nullptr;
+
   CoreController* coreController = nullptr;
   ReturnValue_t performOneShotAction() override;
   ReturnValue_t performPeriodicAction() override;
 
-  void testGpsDaemon();
+  void testGpsDaemonShm();
+  void testGpsDaemonSocket();
 
   void testSdCard();
   void fileTests();

bsp_q7s/core/CMakeLists.txt

@@ -1,8 +1,6 @@
 target_sources(${OBSW_NAME} PRIVATE
     CoreController.cpp
-    obsw.cpp
     InitMission.cpp
-    ObjectFactory.cpp
 )
 
 target_sources(${SIMPLE_OBSW_NAME} PRIVATE

bsp_q7s/core/InitMission.cpp

@@ -1,10 +1,10 @@
-#include "InitMission.h"
+#include "bsp_q7s/core/InitMission.h"
 
 #include <iostream>
 #include <vector>
 
 #include "OBSWConfig.h"
-#include "ObjectFactory.h"
+#include "bsp_q7s/core/ObjectFactory.h"
 #include "fsfw/objectmanager/ObjectManager.h"
 #include "fsfw/objectmanager/ObjectManagerIF.h"
 #include "fsfw/platform.h"
@@ -294,6 +294,7 @@ void initmission::createPstTasks(TaskFactory& factory,
   }
 #endif
 
+#if OBSW_ADD_GOMSPACE_PCDU == 1
   FixedTimeslotTaskIF* gomSpacePstTask = factory.createFixedTimeslotTask(
       "GS_PST_TASK", 70, PeriodicTaskIF::MINIMUM_STACK_SIZE * 4, 1.0, missedDeadlineFunc);
   result = pst::pstGompaceCan(gomSpacePstTask);
@@ -303,6 +304,7 @@ void initmission::createPstTasks(TaskFactory& factory,
     }
   }
   taskVec.push_back(gomSpacePstTask);
+#endif
 }
 
 void initmission::createPusTasks(TaskFactory& factory,

bsp_q7s/core/ParameterHandler.cpp

@@ -1,5 +0,0 @@
-#include "ParameterHandler.h"
-
-ParameterHandler::ParameterHandler(std::string mountPrefix) : mountPrefix(mountPrefix) {}
-
-void ParameterHandler::setMountPrefix(std::string prefix) { mountPrefix = prefix; }

bsp_q7s/core/ParameterHandler.h

@@ -1,20 +0,0 @@
-#ifndef BSP_Q7S_CORE_PARAMETERHANDLER_H_
-#define BSP_Q7S_CORE_PARAMETERHANDLER_H_
-
-#include <nlohmann/json.hpp>
-#include <string>
-
-class ParameterHandler {
- public:
-  ParameterHandler(std::string mountPrefix);
-
-  void setMountPrefix(std::string prefix);
-
-  void setUpDummyParameter();
-
- private:
-  std::string mountPrefix;
-  DummyParameter dummyParam;
-};
-
-#endif /* BSP_Q7S_CORE_PARAMETERHANDLER_H_ */

bsp_q7s/em/CMakeLists.txt

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

bsp_q7s/em/emObjectFactory.cpp

@@ -1,4 +1,5 @@
-#include "ObjectFactory.h"
+#include <mission/system/fdir/GomspacePowerFdir.h>
+#include <mission/system/fdir/SyrlinksFdir.h>
 
 #include "OBSWConfig.h"
 #include "bsp_q7s/boardtest/Q7STestTask.h"
@@ -7,6 +8,7 @@
 #include "bsp_q7s/callbacks/q7sGpioCallbacks.h"
 #include "bsp_q7s/callbacks/rwSpiCallback.h"
 #include "bsp_q7s/core/CoreController.h"
+#include "bsp_q7s/core/ObjectFactory.h"
 #include "bsp_q7s/memory/FileSystemHandler.h"
 #include "busConf.h"
 #include "ccsdsConfig.h"
@@ -37,18 +39,16 @@
 #include "linux/obc/PdecHandler.h"
 #include "linux/obc/Ptme.h"
 #include "linux/obc/PtmeConfig.h"
-#include "mission/system/AcsBoardFdir.h"
-#include "mission/system/RtdFdir.h"
 #include "mission/system/SusAssembly.h"
-#include "mission/system/SusFdir.h"
 #include "mission/system/TcsBoardAssembly.h"
+#include "mission/system/fdir/AcsBoardFdir.h"
+#include "mission/system/fdir/RtdFdir.h"
+#include "mission/system/fdir/SusFdir.h"
 #include "tmtc/apid.h"
 #include "tmtc/pusIds.h"
-
 #if OBSW_TEST_LIBGPIOD == 1
 #include "linux/boardtest/LibgpiodTest.h"
 #endif
-
 #include <sstream>
 
 #include "fsfw/datapoollocal/LocalDataPoolManager.h"
@@ -96,7 +96,6 @@
 #include "mission/tmtc/CCSDSHandler.h"
 #include "mission/tmtc/VirtualChannel.h"
 #include "mission/utility/TmFunnel.h"
-
 ResetArgs resetArgsGnss0;
 ResetArgs resetArgsGnss1;
 
@@ -111,7 +110,6 @@ void Factory::setStaticFrameworkObjectIds() {
 
   DeviceHandlerBase::powerSwitcherId = objects::PCDU_HANDLER;
   //  DeviceHandlerBase::powerSwitcherId = objects::NO_OBJECT;
-
 #if OBSW_TM_TO_PTME == 1
   TmFunnel::downlinkDestination = objects::CCSDS_HANDLER;
 #else
@@ -147,12 +145,11 @@ void ObjectFactory::produce(void* args) {
 #if OBSW_ADD_ACS_BOARD == 1
   createAcsBoardComponents(gpioComIF, uartComIF, pwrSwitcher);
 #endif
-
   createHeaterComponents();
   createSolarArrayDeploymentComponents();
   createPlPcduComponents(gpioComIF, spiComIF, pwrSwitcher);
 #if OBSW_ADD_SYRLINKS == 1
-  createSyrlinksComponents();
+  createSyrlinksComponents(pwrSwitcher);
 #endif /* OBSW_ADD_SYRLINKS == 1 */
   createRtdComponents(q7s::SPI_DEFAULT_DEV, gpioComIF, pwrSwitcher);
   createPayloadComponents(gpioComIF);
@@ -168,6 +165,9 @@ void ObjectFactory::produce(void* args) {
   imtqHandler->setStartUpImmediately();
   imtqHandler->setToGoToNormal(true);
 #endif
+#if OBSW_DEBUG_IMTQ == 1
+  imtqHandler->setDebugMode(true);
+#endif
 #endif
   createReactionWheelComponents(gpioComIF);
 
@@ -177,8 +177,10 @@ void ObjectFactory::produce(void* args) {
       new BpxBatteryHandler(objects::BPX_BATT_HANDLER, objects::I2C_COM_IF, bpxI2cCookie);
   bpxHandler->setStartUpImmediately();
   bpxHandler->setToGoToNormalMode(true);
+#if OBSW_DEBUG_BPX_BATT == 1
+  bpxHandler->setDebugMode(true);
+#endif
 #endif
-
   new FileSystemHandler(objects::FILE_SYSTEM_HANDLER);
 
 #if OBSW_ADD_STAR_TRACKER == 1
@@ -193,16 +195,13 @@ void ObjectFactory::produce(void* args) {
   starTracker->setPowerSwitcher(pwrSwitcher);
 
 #endif /* OBSW_ADD_STAR_TRACKER == 1 */
-
 #if OBSW_USE_CCSDS_IP_CORE == 1
   createCcsdsComponents(gpioComIF);
 #endif /* OBSW_USE_CCSDS_IP_CORE == 1 */
-
   /* Test Task */
 #if OBSW_ADD_TEST_CODE == 1
   createTestComponents(gpioComIF);
 #endif /* OBSW_ADD_TEST_CODE == 1 */
-
   new PlocUpdater(objects::PLOC_UPDATER);
   new PlocMemoryDumper(objects::PLOC_MEMORY_DUMPER);
 }
@@ -245,14 +244,22 @@ void ObjectFactory::createPcduComponents(LinuxLibgpioIF* gpioComIF, PowerSwitchI
   CspCookie* pdu1CspCookie = new CspCookie(PDU::MAX_REPLY_LENGTH, addresses::PDU1);
   CspCookie* pdu2CspCookie = new CspCookie(PDU::MAX_REPLY_LENGTH, addresses::PDU2);
   CspCookie* acuCspCookie = new CspCookie(ACU::MAX_REPLY_LENGTH, addresses::ACU);
-  /* Device Handler */
+
+  auto p60Fdir = new GomspacePowerFdir(objects::P60DOCK_HANDLER);
   P60DockHandler* p60dockhandler =
-      new P60DockHandler(objects::P60DOCK_HANDLER, objects::CSP_COM_IF, p60DockCspCookie);
+      new P60DockHandler(objects::P60DOCK_HANDLER, objects::CSP_COM_IF, p60DockCspCookie, p60Fdir);
+
+  auto pdu1Fdir = new GomspacePowerFdir(objects::PDU1_HANDLER);
   PDU1Handler* pdu1handler =
-      new PDU1Handler(objects::PDU1_HANDLER, objects::CSP_COM_IF, pdu1CspCookie);
+      new PDU1Handler(objects::PDU1_HANDLER, objects::CSP_COM_IF, pdu1CspCookie, pdu1Fdir);
+
+  auto pdu2Fdir = new GomspacePowerFdir(objects::PDU2_HANDLER);
   PDU2Handler* pdu2handler =
-      new PDU2Handler(objects::PDU2_HANDLER, objects::CSP_COM_IF, pdu2CspCookie);
-  ACUHandler* acuhandler = new ACUHandler(objects::ACU_HANDLER, objects::CSP_COM_IF, acuCspCookie);
+      new PDU2Handler(objects::PDU2_HANDLER, objects::CSP_COM_IF, pdu2CspCookie, pdu2Fdir);
+
+  auto acuFdir = new GomspacePowerFdir(objects::ACU_HANDLER);
+  ACUHandler* acuhandler =
+      new ACUHandler(objects::ACU_HANDLER, objects::CSP_COM_IF, acuCspCookie, acuFdir);
   auto pcduHandler = new PCDUHandler(objects::PCDU_HANDLER, 50);
 
   /**
@@ -266,6 +273,12 @@ void ObjectFactory::createPcduComponents(LinuxLibgpioIF* gpioComIF, PowerSwitchI
   if (pwrSwitcher != nullptr) {
     *pwrSwitcher = pcduHandler;
   }
+#if OBSW_DEBUG_P60DOCK == 1
+  p60dockhandler->setDebugMode(true);
+#endif
+#if OBSW_DEBUG_ACU == 1
+  acuhandler->setDebugMode(true);
+#endif
 }
 
 void ObjectFactory::createRadSensorComponent(LinuxLibgpioIF* gpioComIF) {
@@ -416,7 +429,6 @@ void ObjectFactory::createAcsBoardComponents(LinuxLibgpioIF* gpioComIF, UartComI
 #if OBSW_DEBUG_ACS == 1
   mgmLis3Handler->enablePeriodicPrintouts(true, 10);
 #endif
-
   spiCookie =
       new SpiCookie(addresses::MGM_1_RM3100, gpioIds::MGM_1_RM3100_CS, spiDev,
                     RM3100::MAX_BUFFER_SIZE, spi::DEFAULT_RM3100_MODE, spi::DEFAULT_RM3100_SPEED);
@@ -433,7 +445,6 @@ void ObjectFactory::createAcsBoardComponents(LinuxLibgpioIF* gpioComIF, UartComI
 #if OBSW_DEBUG_ACS == 1
   mgmRm3100Handler->enablePeriodicPrintouts(true, 10);
 #endif
-
   spiCookie =
       new SpiCookie(addresses::MGM_2_LIS3, gpioIds::MGM_2_LIS3_CS, spiDev,
                     MGMLIS3MDL::MAX_BUFFER_SIZE, spi::DEFAULT_LIS3_MODE, spi::DEFAULT_LIS3_SPEED);
@@ -465,7 +476,6 @@ void ObjectFactory::createAcsBoardComponents(LinuxLibgpioIF* gpioComIF, UartComI
 #if OBSW_DEBUG_ACS == 1
   mgmRm3100Handler->enablePeriodicPrintouts(true, 10);
 #endif
-
   // Commented until ACS board V2 in in clean room again
   // Gyro 0 Side A
   spiCookie = new SpiCookie(addresses::GYRO_0_ADIS, gpioIds::GYRO_0_ADIS_CS, spiDev,
@@ -484,7 +494,6 @@ void ObjectFactory::createAcsBoardComponents(LinuxLibgpioIF* gpioComIF, UartComI
 #if OBSW_DEBUG_ACS == 1
   adisHandler->enablePeriodicPrintouts(true, 10);
 #endif
-
   // Gyro 1 Side A
   spiCookie =
       new SpiCookie(addresses::GYRO_1_L3G, gpioIds::GYRO_1_L3G_CS, spiDev, L3GD20H::MAX_BUFFER_SIZE,
@@ -502,7 +511,6 @@ void ObjectFactory::createAcsBoardComponents(LinuxLibgpioIF* gpioComIF, UartComI
 #if OBSW_DEBUG_ACS == 1
   gyroL3gHandler->enablePeriodicPrintouts(true, 10);
 #endif
-
   // Gyro 2 Side B
   spiCookie = new SpiCookie(addresses::GYRO_2_ADIS, gpioIds::GYRO_2_ADIS_CS, spiDev,
                             ADIS1650X::MAXIMUM_REPLY_SIZE, spi::DEFAULT_ADIS16507_MODE,
@@ -532,7 +540,6 @@ void ObjectFactory::createAcsBoardComponents(LinuxLibgpioIF* gpioComIF, UartComI
 #if OBSW_DEBUG_ACS == 1
   gyroL3gHandler->enablePeriodicPrintouts(true, 10);
 #endif
-
   bool debugGps = false;
 #if OBSW_DEBUG_GPS == 1
   debugGps = true;
@@ -629,9 +636,14 @@ void ObjectFactory::createSyrlinksComponents(PowerSwitchIF* pwrSwitcher) {
                      syrlinks::MAX_REPLY_SIZE, UartModes::NON_CANONICAL);
   syrlinksUartCookie->setParityEven();
 
-  auto syrlinksHandler = new SyrlinksHkHandler(objects::SYRLINKS_HK_HANDLER, objects::UART_COM_IF,
-                                               syrlinksUartCookie, pcdu::PDU1_CH1_SYRLINKS_12V);
+  auto syrlinksFdir = new SyrlinksFdir(objects::SYRLINKS_HK_HANDLER);
+  auto syrlinksHandler =
+      new SyrlinksHkHandler(objects::SYRLINKS_HK_HANDLER, objects::UART_COM_IF, syrlinksUartCookie,
+                            pcdu::PDU1_CH1_SYRLINKS_12V, syrlinksFdir);
   syrlinksHandler->setPowerSwitcher(pwrSwitcher);
+#if OBSW_DEBUG_SYRLINKS == 1
+  syrlinksHandler->setDebugMode(true);
+#endif
 }
 
 void ObjectFactory::createPayloadComponents(LinuxLibgpioIF* gpioComIF) {
@@ -653,7 +665,6 @@ void ObjectFactory::createPayloadComponents(LinuxLibgpioIF* gpioComIF) {
                        plocMpsocHelper, Gpio(gpioIds::ENABLE_MPSOC_UART, gpioComIF),
                        objects::PLOC_SUPERVISOR_HANDLER);
 #endif /* OBSW_ADD_PLOC_MPSOC == 1 */
-
 #if OBSW_ADD_PLOC_SUPERVISOR == 1
   consumer << "0x" << std::hex << objects::PLOC_SUPERVISOR_HANDLER;
   auto gpioConfigSupv = new GpiodRegularByLineName(q7s::gpioNames::ENABLE_SUPV_UART, consumer.str(),
@@ -732,33 +743,32 @@ void ObjectFactory::createReactionWheelComponents(LinuxLibgpioIF* gpioComIF) {
 
   auto rwHandler1 =
       new RwHandler(objects::RW1, objects::SPI_COM_IF, rw1SpiCookie, gpioComIF, gpioIds::EN_RW1);
+  rw1SpiCookie->setCallbackArgs(rwHandler1);
 #if OBSW_DEBUG_RW == 1
   rwHandler1->setStartUpImmediately();
+  rwHandler1->setDebugMode(true);
 #endif
-  rw1SpiCookie->setCallbackArgs(rwHandler1);
-  rwHandler1->setStartUpImmediately();
-
   auto rwHandler2 =
       new RwHandler(objects::RW2, objects::SPI_COM_IF, rw2SpiCookie, gpioComIF, gpioIds::EN_RW2);
+  rw2SpiCookie->setCallbackArgs(rwHandler2);
 #if OBSW_DEBUG_RW == 1
   rwHandler2->setStartUpImmediately();
+  rwHandler2->setDebugMode(true);
 #endif
-  rw2SpiCookie->setCallbackArgs(rwHandler2);
-
   auto rwHandler3 =
       new RwHandler(objects::RW3, objects::SPI_COM_IF, rw3SpiCookie, gpioComIF, gpioIds::EN_RW3);
+  rw3SpiCookie->setCallbackArgs(rwHandler3);
 #if OBSW_DEBUG_RW == 1
   rwHandler3->setStartUpImmediately();
+  rwHandler3->setDebugMode(true);
 #endif
-  rw3SpiCookie->setCallbackArgs(rwHandler3);
-
   auto rwHandler4 =
       new RwHandler(objects::RW4, objects::SPI_COM_IF, rw4SpiCookie, gpioComIF, gpioIds::EN_RW4);
+  rw4SpiCookie->setCallbackArgs(rwHandler4);
 #if OBSW_DEBUG_RW == 1
   rwHandler4->setStartUpImmediately();
+  rwHandler4->setDebugMode(true);
 #endif
-  rw4SpiCookie->setCallbackArgs(rwHandler4);
-
 #endif /* OBSW_ADD_RW == 1 */
 }
 

bsp_q7s/fm/CMakeLists.txt

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

bsp_q7s/fm/fmObjectFactory.cpp

@@ -0,0 +1,972 @@
+#include <mission/system/fdir/GomspacePowerFdir.h>
+#include <mission/system/fdir/SyrlinksFdir.h>
+
+#include "OBSWConfig.h"
+#include "bsp_q7s/boardtest/Q7STestTask.h"
+#include "bsp_q7s/callbacks/gnssCallback.h"
+#include "bsp_q7s/callbacks/pcduSwitchCb.h"
+#include "bsp_q7s/callbacks/q7sGpioCallbacks.h"
+#include "bsp_q7s/callbacks/rwSpiCallback.h"
+#include "bsp_q7s/core/CoreController.h"
+#include "bsp_q7s/core/ObjectFactory.h"
+#include "bsp_q7s/memory/FileSystemHandler.h"
+#include "busConf.h"
+#include "ccsdsConfig.h"
+#include "devConf.h"
+#include "devices/addresses.h"
+#include "devices/gpioIds.h"
+#include "devices/powerSwitcherList.h"
+#include "fsfw/ipc/QueueFactory.h"
+#include "linux/ObjectFactory.h"
+#include "linux/boardtest/I2cTestClass.h"
+#include "linux/boardtest/SpiTestClass.h"
+#include "linux/boardtest/UartTestClass.h"
+#include "linux/callbacks/gpioCallbacks.h"
+#include "linux/csp/CspComIF.h"
+#include "linux/csp/CspCookie.h"
+#include "linux/devices/GPSHyperionLinuxController.h"
+#include "linux/devices/devicedefinitions/PlocMPSoCDefinitions.h"
+#include "linux/devices/devicedefinitions/StarTrackerDefinitions.h"
+#include "linux/devices/ploc/PlocMPSoCHandler.h"
+#include "linux/devices/ploc/PlocMPSoCHelper.h"
+#include "linux/devices/ploc/PlocMemoryDumper.h"
+#include "linux/devices/ploc/PlocSupervisorHandler.h"
+#include "linux/devices/ploc/PlocUpdater.h"
+#include "linux/devices/startracker/StarTrackerHandler.h"
+#include "linux/devices/startracker/StrHelper.h"
+#include "linux/obc/AxiPtmeConfig.h"
+#include "linux/obc/PapbVcInterface.h"
+#include "linux/obc/PdecHandler.h"
+#include "linux/obc/Ptme.h"
+#include "linux/obc/PtmeConfig.h"
+#include "mission/system/SusAssembly.h"
+#include "mission/system/TcsBoardAssembly.h"
+#include "mission/system/fdir/AcsBoardFdir.h"
+#include "mission/system/fdir/RtdFdir.h"
+#include "mission/system/fdir/SusFdir.h"
+#include "tmtc/apid.h"
+#include "tmtc/pusIds.h"
+#if OBSW_TEST_LIBGPIOD == 1
+#include "linux/boardtest/LibgpiodTest.h"
+#endif
+#include <sstream>
+
+#include "fsfw/datapoollocal/LocalDataPoolManager.h"
+#include "fsfw/tmtcpacket/pus/tm.h"
+#include "fsfw/tmtcservices/CommandingServiceBase.h"
+#include "fsfw/tmtcservices/PusServiceBase.h"
+#include "fsfw_hal/common/gpio/GpioCookie.h"
+#include "fsfw_hal/common/gpio/gpioDefinitions.h"
+#include "fsfw_hal/devicehandlers/GyroL3GD20Handler.h"
+#include "fsfw_hal/devicehandlers/MgmLIS3MDLHandler.h"
+#include "fsfw_hal/devicehandlers/MgmRM3100Handler.h"
+#include "fsfw_hal/linux/gpio/LinuxLibgpioIF.h"
+#include "fsfw_hal/linux/i2c/I2cComIF.h"
+#include "fsfw_hal/linux/i2c/I2cCookie.h"
+#include "fsfw_hal/linux/spi/SpiComIF.h"
+#include "fsfw_hal/linux/spi/SpiCookie.h"
+#include "fsfw_hal/linux/uart/UartComIF.h"
+#include "fsfw_hal/linux/uart/UartCookie.h"
+#include "mission/core/GenericFactory.h"
+#include "mission/devices/ACUHandler.h"
+#include "mission/devices/BpxBatteryHandler.h"
+#include "mission/devices/GyroADIS1650XHandler.h"
+#include "mission/devices/HeaterHandler.h"
+#include "mission/devices/IMTQHandler.h"
+#include "mission/devices/Max31865PT1000Handler.h"
+#include "mission/devices/P60DockHandler.h"
+#include "mission/devices/PCDUHandler.h"
+#include "mission/devices/PDU1Handler.h"
+#include "mission/devices/PDU2Handler.h"
+#include "mission/devices/PayloadPcduHandler.h"
+#include "mission/devices/RadiationSensorHandler.h"
+#include "mission/devices/RwHandler.h"
+#include "mission/devices/SolarArrayDeploymentHandler.h"
+#include "mission/devices/SusHandler.h"
+#include "mission/devices/SyrlinksHkHandler.h"
+#include "mission/devices/Tmp1075Handler.h"
+#include "mission/devices/devicedefinitions/GomspaceDefinitions.h"
+#include "mission/devices/devicedefinitions/Max31865Definitions.h"
+#include "mission/devices/devicedefinitions/RadSensorDefinitions.h"
+#include "mission/devices/devicedefinitions/RwDefinitions.h"
+#include "mission/devices/devicedefinitions/SusDefinitions.h"
+#include "mission/devices/devicedefinitions/SyrlinksDefinitions.h"
+#include "mission/devices/devicedefinitions/payloadPcduDefinitions.h"
+#include "mission/system/AcsBoardAssembly.h"
+#include "mission/tmtc/CCSDSHandler.h"
+#include "mission/tmtc/VirtualChannel.h"
+#include "mission/utility/TmFunnel.h"
+ResetArgs resetArgsGnss0;
+ResetArgs resetArgsGnss1;
+
+void ObjectFactory::setStatics() { Factory::setStaticFrameworkObjectIds(); }
+
+void Factory::setStaticFrameworkObjectIds() {
+  PusServiceBase::packetSource = objects::PUS_PACKET_DISTRIBUTOR;
+  PusServiceBase::packetDestination = objects::TM_FUNNEL;
+
+  CommandingServiceBase::defaultPacketSource = objects::PUS_PACKET_DISTRIBUTOR;
+  CommandingServiceBase::defaultPacketDestination = objects::TM_FUNNEL;
+
+  DeviceHandlerBase::powerSwitcherId = objects::PCDU_HANDLER;
+  //  DeviceHandlerBase::powerSwitcherId = objects::NO_OBJECT;
+#if OBSW_TM_TO_PTME == 1
+  TmFunnel::downlinkDestination = objects::CCSDS_HANDLER;
+#else
+  TmFunnel::downlinkDestination = objects::TMTC_BRIDGE;
+#endif /* OBSW_TM_TO_PTME == 1 */
+  // No storage object for now.
+  TmFunnel::storageDestination = objects::NO_OBJECT;
+
+  LocalDataPoolManager::defaultHkDestination = objects::PUS_SERVICE_3_HOUSEKEEPING;
+
+  VerificationReporter::messageReceiver = objects::PUS_SERVICE_1_VERIFICATION;
+  TmPacketBase::timeStamperId = objects::TIME_STAMPER;
+}
+
+void ObjectFactory::produce(void* args) {
+  ObjectFactory::setStatics();
+  ObjectFactory::produceGenericObjects();
+
+  LinuxLibgpioIF* gpioComIF = nullptr;
+  UartComIF* uartComIF = nullptr;
+  SpiComIF* spiComIF = nullptr;
+  I2cComIF* i2cComIF = nullptr;
+  PowerSwitchIF* pwrSwitcher = nullptr;
+  createCommunicationInterfaces(&gpioComIF, &uartComIF, &spiComIF, &i2cComIF);
+  createTmpComponents();
+  new CoreController(objects::CORE_CONTROLLER);
+
+  gpioCallbacks::disableAllDecoder(gpioComIF);
+  createPcduComponents(gpioComIF, &pwrSwitcher);
+  createRadSensorComponent(gpioComIF);
+  createSunSensorComponents(gpioComIF, spiComIF, pwrSwitcher, q7s::SPI_DEFAULT_DEV);
+
+#if OBSW_ADD_ACS_BOARD == 1
+  createAcsBoardComponents(gpioComIF, uartComIF, pwrSwitcher);
+#endif
+  createHeaterComponents();
+  createSolarArrayDeploymentComponents();
+  createPlPcduComponents(gpioComIF, spiComIF, pwrSwitcher);
+#if OBSW_ADD_SYRLINKS == 1
+  createSyrlinksComponents(pwrSwitcher);
+#endif /* OBSW_ADD_SYRLINKS == 1 */
+  createRtdComponents(q7s::SPI_DEFAULT_DEV, gpioComIF, pwrSwitcher);
+  createPayloadComponents(gpioComIF);
+
+#if OBSW_ADD_MGT == 1
+  I2cCookie* imtqI2cCookie =
+      new I2cCookie(addresses::IMTQ, IMTQ::MAX_REPLY_SIZE, q7s::I2C_DEFAULT_DEV);
+  auto imtqHandler = new IMTQHandler(objects::IMTQ_HANDLER, objects::I2C_COM_IF, imtqI2cCookie,
+                                     pcdu::Switches::PDU1_CH3_MGT_5V);
+  imtqHandler->setPowerSwitcher(pwrSwitcher);
+  static_cast<void>(imtqHandler);
+#if OBSW_TEST_IMTQ == 1
+  imtqHandler->setStartUpImmediately();
+  imtqHandler->setToGoToNormal(true);
+#endif
+#if OBSW_DEBUG_IMTQ == 1
+  imtqHandler->setDebugMode(true);
+#endif
+#endif
+  createReactionWheelComponents(gpioComIF);
+
+#if OBSW_ADD_BPX_BATTERY_HANDLER == 1
+  I2cCookie* bpxI2cCookie = new I2cCookie(addresses::BPX_BATTERY, 100, q7s::I2C_DEFAULT_DEV);
+  BpxBatteryHandler* bpxHandler =
+      new BpxBatteryHandler(objects::BPX_BATT_HANDLER, objects::I2C_COM_IF, bpxI2cCookie);
+  bpxHandler->setStartUpImmediately();
+  bpxHandler->setToGoToNormalMode(true);
+#if OBSW_DEBUG_BPX_BATT == 1
+  bpxHandler->setDebugMode(true);
+#endif
+#endif
+  new FileSystemHandler(objects::FILE_SYSTEM_HANDLER);
+
+#if OBSW_ADD_STAR_TRACKER == 1
+  UartCookie* starTrackerCookie =
+      new UartCookie(objects::STAR_TRACKER, q7s::UART_STAR_TRACKER_DEV, uart::STAR_TRACKER_BAUD,
+                     startracker::MAX_FRAME_SIZE * 2 + 2, UartModes::NON_CANONICAL);
+  starTrackerCookie->setNoFixedSizeReply();
+  StrHelper* strHelper = new StrHelper(objects::STR_HELPER);
+  auto starTracker =
+      new StarTrackerHandler(objects::STAR_TRACKER, objects::UART_COM_IF, starTrackerCookie,
+                             strHelper, pcdu::PDU1_CH2_STAR_TRACKER_5V);
+  starTracker->setPowerSwitcher(pwrSwitcher);
+
+#endif /* OBSW_ADD_STAR_TRACKER == 1 */
+#if OBSW_USE_CCSDS_IP_CORE == 1
+  createCcsdsComponents(gpioComIF);
+#endif /* OBSW_USE_CCSDS_IP_CORE == 1 */
+  /* Test Task */
+#if OBSW_ADD_TEST_CODE == 1
+  createTestComponents(gpioComIF);
+#endif /* OBSW_ADD_TEST_CODE == 1 */
+  new PlocUpdater(objects::PLOC_UPDATER);
+  new PlocMemoryDumper(objects::PLOC_MEMORY_DUMPER);
+}
+
+void ObjectFactory::createTmpComponents() {
+  I2cCookie* i2cCookieTmp1075tcs1 =
+      new I2cCookie(addresses::TMP1075_TCS_1, TMP1075::MAX_REPLY_LENGTH, q7s::I2C_DEFAULT_DEV);
+  I2cCookie* i2cCookieTmp1075tcs2 =
+      new I2cCookie(addresses::TMP1075_TCS_2, TMP1075::MAX_REPLY_LENGTH, q7s::I2C_DEFAULT_DEV);
+
+  /* Temperature sensors */
+  Tmp1075Handler* tmp1075Handler_1 =
+      new Tmp1075Handler(objects::TMP1075_HANDLER_1, objects::I2C_COM_IF, i2cCookieTmp1075tcs1);
+  (void)tmp1075Handler_1;
+  Tmp1075Handler* tmp1075Handler_2 =
+      new Tmp1075Handler(objects::TMP1075_HANDLER_2, objects::I2C_COM_IF, i2cCookieTmp1075tcs2);
+  (void)tmp1075Handler_2;
+}
+
+void ObjectFactory::createCommunicationInterfaces(LinuxLibgpioIF** gpioComIF, UartComIF** uartComIF,
+                                                  SpiComIF** spiComIF, I2cComIF** i2cComIF) {
+  if (gpioComIF == nullptr or uartComIF == nullptr or spiComIF == nullptr) {
+    sif::error << "ObjectFactory::createCommunicationInterfaces: Invalid passed ComIF pointer"
+               << std::endl;
+  }
+  *gpioComIF = new LinuxLibgpioIF(objects::GPIO_IF);
+
+  /* Communication interfaces */
+  new CspComIF(objects::CSP_COM_IF);
+  *i2cComIF = new I2cComIF(objects::I2C_COM_IF);
+  *uartComIF = new UartComIF(objects::UART_COM_IF);
+  *spiComIF = new SpiComIF(objects::SPI_COM_IF, *gpioComIF);
+
+  /* Adding gpios for chip select decoding to the gpioComIf */
+  q7s::gpioCallbacks::initSpiCsDecoder(*gpioComIF);
+}
+
+void ObjectFactory::createPcduComponents(LinuxLibgpioIF* gpioComIF, PowerSwitchIF** pwrSwitcher) {
+  CspCookie* p60DockCspCookie = new CspCookie(P60Dock::MAX_REPLY_LENGTH, addresses::P60DOCK);
+  CspCookie* pdu1CspCookie = new CspCookie(PDU::MAX_REPLY_LENGTH, addresses::PDU1);
+  CspCookie* pdu2CspCookie = new CspCookie(PDU::MAX_REPLY_LENGTH, addresses::PDU2);
+  CspCookie* acuCspCookie = new CspCookie(ACU::MAX_REPLY_LENGTH, addresses::ACU);
+
+  auto p60Fdir = new GomspacePowerFdir(objects::P60DOCK_HANDLER);
+  P60DockHandler* p60dockhandler =
+      new P60DockHandler(objects::P60DOCK_HANDLER, objects::CSP_COM_IF, p60DockCspCookie, p60Fdir);
+
+  auto pdu1Fdir = new GomspacePowerFdir(objects::PDU1_HANDLER);
+  PDU1Handler* pdu1handler =
+      new PDU1Handler(objects::PDU1_HANDLER, objects::CSP_COM_IF, pdu1CspCookie, pdu1Fdir);
+
+  auto pdu2Fdir = new GomspacePowerFdir(objects::PDU2_HANDLER);
+  PDU2Handler* pdu2handler =
+      new PDU2Handler(objects::PDU2_HANDLER, objects::CSP_COM_IF, pdu2CspCookie, pdu2Fdir);
+
+  auto acuFdir = new GomspacePowerFdir(objects::ACU_HANDLER);
+  ACUHandler* acuhandler =
+      new ACUHandler(objects::ACU_HANDLER, objects::CSP_COM_IF, acuCspCookie, acuFdir);
+  auto pcduHandler = new PCDUHandler(objects::PCDU_HANDLER, 50);
+
+  /**
+   * Setting PCDU devices to mode normal immediately after start up because PCDU is always
+   * running.
+   */
+  p60dockhandler->setModeNormal();
+  pdu1handler->setModeNormal();
+  pdu2handler->setModeNormal();
+  acuhandler->setModeNormal();
+  if (pwrSwitcher != nullptr) {
+    *pwrSwitcher = pcduHandler;
+  }
+#if OBSW_DEBUG_P60DOCK == 1
+  p60dockhandler->setDebugMode(true);
+#endif
+#if OBSW_DEBUG_ACU == 1
+  acuhandler->setDebugMode(true);
+#endif
+}
+
+void ObjectFactory::createRadSensorComponent(LinuxLibgpioIF* gpioComIF) {
+  using namespace gpio;
+  GpioCookie* gpioCookieRadSensor = new GpioCookie;
+  std::stringstream consumer;
+  consumer << "0x" << std::hex << objects::RAD_SENSOR;
+  GpiodRegularByLineName* gpio = new GpiodRegularByLineName(
+      q7s::gpioNames::RAD_SENSOR_CHIP_SELECT, consumer.str(), Direction::OUT, Levels::HIGH);
+  gpioCookieRadSensor->addGpio(gpioIds::CS_RAD_SENSOR, gpio);
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::ENABLE_RADFET, consumer.str(), Direction::OUT,
+                                    Levels::LOW);
+  gpioCookieRadSensor->addGpio(gpioIds::ENABLE_RADFET, gpio);
+  gpioComIF->addGpios(gpioCookieRadSensor);
+
+  SpiCookie* spiCookieRadSensor = new SpiCookie(
+      addresses::RAD_SENSOR, gpioIds::CS_RAD_SENSOR, std::string(q7s::SPI_DEFAULT_DEV),
+      RAD_SENSOR::READ_SIZE, spi::DEFAULT_MAX_1227_MODE, spi::DEFAULT_MAX_1227_SPEED);
+  auto radSensor = new RadiationSensorHandler(objects::RAD_SENSOR, objects::SPI_COM_IF,
+                                              spiCookieRadSensor, gpioComIF);
+  static_cast<void>(radSensor);
+  // The radiation sensor ADC is powered by the 5V stack connector which should always be on
+  radSensor->setStartUpImmediately();
+  // It's a simple sensor, so just to to normal mode immediately
+  radSensor->setToGoToNormalModeImmediately();
+#if OBSW_DEBUG_RAD_SENSOR == 1
+  radSensor->enablePeriodicDataPrint(true);
+#endif
+}
+
+void ObjectFactory::createAcsBoardComponents(LinuxLibgpioIF* gpioComIF, UartComIF* uartComIF,
+                                             PowerSwitchIF* pwrSwitcher) {
+  using namespace gpio;
+  GpioCookie* gpioCookieAcsBoard = new GpioCookie();
+
+  std::stringstream consumer;
+  GpiodRegularByLineName* gpio = nullptr;
+  consumer << "0x" << std::hex << objects::GYRO_0_ADIS_HANDLER;
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::GYRO_0_ADIS_CS, consumer.str(), Direction::OUT,
+                                    Levels::HIGH);
+  gpioCookieAcsBoard->addGpio(gpioIds::GYRO_0_ADIS_CS, gpio);
+
+  consumer.str("");
+  consumer << "0x" << std::hex << objects::GYRO_1_L3G_HANDLER;
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::GYRO_1_L3G_CS, consumer.str(), Direction::OUT,
+                                    Levels::HIGH);
+  gpioCookieAcsBoard->addGpio(gpioIds::GYRO_1_L3G_CS, gpio);
+
+  consumer.str("");
+  consumer << "0x" << std::hex << objects::GYRO_2_ADIS_HANDLER;
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::GYRO_2_ADIS_CS, consumer.str(), Direction::OUT,
+                                    Levels::HIGH);
+  gpioCookieAcsBoard->addGpio(gpioIds::GYRO_2_ADIS_CS, gpio);
+
+  consumer.str("");
+  consumer << "0x" << std::hex << objects::GYRO_3_L3G_HANDLER;
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::GYRO_3_L3G_CS, consumer.str(), Direction::OUT,
+                                    Levels::HIGH);
+  gpioCookieAcsBoard->addGpio(gpioIds::GYRO_3_L3G_CS, gpio);
+
+  consumer.str("");
+  consumer << "0x" << std::hex << objects::MGM_0_LIS3_HANDLER;
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::MGM_0_CS, consumer.str(), Direction::OUT,
+                                    Levels::HIGH);
+  gpioCookieAcsBoard->addGpio(gpioIds::MGM_0_LIS3_CS, gpio);
+
+  consumer.str("");
+  consumer << "0x" << std::hex << objects::MGM_1_RM3100_HANDLER;
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::MGM_1_CS, consumer.str(), Direction::OUT,
+                                    Levels::HIGH);
+  gpioCookieAcsBoard->addGpio(gpioIds::MGM_1_RM3100_CS, gpio);
+
+  consumer.str("");
+  consumer << "0x" << std::hex << objects::MGM_2_LIS3_HANDLER;
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::MGM_2_CS, consumer.str(), Direction::OUT,
+                                    Levels::HIGH);
+  gpioCookieAcsBoard->addGpio(gpioIds::MGM_2_LIS3_CS, gpio);
+
+  consumer.str("");
+  consumer << "0x" << std::hex << objects::MGM_3_RM3100_HANDLER;
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::MGM_3_CS, consumer.str(), Direction::OUT,
+                                    Levels::HIGH);
+  gpioCookieAcsBoard->addGpio(gpioIds::MGM_3_RM3100_CS, gpio);
+
+  consumer.str("");
+  consumer << "0x" << std::hex << objects::GPS_CONTROLLER;
+  // GNSS reset pins are active low
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::RESET_GNSS_0, consumer.str(), Direction::OUT,
+                                    Levels::HIGH);
+  gpioCookieAcsBoard->addGpio(gpioIds::GNSS_0_NRESET, gpio);
+
+  consumer.str("");
+  consumer << "0x" << std::hex << objects::GPS_CONTROLLER;
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::RESET_GNSS_1, consumer.str(), Direction::OUT,
+                                    Levels::HIGH);
+  gpioCookieAcsBoard->addGpio(gpioIds::GNSS_1_NRESET, gpio);
+
+  consumer.str("");
+  consumer << "0x" << std::hex << objects::GYRO_0_ADIS_HANDLER;
+  // Enable pins must be pulled low for regular operations
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::GYRO_0_ENABLE, consumer.str(), Direction::OUT,
+                                    Levels::LOW);
+  gpioCookieAcsBoard->addGpio(gpioIds::GYRO_0_ENABLE, gpio);
+
+  consumer.str("");
+  consumer << "0x" << std::hex << objects::GYRO_2_ADIS_HANDLER;
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::GYRO_2_ENABLE, consumer.str(), Direction::OUT,
+                                    Levels::LOW);
+  gpioCookieAcsBoard->addGpio(gpioIds::GYRO_2_ENABLE, gpio);
+
+  // Enable pins for GNSS
+  consumer.str("");
+  consumer << "0x" << std::hex << objects::GPS_CONTROLLER;
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::GNSS_0_ENABLE, consumer.str(), Direction::OUT,
+                                    Levels::LOW);
+  gpioCookieAcsBoard->addGpio(gpioIds::GNSS_0_ENABLE, gpio);
+
+  consumer.str("");
+  consumer << "0x" << std::hex << objects::GPS_CONTROLLER;
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::GNSS_1_ENABLE, consumer.str(), Direction::OUT,
+                                    Levels::LOW);
+  gpioCookieAcsBoard->addGpio(gpioIds::GNSS_1_ENABLE, gpio);
+
+  // Select pin. 0 for GPS side A, 1 for GPS side B
+  consumer.str("");
+  consumer << "0x" << std::hex << objects::GPS_CONTROLLER;
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::GNSS_SELECT, consumer.str(), Direction::OUT,
+                                    Levels::LOW);
+  gpioCookieAcsBoard->addGpio(gpioIds::GNSS_SELECT, gpio);
+  gpioComIF->addGpios(gpioCookieAcsBoard);
+  AcsBoardFdir* fdir = nullptr;
+  static_cast<void>(fdir);
+
+#if OBSW_ADD_ACS_HANDLERS == 1
+  std::string spiDev = q7s::SPI_DEFAULT_DEV;
+  SpiCookie* spiCookie =
+      new SpiCookie(addresses::MGM_0_LIS3, gpioIds::MGM_0_LIS3_CS, spiDev,
+                    MGMLIS3MDL::MAX_BUFFER_SIZE, spi::DEFAULT_LIS3_MODE, spi::DEFAULT_LIS3_SPEED);
+  auto mgmLis3Handler = new MgmLIS3MDLHandler(objects::MGM_0_LIS3_HANDLER, objects::SPI_COM_IF,
+                                              spiCookie, spi::LIS3_TRANSITION_DELAY);
+  fdir = new AcsBoardFdir(objects::MGM_0_LIS3_HANDLER);
+  mgmLis3Handler->setCustomFdir(fdir);
+  static_cast<void>(mgmLis3Handler);
+#if OBSW_TEST_ACS == 1
+  mgmLis3Handler->setStartUpImmediately();
+  mgmLis3Handler->setToGoToNormalMode(true);
+#endif
+#if OBSW_DEBUG_ACS == 1
+  mgmLis3Handler->enablePeriodicPrintouts(true, 10);
+#endif
+  spiCookie =
+      new SpiCookie(addresses::MGM_1_RM3100, gpioIds::MGM_1_RM3100_CS, spiDev,
+                    RM3100::MAX_BUFFER_SIZE, spi::DEFAULT_RM3100_MODE, spi::DEFAULT_RM3100_SPEED);
+  auto mgmRm3100Handler = new MgmRM3100Handler(objects::MGM_1_RM3100_HANDLER, objects::SPI_COM_IF,
+                                               spiCookie, spi::RM3100_TRANSITION_DELAY);
+  fdir = new AcsBoardFdir(objects::MGM_1_RM3100_HANDLER);
+  mgmRm3100Handler->setCustomFdir(fdir);
+  mgmRm3100Handler->setParent(objects::ACS_BOARD_ASS);
+  static_cast<void>(mgmRm3100Handler);
+#if OBSW_TEST_ACS == 1
+  mgmRm3100Handler->setStartUpImmediately();
+  mgmRm3100Handler->setToGoToNormalMode(true);
+#endif
+#if OBSW_DEBUG_ACS == 1
+  mgmRm3100Handler->enablePeriodicPrintouts(true, 10);
+#endif
+  spiCookie =
+      new SpiCookie(addresses::MGM_2_LIS3, gpioIds::MGM_2_LIS3_CS, spiDev,
+                    MGMLIS3MDL::MAX_BUFFER_SIZE, spi::DEFAULT_LIS3_MODE, spi::DEFAULT_LIS3_SPEED);
+  mgmLis3Handler = new MgmLIS3MDLHandler(objects::MGM_2_LIS3_HANDLER, objects::SPI_COM_IF,
+                                         spiCookie, spi::LIS3_TRANSITION_DELAY);
+  fdir = new AcsBoardFdir(objects::MGM_2_LIS3_HANDLER);
+  mgmLis3Handler->setCustomFdir(fdir);
+  mgmLis3Handler->setParent(objects::ACS_BOARD_ASS);
+  static_cast<void>(mgmLis3Handler);
+#if OBSW_TEST_ACS == 1
+  mgmLis3Handler->setStartUpImmediately();
+  mgmLis3Handler->setToGoToNormalMode(true);
+#endif
+#if OBSW_DEBUG_ACS == 1
+  mgmLis3Handler->enablePeriodicPrintouts(true, 10);
+#endif
+  spiCookie =
+      new SpiCookie(addresses::MGM_3_RM3100, gpioIds::MGM_3_RM3100_CS, spiDev,
+                    RM3100::MAX_BUFFER_SIZE, spi::DEFAULT_RM3100_MODE, spi::DEFAULT_RM3100_SPEED);
+  mgmRm3100Handler = new MgmRM3100Handler(objects::MGM_3_RM3100_HANDLER, objects::SPI_COM_IF,
+                                          spiCookie, spi::RM3100_TRANSITION_DELAY);
+  fdir = new AcsBoardFdir(objects::MGM_3_RM3100_HANDLER);
+  mgmRm3100Handler->setCustomFdir(fdir);
+  mgmRm3100Handler->setParent(objects::ACS_BOARD_ASS);
+#if OBSW_TEST_ACS == 1
+  mgmRm3100Handler->setStartUpImmediately();
+  mgmRm3100Handler->setToGoToNormalMode(true);
+#endif
+#if OBSW_DEBUG_ACS == 1
+  mgmRm3100Handler->enablePeriodicPrintouts(true, 10);
+#endif
+  // Commented until ACS board V2 in in clean room again
+  // Gyro 0 Side A
+  spiCookie = new SpiCookie(addresses::GYRO_0_ADIS, gpioIds::GYRO_0_ADIS_CS, spiDev,
+                            ADIS1650X::MAXIMUM_REPLY_SIZE, spi::DEFAULT_ADIS16507_MODE,
+                            spi::DEFAULT_ADIS16507_SPEED);
+  auto adisHandler = new GyroADIS1650XHandler(objects::GYRO_0_ADIS_HANDLER, objects::SPI_COM_IF,
+                                              spiCookie, ADIS1650X::Type::ADIS16505);
+  fdir = new AcsBoardFdir(objects::GYRO_0_ADIS_HANDLER);
+  adisHandler->setCustomFdir(fdir);
+  adisHandler->setParent(objects::ACS_BOARD_ASS);
+  static_cast<void>(adisHandler);
+#if OBSW_TEST_ACS == 1
+  adisHandler->setStartUpImmediately();
+  adisHandler->setToGoToNormalModeImmediately();
+#endif
+#if OBSW_DEBUG_ACS == 1
+  adisHandler->enablePeriodicPrintouts(true, 10);
+#endif
+  // Gyro 1 Side A
+  spiCookie =
+      new SpiCookie(addresses::GYRO_1_L3G, gpioIds::GYRO_1_L3G_CS, spiDev, L3GD20H::MAX_BUFFER_SIZE,
+                    spi::DEFAULT_L3G_MODE, spi::DEFAULT_L3G_SPEED);
+  auto gyroL3gHandler = new GyroHandlerL3GD20H(objects::GYRO_1_L3G_HANDLER, objects::SPI_COM_IF,
+                                               spiCookie, spi::L3G_TRANSITION_DELAY);
+  fdir = new AcsBoardFdir(objects::GYRO_1_L3G_HANDLER);
+  gyroL3gHandler->setCustomFdir(fdir);
+  gyroL3gHandler->setParent(objects::ACS_BOARD_ASS);
+  static_cast<void>(gyroL3gHandler);
+#if OBSW_TEST_ACS == 1
+  gyroL3gHandler->setStartUpImmediately();
+  gyroL3gHandler->setToGoToNormalMode(true);
+#endif
+#if OBSW_DEBUG_ACS == 1
+  gyroL3gHandler->enablePeriodicPrintouts(true, 10);
+#endif
+  // Gyro 2 Side B
+  spiCookie = new SpiCookie(addresses::GYRO_2_ADIS, gpioIds::GYRO_2_ADIS_CS, spiDev,
+                            ADIS1650X::MAXIMUM_REPLY_SIZE, spi::DEFAULT_ADIS16507_MODE,
+                            spi::DEFAULT_ADIS16507_SPEED);
+  adisHandler = new GyroADIS1650XHandler(objects::GYRO_2_ADIS_HANDLER, objects::SPI_COM_IF,
+                                         spiCookie, ADIS1650X::Type::ADIS16505);
+  fdir = new AcsBoardFdir(objects::GYRO_2_ADIS_HANDLER);
+  adisHandler->setCustomFdir(fdir);
+  adisHandler->setParent(objects::ACS_BOARD_ASS);
+#if OBSW_TEST_ACS == 1
+  adisHandler->setStartUpImmediately();
+  adisHandler->setToGoToNormalModeImmediately();
+#endif
+  // Gyro 3 Side B
+  spiCookie =
+      new SpiCookie(addresses::GYRO_3_L3G, gpioIds::GYRO_3_L3G_CS, spiDev, L3GD20H::MAX_BUFFER_SIZE,
+                    spi::DEFAULT_L3G_MODE, spi::DEFAULT_L3G_SPEED);
+  gyroL3gHandler = new GyroHandlerL3GD20H(objects::GYRO_3_L3G_HANDLER, objects::SPI_COM_IF,
+                                          spiCookie, spi::L3G_TRANSITION_DELAY);
+  fdir = new AcsBoardFdir(objects::GYRO_3_L3G_HANDLER);
+  gyroL3gHandler->setCustomFdir(fdir);
+  gyroL3gHandler->setParent(objects::ACS_BOARD_ASS);
+#if OBSW_TEST_ACS == 1
+  gyroL3gHandler->setStartUpImmediately();
+  gyroL3gHandler->setToGoToNormalMode(true);
+#endif
+#if OBSW_DEBUG_ACS == 1
+  gyroL3gHandler->enablePeriodicPrintouts(true, 10);
+#endif
+  bool debugGps = false;
+#if OBSW_DEBUG_GPS == 1
+  debugGps = true;
+#endif
+  resetArgsGnss1.gnss1 = true;
+  resetArgsGnss1.gpioComIF = gpioComIF;
+  resetArgsGnss1.waitPeriodMs = 100;
+  resetArgsGnss0.gnss1 = false;
+  resetArgsGnss0.gpioComIF = gpioComIF;
+  resetArgsGnss0.waitPeriodMs = 100;
+  auto gpsHandler0 =
+      new GPSHyperionLinuxController(objects::GPS_CONTROLLER, objects::NO_OBJECT, debugGps);
+  gpsHandler0->setResetPinTriggerFunction(gps::triggerGpioResetPin, &resetArgsGnss0);
+
+  AcsBoardHelper acsBoardHelper = AcsBoardHelper(
+      objects::MGM_0_LIS3_HANDLER, objects::MGM_1_RM3100_HANDLER, objects::MGM_2_LIS3_HANDLER,
+      objects::MGM_3_RM3100_HANDLER, objects::GYRO_0_ADIS_HANDLER, objects::GYRO_1_L3G_HANDLER,
+      objects::GYRO_2_ADIS_HANDLER, objects::GYRO_3_L3G_HANDLER, objects::GPS_CONTROLLER);
+  auto acsAss = new AcsBoardAssembly(objects::ACS_BOARD_ASS, objects::NO_OBJECT, pwrSwitcher,
+                                     acsBoardHelper, gpioComIF);
+  static_cast<void>(acsAss);
+#endif /* OBSW_ADD_ACS_HANDLERS == 1 */
+}
+
+void ObjectFactory::createHeaterComponents() {
+  using namespace gpio;
+  GpioCookie* heaterGpiosCookie = new GpioCookie;
+  GpiodRegularByLineName* gpio = nullptr;
+
+  std::stringstream consumer;
+  consumer << "0x" << std::hex << objects::HEATER_HANDLER;
+  /* Pin H2-11 on stack connector */
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::HEATER_0, consumer.str(), Direction::OUT,
+                                    Levels::LOW);
+  heaterGpiosCookie->addGpio(gpioIds::HEATER_0, gpio);
+  /* Pin H2-12 on stack connector */
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::HEATER_1, consumer.str(), Direction::OUT,
+                                    Levels::LOW);
+  heaterGpiosCookie->addGpio(gpioIds::HEATER_1, gpio);
+
+  /* Pin H2-13 on stack connector */
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::HEATER_2, consumer.str(), Direction::OUT,
+                                    Levels::LOW);
+  heaterGpiosCookie->addGpio(gpioIds::HEATER_2, gpio);
+
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::HEATER_3, consumer.str(), Direction::OUT,
+                                    Levels::LOW);
+  heaterGpiosCookie->addGpio(gpioIds::HEATER_3, gpio);
+
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::HEATER_4, consumer.str(), Direction::OUT,
+                                    Levels::LOW);
+  heaterGpiosCookie->addGpio(gpioIds::HEATER_4, gpio);
+
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::HEATER_5, consumer.str(), Direction::OUT,
+                                    Levels::LOW);
+  heaterGpiosCookie->addGpio(gpioIds::HEATER_5, gpio);
+
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::HEATER_6, consumer.str(), Direction::OUT,
+                                    Levels::LOW);
+  heaterGpiosCookie->addGpio(gpioIds::HEATER_6, gpio);
+
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::HEATER_7, consumer.str(), Direction::OUT,
+                                    Levels::LOW);
+  heaterGpiosCookie->addGpio(gpioIds::HEATER_7, gpio);
+
+  new HeaterHandler(objects::HEATER_HANDLER, objects::GPIO_IF, heaterGpiosCookie,
+                    objects::PCDU_HANDLER, pcdu::Switches::PDU2_CH3_TCS_BOARD_HEATER_IN_8V);
+}
+
+void ObjectFactory::createSolarArrayDeploymentComponents() {
+  using namespace gpio;
+  GpioCookie* solarArrayDeplCookie = new GpioCookie;
+  GpiodRegularByLineName* gpio = nullptr;
+
+  std::stringstream consumer;
+  consumer << "0x" << std::hex << objects::SOLAR_ARRAY_DEPL_HANDLER;
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::SA_DPL_PIN_0, consumer.str(), Direction::OUT,
+                                    Levels::LOW);
+  solarArrayDeplCookie->addGpio(gpioIds::DEPLSA1, gpio);
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::SA_DPL_PIN_1, consumer.str(), Direction::OUT,
+                                    Levels::LOW);
+  solarArrayDeplCookie->addGpio(gpioIds::DEPLSA2, gpio);
+
+  // TODO: Find out burn time. For now set to 1000 ms.
+  new SolarArrayDeploymentHandler(objects::SOLAR_ARRAY_DEPL_HANDLER, objects::GPIO_IF,
+                                  solarArrayDeplCookie, objects::PCDU_HANDLER,
+                                  pcdu::Switches::PDU2_CH5_DEPLOYMENT_MECHANISM_8V,
+                                  gpioIds::DEPLSA1, gpioIds::DEPLSA2, 1000);
+}
+
+void ObjectFactory::createSyrlinksComponents(PowerSwitchIF* pwrSwitcher) {
+  UartCookie* syrlinksUartCookie =
+      new UartCookie(objects::SYRLINKS_HK_HANDLER, q7s::UART_SYRLINKS_DEV, uart::SYRLINKS_BAUD,
+                     syrlinks::MAX_REPLY_SIZE, UartModes::NON_CANONICAL);
+  syrlinksUartCookie->setParityEven();
+
+  auto syrlinksFdir = new SyrlinksFdir(objects::SYRLINKS_HK_HANDLER);
+  auto syrlinksHandler =
+      new SyrlinksHkHandler(objects::SYRLINKS_HK_HANDLER, objects::UART_COM_IF, syrlinksUartCookie,
+                            pcdu::PDU1_CH1_SYRLINKS_12V, syrlinksFdir);
+  syrlinksHandler->setPowerSwitcher(pwrSwitcher);
+#if OBSW_DEBUG_SYRLINKS == 1
+  syrlinksHandler->setDebugMode(true);
+#endif
+}
+
+void ObjectFactory::createPayloadComponents(LinuxLibgpioIF* gpioComIF) {
+  using namespace gpio;
+  std::stringstream consumer;
+#if OBSW_ADD_PLOC_MPSOC == 1
+  consumer << "0x" << std::hex << objects::PLOC_MPSOC_HANDLER;
+  auto gpioConfigMPSoC = new GpiodRegularByLineName(q7s::gpioNames::ENABLE_MPSOC_UART,
+                                                    consumer.str(), Direction::OUT, Levels::HIGH);
+  auto mpsocGpioCookie = new GpioCookie;
+  mpsocGpioCookie->addGpio(gpioIds::ENABLE_MPSOC_UART, gpioConfigMPSoC);
+  gpioComIF->addGpios(mpsocGpioCookie);
+  auto mpsocCookie =
+      new UartCookie(objects::PLOC_MPSOC_HANDLER, q7s::UART_PLOC_MPSOC_DEV, uart::PLOC_MPSOC_BAUD,
+                     mpsoc::MAX_REPLY_SIZE, UartModes::NON_CANONICAL);
+  mpsocCookie->setNoFixedSizeReply();
+  auto plocMpsocHelper = new PlocMPSoCHelper(objects::PLOC_MPSOC_HELPER);
+  new PlocMPSoCHandler(objects::PLOC_MPSOC_HANDLER, objects::UART_COM_IF, mpsocCookie,
+                       plocMpsocHelper, Gpio(gpioIds::ENABLE_MPSOC_UART, gpioComIF),
+                       objects::PLOC_SUPERVISOR_HANDLER);
+#endif /* OBSW_ADD_PLOC_MPSOC == 1 */
+#if OBSW_ADD_PLOC_SUPERVISOR == 1
+  consumer << "0x" << std::hex << objects::PLOC_SUPERVISOR_HANDLER;
+  auto gpioConfigSupv = new GpiodRegularByLineName(q7s::gpioNames::ENABLE_SUPV_UART, consumer.str(),
+                                                   Direction::OUT, Levels::HIGH);
+  auto supvGpioCookie = new GpioCookie;
+  supvGpioCookie->addGpio(gpioIds::ENABLE_SUPV_UART, gpioConfigSupv);
+  gpioComIF->addGpios(supvGpioCookie);
+  auto supervisorCookie = new UartCookie(objects::PLOC_SUPERVISOR_HANDLER,
+                                         q7s::UART_PLOC_SUPERVSIOR_DEV, uart::PLOC_SUPERVISOR_BAUD,
+                                         supv::MAX_PACKET_SIZE * 20, UartModes::NON_CANONICAL);
+  supervisorCookie->setNoFixedSizeReply();
+  new PlocSupervisorHandler(objects::PLOC_SUPERVISOR_HANDLER, objects::UART_COM_IF,
+                            supervisorCookie, Gpio(gpioIds::ENABLE_SUPV_UART, gpioComIF),
+                            pcdu::PDU1_CH6_PLOC_12V);
+#endif /* OBSW_ADD_PLOC_SUPERVISOR == 1 */
+  static_cast<void>(consumer);
+}
+
+void ObjectFactory::createReactionWheelComponents(LinuxLibgpioIF* gpioComIF) {
+  using namespace gpio;
+  GpioCookie* gpioCookieRw = new GpioCookie;
+  GpioCallback* csRw1 =
+      new GpioCallback("Chip select reaction wheel 1", Direction::OUT, Levels::HIGH,
+                       &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
+  gpioCookieRw->addGpio(gpioIds::CS_RW1, csRw1);
+  GpioCallback* csRw2 =
+      new GpioCallback("Chip select reaction wheel 2", Direction::OUT, Levels::HIGH,
+                       &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
+  gpioCookieRw->addGpio(gpioIds::CS_RW2, csRw2);
+  GpioCallback* csRw3 =
+      new GpioCallback("Chip select reaction wheel 3", Direction::OUT, Levels::HIGH,
+                       &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
+  gpioCookieRw->addGpio(gpioIds::CS_RW3, csRw3);
+  GpioCallback* csRw4 =
+      new GpioCallback("Chip select reaction wheel 4", Direction::OUT, Levels::HIGH,
+                       &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
+  gpioCookieRw->addGpio(gpioIds::CS_RW4, csRw4);
+
+  std::stringstream consumer;
+  GpiodRegularByLineName* gpio = nullptr;
+  consumer << "0x" << std::hex << objects::RW1;
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::EN_RW_1, consumer.str(), Direction::OUT,
+                                    Levels::LOW);
+  gpioCookieRw->addGpio(gpioIds::EN_RW1, gpio);
+  consumer.str("");
+  consumer << "0x" << std::hex << objects::RW2;
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::EN_RW_2, consumer.str(), Direction::OUT,
+                                    Levels::LOW);
+  gpioCookieRw->addGpio(gpioIds::EN_RW2, gpio);
+  consumer.str("");
+  consumer << "0x" << std::hex << objects::RW3;
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::EN_RW_3, consumer.str(), Direction::OUT,
+                                    Levels::LOW);
+  gpioCookieRw->addGpio(gpioIds::EN_RW3, gpio);
+  consumer.str("");
+  consumer << "0x" << std::hex << objects::RW4;
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::EN_RW_4, consumer.str(), Direction::OUT,
+                                    Levels::LOW);
+  gpioCookieRw->addGpio(gpioIds::EN_RW4, gpio);
+
+  gpioComIF->addGpios(gpioCookieRw);
+
+#if OBSW_ADD_RW == 1
+  auto rw1SpiCookie =
+      new SpiCookie(addresses::RW1, gpioIds::CS_RW1, q7s::SPI_RW_DEV, RwDefinitions::MAX_REPLY_SIZE,
+                    spi::RW_MODE, spi::RW_SPEED, &rwSpiCallback::spiCallback, nullptr);
+  auto rw2SpiCookie =
+      new SpiCookie(addresses::RW2, gpioIds::CS_RW2, q7s::SPI_RW_DEV, RwDefinitions::MAX_REPLY_SIZE,
+                    spi::RW_MODE, spi::RW_SPEED, &rwSpiCallback::spiCallback, nullptr);
+  auto rw3SpiCookie =
+      new SpiCookie(addresses::RW3, gpioIds::CS_RW3, q7s::SPI_RW_DEV, RwDefinitions::MAX_REPLY_SIZE,
+                    spi::RW_MODE, spi::RW_SPEED, &rwSpiCallback::spiCallback, nullptr);
+  auto rw4SpiCookie =
+      new SpiCookie(addresses::RW4, gpioIds::CS_RW4, q7s::SPI_RW_DEV, RwDefinitions::MAX_REPLY_SIZE,
+                    spi::RW_MODE, spi::RW_SPEED, &rwSpiCallback::spiCallback, nullptr);
+
+  auto rwHandler1 =
+      new RwHandler(objects::RW1, objects::SPI_COM_IF, rw1SpiCookie, gpioComIF, gpioIds::EN_RW1);
+  rw1SpiCookie->setCallbackArgs(rwHandler1);
+#if OBSW_DEBUG_RW == 1
+  rwHandler1->setStartUpImmediately();
+  rwHandler1->setDebugMode(true);
+#endif
+  auto rwHandler2 =
+      new RwHandler(objects::RW2, objects::SPI_COM_IF, rw2SpiCookie, gpioComIF, gpioIds::EN_RW2);
+  rw2SpiCookie->setCallbackArgs(rwHandler2);
+#if OBSW_DEBUG_RW == 1
+  rwHandler2->setStartUpImmediately();
+  rwHandler2->setDebugMode(true);
+#endif
+  auto rwHandler3 =
+      new RwHandler(objects::RW3, objects::SPI_COM_IF, rw3SpiCookie, gpioComIF, gpioIds::EN_RW3);
+  rw3SpiCookie->setCallbackArgs(rwHandler3);
+#if OBSW_DEBUG_RW == 1
+  rwHandler3->setStartUpImmediately();
+  rwHandler3->setDebugMode(true);
+#endif
+  auto rwHandler4 =
+      new RwHandler(objects::RW4, objects::SPI_COM_IF, rw4SpiCookie, gpioComIF, gpioIds::EN_RW4);
+  rw4SpiCookie->setCallbackArgs(rwHandler4);
+#if OBSW_DEBUG_RW == 1
+  rwHandler4->setStartUpImmediately();
+  rwHandler4->setDebugMode(true);
+#endif
+#endif /* OBSW_ADD_RW == 1 */
+}
+
+void ObjectFactory::createCcsdsComponents(LinuxLibgpioIF* gpioComIF) {
+  using namespace gpio;
+  // GPIO definitions of signals connected to the virtual channel interfaces of the PTME IP Core
+  GpioCookie* gpioCookiePtmeIp = new GpioCookie;
+  GpiodRegularByLineName* gpio = nullptr;
+  std::stringstream consumer;
+  consumer.str("PAPB VC0");
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::PAPB_BUSY_SIGNAL_VC0, consumer.str());
+  gpioCookiePtmeIp->addGpio(gpioIds::VC0_PAPB_BUSY, gpio);
+  consumer.str("PAPB VC0");
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::PAPB_EMPTY_SIGNAL_VC0, consumer.str());
+  gpioCookiePtmeIp->addGpio(gpioIds::VC0_PAPB_EMPTY, gpio);
+  consumer.str("PAPB VC 1");
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::PAPB_BUSY_SIGNAL_VC1, consumer.str());
+  gpioCookiePtmeIp->addGpio(gpioIds::VC1_PAPB_BUSY, gpio);
+  consumer.str("");
+  consumer.str("PAPB VC 1");
+  gpioCookiePtmeIp->addGpio(gpioIds::VC1_PAPB_EMPTY, gpio);
+  consumer.str("");
+  consumer.str("PAPB VC 2");
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::PAPB_BUSY_SIGNAL_VC2, consumer.str());
+  gpioCookiePtmeIp->addGpio(gpioIds::VC2_PAPB_BUSY, gpio);
+  consumer.str("");
+  consumer.str("PAPB VC 2");
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::PAPB_EMPTY_SIGNAL_VC2, consumer.str());
+  gpioCookiePtmeIp->addGpio(gpioIds::VC2_PAPB_EMPTY, gpio);
+  consumer.str("");
+  consumer.str("PAPB VC 3");
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::PAPB_BUSY_SIGNAL_VC3, consumer.str());
+  gpioCookiePtmeIp->addGpio(gpioIds::VC3_PAPB_BUSY, gpio);
+  consumer.str("");
+  consumer.str("PAPB VC 3");
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::PAPB_EMPTY_SIGNAL_VC3, consumer.str());
+  gpioCookiePtmeIp->addGpio(gpioIds::VC3_PAPB_EMPTY, gpio);
+
+  gpioComIF->addGpios(gpioCookiePtmeIp);
+
+  // Creating virtual channel interfaces
+  VcInterfaceIF* vc0 =
+      new PapbVcInterface(gpioComIF, gpioIds::VC0_PAPB_BUSY, gpioIds::VC0_PAPB_EMPTY, q7s::UIO_PTME,
+                          q7s::uiomapids::PTME_VC0);
+  VcInterfaceIF* vc1 =
+      new PapbVcInterface(gpioComIF, gpioIds::VC1_PAPB_BUSY, gpioIds::VC1_PAPB_EMPTY, q7s::UIO_PTME,
+                          q7s::uiomapids::PTME_VC1);
+  VcInterfaceIF* vc2 =
+      new PapbVcInterface(gpioComIF, gpioIds::VC2_PAPB_BUSY, gpioIds::VC2_PAPB_EMPTY, q7s::UIO_PTME,
+                          q7s::uiomapids::PTME_VC2);
+  VcInterfaceIF* vc3 =
+      new PapbVcInterface(gpioComIF, gpioIds::VC3_PAPB_BUSY, gpioIds::VC3_PAPB_EMPTY, q7s::UIO_PTME,
+                          q7s::uiomapids::PTME_VC3);
+
+  // Creating ptme object and adding virtual channel interfaces
+  Ptme* ptme = new Ptme(objects::PTME);
+  ptme->addVcInterface(ccsds::VC0, vc0);
+  ptme->addVcInterface(ccsds::VC1, vc1);
+  ptme->addVcInterface(ccsds::VC2, vc2);
+  ptme->addVcInterface(ccsds::VC3, vc3);
+
+  AxiPtmeConfig* axiPtmeConfig =
+      new AxiPtmeConfig(objects::AXI_PTME_CONFIG, q7s::UIO_PTME, q7s::uiomapids::PTME_CONFIG);
+  PtmeConfig* ptmeConfig = new PtmeConfig(objects::PTME_CONFIG, axiPtmeConfig);
+#if OBSW_ENABLE_SYRLINKS_TRANSMIT_TIMEOUT == 1
+  // Set to high value when not sending via syrlinks
+  static const uint32_t TRANSMITTER_TIMEOUT = 86400000;  // 1 day
+#else
+  static const uint32_t TRANSMITTER_TIMEOUT = 900000;  // 15 minutes
+#endif
+  CCSDSHandler* ccsdsHandler = new CCSDSHandler(
+      objects::CCSDS_HANDLER, objects::PTME, objects::CCSDS_PACKET_DISTRIBUTOR, ptmeConfig,
+      gpioComIF, gpioIds::RS485_EN_TX_CLOCK, gpioIds::RS485_EN_TX_DATA, TRANSMITTER_TIMEOUT);
+
+  VirtualChannel* vc = nullptr;
+  vc = new VirtualChannel(ccsds::VC0, common::VC0_QUEUE_SIZE, objects::CCSDS_HANDLER);
+  ccsdsHandler->addVirtualChannel(ccsds::VC0, vc);
+  vc = new VirtualChannel(ccsds::VC1, common::VC1_QUEUE_SIZE, objects::CCSDS_HANDLER);
+  ccsdsHandler->addVirtualChannel(ccsds::VC1, vc);
+  vc = new VirtualChannel(ccsds::VC2, common::VC2_QUEUE_SIZE, objects::CCSDS_HANDLER);
+  ccsdsHandler->addVirtualChannel(ccsds::VC2, vc);
+  vc = new VirtualChannel(ccsds::VC3, common::VC3_QUEUE_SIZE, objects::CCSDS_HANDLER);
+  ccsdsHandler->addVirtualChannel(ccsds::VC3, vc);
+
+  GpioCookie* gpioCookiePdec = new GpioCookie;
+  consumer.str("");
+  consumer << "0x" << std::hex << objects::PDEC_HANDLER;
+  // GPIO also low after linux boot (specified by device-tree)
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::PDEC_RESET, consumer.str(), Direction::OUT,
+                                    Levels::LOW);
+  gpioCookiePdec->addGpio(gpioIds::PDEC_RESET, gpio);
+
+  gpioComIF->addGpios(gpioCookiePdec);
+
+  new PdecHandler(objects::PDEC_HANDLER, objects::CCSDS_HANDLER, gpioComIF, gpioIds::PDEC_RESET,
+                  q7s::UIO_PDEC_CONFIG_MEMORY, q7s::UIO_PDEC_RAM, q7s::UIO_PDEC_REGISTERS);
+
+  GpioCookie* gpioRS485Chip = new GpioCookie;
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::RS485_EN_TX_CLOCK, "RS485 Transceiver",
+                                    Direction::OUT, Levels::LOW);
+  gpioRS485Chip->addGpio(gpioIds::RS485_EN_TX_CLOCK, gpio);
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::RS485_EN_TX_DATA, "RS485 Transceiver",
+                                    Direction::OUT, Levels::LOW);
+  gpioRS485Chip->addGpio(gpioIds::RS485_EN_TX_DATA, gpio);
+
+  // Default configuration enables RX channels (RXEN = LOW)
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::RS485_EN_RX_CLOCK, "RS485 Transceiver",
+                                    Direction::OUT, Levels::LOW);
+  gpioRS485Chip->addGpio(gpioIds::RS485_EN_RX_CLOCK, gpio);
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::RS485_EN_RX_DATA, "RS485 Transceiver",
+                                    Direction::OUT, Levels::LOW);
+  gpioRS485Chip->addGpio(gpioIds::RS485_EN_RX_DATA, gpio);
+
+  gpioComIF->addGpios(gpioRS485Chip);
+}
+
+void ObjectFactory::createPlPcduComponents(LinuxLibgpioIF* gpioComIF, SpiComIF* spiComIF,
+                                           PowerSwitchIF* pwrSwitcher) {
+  using namespace gpio;
+  // Create all GPIO components first
+  GpioCookie* plPcduGpios = new GpioCookie;
+  GpiodRegularByLineName* gpio = nullptr;
+  std::string consumer;
+  // Switch pins are active high
+  consumer = "PLPCDU_ENB_VBAT_0";
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::PL_PCDU_ENABLE_VBAT0, consumer, Direction::OUT,
+                                    gpio::Levels::LOW);
+  plPcduGpios->addGpio(gpioIds::PLPCDU_ENB_VBAT0, gpio);
+  consumer = "PLPCDU_ENB_VBAT_1";
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::PL_PCDU_ENABLE_VBAT1, consumer, Direction::OUT,
+                                    gpio::Levels::LOW);
+  plPcduGpios->addGpio(gpioIds::PLPCDU_ENB_VBAT1, gpio);
+  consumer = "PLPCDU_ENB_DRO";
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::PL_PCDU_ENABLE_DRO, consumer, Direction::OUT,
+                                    gpio::Levels::LOW);
+  plPcduGpios->addGpio(gpioIds::PLPCDU_ENB_DRO, gpio);
+  consumer = "PLPCDU_ENB_X8";
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::PL_PCDU_ENABLE_X8, consumer, Direction::OUT,
+                                    gpio::Levels::LOW);
+  plPcduGpios->addGpio(gpioIds::PLPCDU_ENB_X8, gpio);
+  consumer = "PLPCDU_ENB_TX";
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::PL_PCDU_ENABLE_TX, consumer, Direction::OUT,
+                                    gpio::Levels::LOW);
+  plPcduGpios->addGpio(gpioIds::PLPCDU_ENB_TX, gpio);
+  consumer = "PLPCDU_ENB_MPA";
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::PL_PCDU_ENABLE_MPA, consumer, Direction::OUT,
+                                    gpio::Levels::LOW);
+  plPcduGpios->addGpio(gpioIds::PLPCDU_ENB_MPA, gpio);
+  consumer = "PLPCDU_ENB_HPA";
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::PL_PCDU_ENABLE_HPA, consumer, Direction::OUT,
+                                    gpio::Levels::LOW);
+  plPcduGpios->addGpio(gpioIds::PLPCDU_ENB_HPA, gpio);
+
+  // Chip select pin is active low
+  consumer = "PLPCDU_ADC_CS";
+  gpio = new GpiodRegularByLineName(q7s::gpioNames::PL_PCDU_ADC_CS, consumer, Direction::OUT,
+                                    gpio::Levels::HIGH);
+  plPcduGpios->addGpio(gpioIds::PLPCDU_ADC_CS, gpio);
+  gpioComIF->addGpios(plPcduGpios);
+  SpiCookie* spiCookie = new SpiCookie(addresses::PLPCDU_ADC, gpioIds::PLPCDU_ADC_CS,
+                                       q7s::SPI_DEFAULT_DEV, plpcdu::MAX_ADC_REPLY_SIZE,
+                                       spi::DEFAULT_MAX_1227_MODE, spi::PL_PCDU_MAX_1227_SPEED);
+  // Create device handler components
+  auto plPcduHandler = new PayloadPcduHandler(
+      objects::PLPCDU_HANDLER, objects::SPI_COM_IF, spiCookie, gpioComIF, SdCardManager::instance(),
+      pwrSwitcher, pcdu::Switches::PDU2_CH1_PL_PCDU_BATT_0_14V8,
+      pcdu::Switches::PDU2_CH6_PL_PCDU_BATT_1_14V8, false);
+  spiCookie->setCallbackMode(PayloadPcduHandler::extConvAsTwoCallback, plPcduHandler);
+//  plPcduHandler->enablePeriodicPrintout(true, 5);
+//  static_cast<void>(plPcduHandler);
+#if OBSW_TEST_PL_PCDU == 1
+  plPcduHandler->setStartUpImmediately();
+#endif
+#if OBSW_DEBUG_PL_PCDU == 1
+  plPcduHandler->setToGoToNormalModeImmediately(true);
+  plPcduHandler->enablePeriodicPrintout(true, 10);
+#endif
+}
+
+void ObjectFactory::createTestComponents(LinuxLibgpioIF* gpioComIF) {
+  new Q7STestTask(objects::TEST_TASK);
+#if OBSW_ADD_SPI_TEST_CODE == 1
+  new SpiTestClass(objects::SPI_TEST, gpioComIF);
+#endif
+#if OBSW_ADD_I2C_TEST_CODE == 1
+  new I2cTestClass(objects::I2C_TEST, q7s::I2C_DEFAULT_DEV);
+#endif
+#if OBSW_ADD_UART_TEST_CODE == 1
+  new UartTestClass(objects::UART_TEST);
+#endif
+}
+
+void ObjectFactory::testAcsBrdAss(AcsBoardAssembly* acsAss) {
+  CommandMessage msg;
+  ModeMessage::setModeMessage(&msg, ModeMessage::CMD_MODE_COMMAND, DeviceHandlerIF::MODE_NORMAL,
+                              duallane::A_SIDE);
+  ReturnValue_t result = MessageQueueSenderIF::sendMessage(acsAss->getCommandQueue(), &msg);
+  if (result != HasReturnvaluesIF::RETURN_OK) {
+    sif::warning << "Sending mode command failed" << std::endl;
+  }
+}

bsp_q7s/main.cpp

@@ -1,7 +1,7 @@
 #include "q7sConfig.h"
 
 #if Q7S_SIMPLE_MODE == 0
-#include "core/obsw.h"
+#include "obsw.h"
 #else
 #include "simple/simple.h"
 #endif

bsp_q7s/obsw.cpp

@@ -3,9 +3,9 @@
 #include <filesystem>
 #include <iostream>
 
-#include "InitMission.h"
 #include "OBSWConfig.h"
-#include "OBSWVersion.h"
+#include "commonConfig.h"
+#include "core/InitMission.h"
 #include "fsfw/tasks/TaskFactory.h"
 #include "fsfw/version.h"
 #include "watchdog/definitions.h"
@@ -16,8 +16,8 @@ int obsw::obsw() {
   using namespace fsfw;
   std::cout << "-- EIVE OBSW --" << std::endl;
   std::cout << "-- Compiled for Linux (Xiphos Q7S) --" << std::endl;
-  std::cout << "-- OBSW v" << SW_VERSION << "." << SW_SUBVERSION << "." << SW_REVISION << ", FSFW v"
-            << FSFW_VERSION << "--" << std::endl;
+  std::cout << "-- OBSW v" << common::OBSW_VERSION << " | FSFW v" << fsfw::FSFW_VERSION << " --"
+            << std::endl;
   std::cout << "-- " << __DATE__ << " " << __TIME__ << " --" << std::endl;
 
 #if Q7S_CHECK_FOR_ALREADY_RUNNING_IMG == 1

bsp_te0720_1cfa/OBSWConfig.h.in

@@ -6,73 +6,19 @@
 #ifndef FSFWCONFIG_OBSWCONFIG_H_
 #define FSFWCONFIG_OBSWCONFIG_H_
 
-#cmakedefine RASPBERRY_PI
-#cmakedefine XIPHOS_Q7S
-#cmakedefine BEAGLEBONEBLACK
-#cmakedefine EGSE
-#cmakedefine TE0720_1CFA
-
 #include "commonConfig.h"
 #include "OBSWVersion.h"
-
-/* These defines should be disabled for mission code but are useful for
-debugging. */
-#define OBSW_VERBOSE_LEVEL                          1
-                             
-#define Q7S_EM                                      0
-
+    
 /*******************************************************************/
 /** All of the following flags should be enabled for mission code  */
 /*******************************************************************/
 
-//! Timers can mess up the code when debugging
-//! All of this should be enabled for mission code!
-#if defined XIPHOS_Q7S
-
-#define Q7S_EM                                      0
-
-#define OBSW_USE_CCSDS_IP_CORE                      1
-// Set to 1 if all telemetry should be sent to the PTME IP Core
-#define OBSW_TM_TO_PTME                             0
-// Set to 1 if telecommands are received via the PDEC IP Core
-#define OBSW_TC_FROM_PDEC                           0
-
-#define OBSW_ENABLE_TIMERS                          1
-#define OBSW_ADD_MGT                                1
-#define OBSW_ADD_BPX_BATTERY_HANDLER                1
-#define OBSW_ADD_STAR_TRACKER                       @OBSW_ADD_STAR_TRACKER@
-#define OBSW_ADD_PLOC_SUPERVISOR                    0
-#define OBSW_ADD_PLOC_MPSOC                         0
-#define OBSW_ADD_SUN_SENSORS                        1
-#define OBSW_ADD_SUS_BOARD_ASS                      1
-#define OBSW_ADD_ACS_BOARD                          1
-#define OBSW_ADD_ACS_HANDLERS                       1
-#define OBSW_ADD_RW                                 0
-#define OBSW_ADD_RTD_DEVICES                        1
-#define OBSW_ADD_TMP_DEVICES                        0
-#define OBSW_ADD_RAD_SENSORS                        1
-#define OBSW_ADD_PL_PCDU                            1
-#define OBSW_ADD_SYRLINKS                           0
-#define OBSW_ENABLE_SYRLINKS_TRANSMIT_TIMEOUT       0
-#define OBSW_STAR_TRACKER_GROUND_CONFIG             1
-
-#endif // XIPHOS_Q7S
-
-// This is a really tricky switch.. It initializes the PCDU switches to their default states
-// at powerup. I think it would be better
-// to leave it off for now. It makes testing a lot more difficult and it might mess with
-// something the operators might want to do by giving the software too much intelligence
-// at the wrong place. The system component might command all the Switches accordingly anyway
-#define OBSW_INITIALIZE_SWITCHES                    0
-#define OBSW_ENABLE_PERIODIC_HK                     0
-
-#ifdef TE0720_1CFA
-
 #define OBSW_USE_CCSDS_IP_CORE                      0
 // Set to 1 if all telemetry should be sent to the PTME IP Core
 #define OBSW_TM_TO_PTME                             0
 // Set to 1 if telecommands are received via the PDEC IP Core
 #define OBSW_TC_FROM_PDEC                           0
+
 #define OBSW_ENABLE_TIMERS                          1
 #define OBSW_ADD_MGT                                0
 #define OBSW_ADD_BPX_BATTERY_HANDLER                0
@@ -95,7 +41,13 @@ debugging. */
 #define OBSW_PRINT_CORE_HK                          0
 #define OBSW_INITIALIZE_SWITCHES                    0
 
-#endif
+// This is a really tricky switch.. It initializes the PCDU switches to their default states
+// at powerup. I think it would be better
+// to leave it off for now. It makes testing a lot more difficult and it might mess with
+// something the operators might want to do by giving the software too much intelligence
+// at the wrong place. The system component might command all the Switches accordingly anyway
+#define OBSW_INITIALIZE_SWITCHES                    0
+#define OBSW_ENABLE_PERIODIC_HK                     0
 
 /*******************************************************************/
 /** All of the following flags should be disabled for mission code */
@@ -129,6 +81,8 @@ debugging. */
 #define OBSW_DEBUG_BPX_BATT                         0
 #define OBSW_TEST_IMTQ                              0
 #define OBSW_DEBUG_IMTQ                             0
+#define OBSW_TEST_RW                                0
+#define OBSW_DEBUG_RW                               0
 
 #define OBSW_TEST_LIBGPIOD                          0
 #define OBSW_TEST_PLOC_HANDLER                      0
@@ -145,47 +99,14 @@ debugging. */
 #define OBSW_DEBUG_GPS                              0
 #define OBSW_DEBUG_ACU                              0
 #define OBSW_DEBUG_SYRLINKS                         0
-#define OBSW_DEBUG_RW                               0
+
 #define OBSW_DEBUG_PDEC_HANDLER                     0
 
-#ifdef TE0720_1CFA
 #define OBSW_DEBUG_PLOC_SUPERVISOR                  1
 #define OBSW_DEBUG_PLOC_MPSOC                       1
-#else 
-#define OBSW_DEBUG_PLOC_SUPERVISOR                  0
-#define OBSW_DEBUG_PLOC_MPSOC                       0
-#endif 
 
-#ifdef EGSE
-#define OBSW_DEBUG_STARTRACKER                      1
-#else
 #define OBSW_DEBUG_STARTRACKER                      0
-#endif
-
-#ifdef RASPBERRY_PI
-
-#define OBSW_ENABLE_TIMERS                          1
-#define OBSW_ADD_STAR_TRACKER                       0
-#define OBSW_ADD_PLOC_SUPERVISOR                    0
-#define OBSW_ADD_PLOC_MPSOC                         0
-#define OBSW_ADD_SUN_SENSORS                        0
-#define OBSW_ADD_MGT                                0
-#define OBSW_ADD_ACS_BOARD                          0
-#define OBSW_ADD_ACS_HANDLERS                       0
-#define OBSW_ADD_GPS_0                              0
-#define OBSW_ADD_GPS_1                              0
-#define OBSW_ADD_RW                                 0
-#define OBSW_ADD_BPX_BATTERY_HANDLER                0
-#define OBSW_ADD_RTD_DEVICES                        0
-#define OBSW_ADD_PL_PCDU                            0
-#define OBSW_ADD_TMP_DEVICES                        0
-#define OBSW_ADD_RAD_SENSORS                        0
-#define OBSW_ADD_SYRLINKS                           0
-#define OBSW_STAR_TRACKER_GROUND_CONFIG             1
-
-#endif // RASPBERRY_PI
-
-#define TCP_SERVER_WIRETAPPING                      0
+#define OBSW_TCP_SERVER_WIRETAPPING                 0
 
 /*******************************************************************/
 /** CMake Defines                                                  */
@@ -195,12 +116,6 @@ debugging. */
 #cmakedefine LIBGPS_VERSION_MAJOR @LIBGPS_VERSION_MAJOR@
 #cmakedefine LIBGPS_VERSION_MINOR @LIBGPS_VERSION_MINOR@
 
-#ifdef RASPBERRY_PI
-#include "rpiConfig.h"
-#elif defined(XIPHOS_Q7S)
-#include "q7sConfig.h"
-#endif
-
 #ifdef __cplusplus
 
 #include "objects/systemObjectList.h"

cmake/EiveHelpers.cmake

@@ -0,0 +1,28 @@
+# Determines the git version with git describe and returns it by setting
+# the GIT_INFO list in the parent scope. The list has the following entries
+# 1. Full version string
+# 2. Major version
+# 3. Minor version
+# 4. Revision
+# 5. git SHA hash and commits since tag
+function(determine_version_with_git)
+    include(GetGitRevisionDescription)
+    git_describe(VERSION ${ARGN})
+    string(FIND ${VERSION} "." VALID_VERSION)
+    if(VALID_VERSION EQUAL -1)
+        message(WARNING "Version string ${VERSION} retrieved with git describe is invalid")
+        return()
+    endif()
+    # Parse the version information into pieces.
+    string(REGEX REPLACE "^v([0-9]+)\\..*" "\\1" _VERSION_MAJOR "${VERSION}")
+    string(REGEX REPLACE "^v[0-9]+\\.([0-9]+).*" "\\1" _VERSION_MINOR "${VERSION}")
+    string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" _VERSION_PATCH "${VERSION}")
+    string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.[0-9]+-(.*)" "\\1" VERSION_SHA1 "${VERSION}")
+    set(GIT_INFO ${VERSION})
+    list(APPEND GIT_INFO ${_VERSION_MAJOR})
+    list(APPEND GIT_INFO ${_VERSION_MINOR})
+    list(APPEND GIT_INFO ${_VERSION_PATCH})
+    list(APPEND GIT_INFO ${VERSION_SHA1})
+    set(GIT_INFO ${GIT_INFO} PARENT_SCOPE)
+    message(STATUS "eive | Set git version info into GIT_INFO from the git tag ${VERSION}")
+endfunction()

cmake/GetGitRevisionDescription.cmake

@@ -0,0 +1,284 @@
+# - Returns a version string from Git
+#
+# These functions force a re-configure on each git commit so that you can
+# trust the values of the variables in your build system.
+#
+#  get_git_head_revision(<refspecvar> <hashvar> [ALLOW_LOOKING_ABOVE_CMAKE_SOURCE_DIR])
+#
+# Returns the refspec and sha hash of the current head revision
+#
+#  git_describe(<var> [<additional arguments to git describe> ...])
+#
+# Returns the results of git describe on the source tree, and adjusting
+# the output so that it tests false if an error occurs.
+#
+#  git_describe_working_tree(<var> [<additional arguments to git describe> ...])
+#
+# Returns the results of git describe on the working tree (--dirty option),
+# and adjusting the output so that it tests false if an error occurs.
+#
+#  git_get_exact_tag(<var> [<additional arguments to git describe> ...])
+#
+# Returns the results of git describe --exact-match on the source tree,
+# and adjusting the output so that it tests false if there was no exact
+# matching tag.
+#
+#  git_local_changes(<var>)
+#
+# Returns either "CLEAN" or "DIRTY" with respect to uncommitted changes.
+# Uses the return code of "git diff-index --quiet HEAD --".
+# Does not regard untracked files.
+#
+# Requires CMake 2.6 or newer (uses the 'function' command)
+#
+# Original Author:
+# 2009-2020 Ryan Pavlik <ryan.pavlik@gmail.com> <abiryan@ryand.net>
+# http://academic.cleardefinition.com
+#
+# Copyright 2009-2013, Iowa State University.
+# Copyright 2013-2020, Ryan Pavlik
+# Copyright 2013-2020, Contributors
+# SPDX-License-Identifier: BSL-1.0
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+if(__get_git_revision_description)
+    return()
+endif()
+set(__get_git_revision_description YES)
+
+# We must run the following at "include" time, not at function call time,
+# to find the path to this module rather than the path to a calling list file
+get_filename_component(_gitdescmoddir ${CMAKE_CURRENT_LIST_FILE} PATH)
+
+# Function _git_find_closest_git_dir finds the next closest .git directory
+# that is part of any directory in the path defined by _start_dir.
+# The result is returned in the parent scope variable whose name is passed
+# as variable _git_dir_var. If no .git directory can be found, the
+# function returns an empty string via _git_dir_var.
+#
+# Example: Given a path C:/bla/foo/bar and assuming C:/bla/.git exists and
+# neither foo nor bar contain a file/directory .git. This wil return
+# C:/bla/.git
+#
+function(_git_find_closest_git_dir _start_dir _git_dir_var)
+    set(cur_dir "${_start_dir}")
+    set(git_dir "${_start_dir}/.git")
+    while(NOT EXISTS "${git_dir}")
+        # .git dir not found, search parent directories
+        set(git_previous_parent "${cur_dir}")
+        get_filename_component(cur_dir "${cur_dir}" DIRECTORY)
+        if(cur_dir STREQUAL git_previous_parent)
+            # We have reached the root directory, we are not in git
+            set(${_git_dir_var}
+                ""
+                PARENT_SCOPE)
+            return()
+        endif()
+        set(git_dir "${cur_dir}/.git")
+    endwhile()
+    set(${_git_dir_var}
+        "${git_dir}"
+        PARENT_SCOPE)
+endfunction()
+
+function(get_git_head_revision _refspecvar _hashvar)
+    _git_find_closest_git_dir("${CMAKE_CURRENT_SOURCE_DIR}" GIT_DIR)
+
+    if("${ARGN}" STREQUAL "ALLOW_LOOKING_ABOVE_CMAKE_SOURCE_DIR")
+        set(ALLOW_LOOKING_ABOVE_CMAKE_SOURCE_DIR TRUE)
+    else()
+        set(ALLOW_LOOKING_ABOVE_CMAKE_SOURCE_DIR FALSE)
+    endif()
+    if(NOT "${GIT_DIR}" STREQUAL "")
+        file(RELATIVE_PATH _relative_to_source_dir "${CMAKE_SOURCE_DIR}"
+             "${GIT_DIR}")
+        if("${_relative_to_source_dir}" MATCHES "[.][.]" AND NOT ALLOW_LOOKING_ABOVE_CMAKE_SOURCE_DIR)
+            # We've gone above the CMake root dir.
+            set(GIT_DIR "")
+        endif()
+    endif()
+    if("${GIT_DIR}" STREQUAL "")
+        set(${_refspecvar}
+            "GITDIR-NOTFOUND"
+            PARENT_SCOPE)
+        set(${_hashvar}
+            "GITDIR-NOTFOUND"
+            PARENT_SCOPE)
+        return()
+    endif()
+
+    # Check if the current source dir is a git submodule or a worktree.
+    # In both cases .git is a file instead of a directory.
+    #
+    if(NOT IS_DIRECTORY ${GIT_DIR})
+        # The following git command will return a non empty string that
+        # points to the super project working tree if the current
+        # source dir is inside a git submodule.
+        # Otherwise the command will return an empty string.
+        #
+        execute_process(
+            COMMAND "${GIT_EXECUTABLE}" rev-parse
+                    --show-superproject-working-tree
+            WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+            OUTPUT_VARIABLE out
+            ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+        if(NOT "${out}" STREQUAL "")
+            # If out is empty, GIT_DIR/CMAKE_CURRENT_SOURCE_DIR is in a submodule
+            file(READ ${GIT_DIR} submodule)
+            string(REGEX REPLACE "gitdir: (.*)$" "\\1" GIT_DIR_RELATIVE
+                                 ${submodule})
+            string(STRIP ${GIT_DIR_RELATIVE} GIT_DIR_RELATIVE)
+            get_filename_component(SUBMODULE_DIR ${GIT_DIR} PATH)
+            get_filename_component(GIT_DIR ${SUBMODULE_DIR}/${GIT_DIR_RELATIVE}
+                                   ABSOLUTE)
+            set(HEAD_SOURCE_FILE "${GIT_DIR}/HEAD")
+        else()
+            # GIT_DIR/CMAKE_CURRENT_SOURCE_DIR is in a worktree
+            file(READ ${GIT_DIR} worktree_ref)
+            # The .git directory contains a path to the worktree information directory
+            # inside the parent git repo of the worktree.
+            #
+            string(REGEX REPLACE "gitdir: (.*)$" "\\1" git_worktree_dir
+                                 ${worktree_ref})
+            string(STRIP ${git_worktree_dir} git_worktree_dir)
+            _git_find_closest_git_dir("${git_worktree_dir}" GIT_DIR)
+            set(HEAD_SOURCE_FILE "${git_worktree_dir}/HEAD")
+        endif()
+    else()
+        set(HEAD_SOURCE_FILE "${GIT_DIR}/HEAD")
+    endif()
+    set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data")
+    if(NOT EXISTS "${GIT_DATA}")
+        file(MAKE_DIRECTORY "${GIT_DATA}")
+    endif()
+
+    if(NOT EXISTS "${HEAD_SOURCE_FILE}")
+        return()
+    endif()
+    set(HEAD_FILE "${GIT_DATA}/HEAD")
+    configure_file("${HEAD_SOURCE_FILE}" "${HEAD_FILE}" COPYONLY)
+
+    configure_file("${_gitdescmoddir}/GetGitRevisionDescription.cmake.in"
+                   "${GIT_DATA}/grabRef.cmake" @ONLY)
+    include("${GIT_DATA}/grabRef.cmake")
+
+    set(${_refspecvar}
+        "${HEAD_REF}"
+        PARENT_SCOPE)
+    set(${_hashvar}
+        "${HEAD_HASH}"
+        PARENT_SCOPE)
+endfunction()
+
+function(git_describe _var)
+    if(NOT GIT_FOUND)
+        find_package(Git QUIET)
+    endif()
+    get_git_head_revision(refspec hash)
+    if(NOT GIT_FOUND)
+        set(${_var}
+            "GIT-NOTFOUND"
+            PARENT_SCOPE)
+        return()
+    endif()
+    if(NOT hash)
+        set(${_var}
+            "HEAD-HASH-NOTFOUND"
+            PARENT_SCOPE)
+        return()
+    endif()
+
+    # TODO sanitize
+    #if((${ARGN}" MATCHES "&&") OR
+    #   (ARGN MATCHES "||") OR
+    #   (ARGN MATCHES "\\;"))
+    #   message("Please report the following error to the project!")
+    #   message(FATAL_ERROR "Looks like someone's doing something nefarious with git_describe! Passed arguments ${ARGN}")
+    #endif()
+
+    #message(STATUS "Arguments to execute_process: ${ARGN}")
+
+    execute_process(
+        COMMAND "${GIT_EXECUTABLE}" describe --tags --always ${hash} ${ARGN}
+        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+        RESULT_VARIABLE res
+        OUTPUT_VARIABLE out
+        ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if(NOT res EQUAL 0)
+        set(out "${out}-${res}-NOTFOUND")
+    endif()
+
+    set(${_var}
+        "${out}"
+        PARENT_SCOPE)
+endfunction()
+
+function(git_describe_working_tree _var)
+    if(NOT GIT_FOUND)
+        find_package(Git QUIET)
+    endif()
+    if(NOT GIT_FOUND)
+        set(${_var}
+            "GIT-NOTFOUND"
+            PARENT_SCOPE)
+        return()
+    endif()
+
+    execute_process(
+        COMMAND "${GIT_EXECUTABLE}" describe --dirty ${ARGN}
+        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+        RESULT_VARIABLE res
+        OUTPUT_VARIABLE out
+        ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if(NOT res EQUAL 0)
+        set(out "${out}-${res}-NOTFOUND")
+    endif()
+
+    set(${_var}
+        "${out}"
+        PARENT_SCOPE)
+endfunction()
+
+function(git_get_exact_tag _var)
+    git_describe(out --exact-match ${ARGN})
+    set(${_var}
+        "${out}"
+        PARENT_SCOPE)
+endfunction()
+
+function(git_local_changes _var)
+    if(NOT GIT_FOUND)
+        find_package(Git QUIET)
+    endif()
+    get_git_head_revision(refspec hash)
+    if(NOT GIT_FOUND)
+        set(${_var}
+            "GIT-NOTFOUND"
+            PARENT_SCOPE)
+        return()
+    endif()
+    if(NOT hash)
+        set(${_var}
+            "HEAD-HASH-NOTFOUND"
+            PARENT_SCOPE)
+        return()
+    endif()
+
+    execute_process(
+        COMMAND "${GIT_EXECUTABLE}" diff-index --quiet HEAD --
+        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+        RESULT_VARIABLE res
+        OUTPUT_VARIABLE out
+        ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if(res EQUAL 0)
+        set(${_var}
+            "CLEAN"
+            PARENT_SCOPE)
+    else()
+        set(${_var}
+            "DIRTY"
+            PARENT_SCOPE)
+    endif()
+endfunction()

cmake/GetGitRevisionDescription.cmake.in

@@ -0,0 +1,43 @@
+#
+# Internal file for GetGitRevisionDescription.cmake
+#
+# Requires CMake 2.6 or newer (uses the 'function' command)
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright 2009-2012, Iowa State University
+# Copyright 2011-2015, Contributors
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+# SPDX-License-Identifier: BSL-1.0
+
+set(HEAD_HASH)
+
+file(READ "@HEAD_FILE@" HEAD_CONTENTS LIMIT 1024)
+
+string(STRIP "${HEAD_CONTENTS}" HEAD_CONTENTS)
+if(HEAD_CONTENTS MATCHES "ref")
+    # named branch
+    string(REPLACE "ref: " "" HEAD_REF "${HEAD_CONTENTS}")
+    if(EXISTS "@GIT_DIR@/${HEAD_REF}")
+        configure_file("@GIT_DIR@/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
+    else()
+        configure_file("@GIT_DIR@/packed-refs" "@GIT_DATA@/packed-refs" COPYONLY)
+        file(READ "@GIT_DATA@/packed-refs" PACKED_REFS)
+        if(${PACKED_REFS} MATCHES "([0-9a-z]*) ${HEAD_REF}")
+            set(HEAD_HASH "${CMAKE_MATCH_1}")
+        endif()
+    endif()
+else()
+    # detached HEAD
+    configure_file("@GIT_DIR@/HEAD" "@GIT_DATA@/head-ref" COPYONLY)
+endif()
+
+if(NOT HEAD_HASH)
+    file(READ "@GIT_DATA@/head-ref" HEAD_HASH LIMIT 1024)
+    string(STRIP "${HEAD_HASH}" HEAD_HASH)
+endif()

cmake/HardwareOsPostConfig.cmake

@@ -1,16 +1,5 @@
 function(post_source_hw_os_config)
 
-if(LINK_LWIP)
-	message(STATUS "Linking against ${LIB_LWIP_NAME} lwIP library")
-	if(LIB_LWIP_NAME)
-		target_link_libraries(${OBSW_NAME} PUBLIC 
-			${LIB_LWIP_NAME}
-		)
-	else()
-		message(WARNING "lwIP library name not set!")
-	endif()
-endif()
-
 if(LINKER_SCRIPT)
 	add_link_options(
 		-T${LINKER_SCRIPT}

cmake/HardwareOsPreConfig.cmake

@@ -1,74 +0,0 @@
-function(pre_source_hw_os_config)
-
-# FreeRTOS
-if(FSFW_OSAL MATCHES freertos)
-	message(FATAL_ERROR "No FreeRTOS support implemented yet.")
-# RTEMS
-elseif(FSFW_OSAL STREQUAL rtems)
-	add_definitions(-DRTEMS)
-	message(FATAL_ERROR "No RTEMS support implemented yet.")
-elseif(FSFW_OSAL STREQUAL linux)
-	add_definitions(-DUNIX -DLINUX)	
-	find_package(Threads REQUIRED)
-# Hosted
-else()
-	set(BSP_PATH "bsp_hosted")
-	if(WIN32)
-    	add_definitions(-DWIN32)
-	elseif(UNIX)
-		find_package(Threads REQUIRED)
-		add_definitions(-DUNIX -DLINUX)	
-	endif()
-endif()
-
-# Cross-compile information
-if(CMAKE_CROSSCOMPILING)
-	# set(CMAKE_VERBOSE TRUE)
-
-	message(STATUS "Cross-compiling for ${TGT_BSP} target")
-	message(STATUS "Cross-compile gcc: ${CMAKE_C_COMPILER}")
-	message(STATUS "Cross-compile g++: ${CMAKE_CXX_COMPILER}")
-	
-	if(CMAKE_VERBOSE)
-		message(STATUS "Cross-compile linker: ${CMAKE_LINKER}")
-		message(STATUS "Cross-compile size utility: ${CMAKE_SIZE}")
-		message(STATUS "Cross-compile objcopy utility: ${CMAKE_OBJCOPY}")
-		message(STATUS "Cross-compile ranlib utility: ${CMAKE_RANLIB}")
-		message(STATUS "Cross-compile ar utility: ${CMAKE_AR}")
-		message(STATUS "Cross-compile nm utility: ${CMAKE_NM}")
-		message(STATUS "Cross-compile strip utility: ${CMAKE_STRIP}")
-		message(STATUS 
-			"Cross-compile assembler: ${CMAKE_ASM_COMPILER} "
-			"-x assembler-with-cpp"
-		)
-		message(STATUS "ABI flags: ${ABI_FLAGS}")
-		message(STATUS "Custom linker script: ${LINKER_SCRIPT}")
-	endif()
-	
-	set_property(CACHE TGT_BSP 
-		PROPERTY STRINGS  
-		"arm/q7s" "arm/raspberrypi" "arm/egse"
-	)
-endif()
-	
-
-if(TGT_BSP)
-	if (TGT_BSP MATCHES "arm/raspberrypi" OR TGT_BSP MATCHES "arm/beagleboneblack")
-		set(BSP_PATH "bsp_linux_board")
-	elseif(TGT_BSP MATCHES "arm/q7s")
-		set(BSP_PATH "bsp_q7s")
-  elseif(TGT_BSP MATCHES "arm/egse")
-    set(BSP_PATH "bsp_egse")
-  elseif(TGT_BSP MATCHES "arm/te0720-1cfa")
-    set(BSP_PATH "bsp_te0720_1cfa")
-	else() 
-		message(WARNING "CMake not configured for this target!")
-		message(FATAL_ERROR "Target: ${TGT_BSP}!")
-	endif()
-else()
-	set(BSP_PATH "bsp_hosted")
-endif()
-		
-set(BSP_PATH ${BSP_PATH} PARENT_SCOPE)
-
-endfunction()

cmake/PreProjectConfig.cmake

@@ -1,3 +1,81 @@
+function(obsw_module_config)
+endfunction()
+
+function(pre_source_hw_os_config)
+
+# FreeRTOS
+if(FSFW_OSAL MATCHES freertos)
+    message(FATAL_ERROR "No FreeRTOS support implemented yet.")
+# RTEMS
+elseif(FSFW_OSAL STREQUAL rtems)
+    add_definitions(-DRTEMS)
+    message(FATAL_ERROR "No RTEMS support implemented yet.")
+elseif(FSFW_OSAL STREQUAL linux)
+    add_definitions(-DUNIX -DLINUX) 
+    find_package(Threads REQUIRED)
+# Hosted
+else()
+    set(BSP_PATH "bsp_hosted")
+    if(WIN32)
+        add_definitions(-DWIN32)
+    elseif(UNIX)
+        find_package(Threads REQUIRED)
+        add_definitions(-DUNIX -DLINUX) 
+    endif()
+endif()
+
+# Cross-compile information
+if(CMAKE_CROSSCOMPILING)
+    # set(CMAKE_VERBOSE TRUE)
+
+    message(STATUS "Cross-compiling for ${TGT_BSP} target")
+    message(STATUS "Cross-compile gcc: ${CMAKE_C_COMPILER}")
+    message(STATUS "Cross-compile g++: ${CMAKE_CXX_COMPILER}")
+    
+    if(CMAKE_VERBOSE)
+        message(STATUS "Cross-compile linker: ${CMAKE_LINKER}")
+        message(STATUS "Cross-compile size utility: ${CMAKE_SIZE}")
+        message(STATUS "Cross-compile objcopy utility: ${CMAKE_OBJCOPY}")
+        message(STATUS "Cross-compile ranlib utility: ${CMAKE_RANLIB}")
+        message(STATUS "Cross-compile ar utility: ${CMAKE_AR}")
+        message(STATUS "Cross-compile nm utility: ${CMAKE_NM}")
+        message(STATUS "Cross-compile strip utility: ${CMAKE_STRIP}")
+        message(STATUS 
+            "Cross-compile assembler: ${CMAKE_ASM_COMPILER} "
+            "-x assembler-with-cpp"
+        )
+        message(STATUS "ABI flags: ${ABI_FLAGS}")
+        message(STATUS "Custom linker script: ${LINKER_SCRIPT}")
+    endif()
+    
+    set_property(CACHE TGT_BSP 
+        PROPERTY STRINGS  
+        "arm/q7s" "arm/raspberrypi" "arm/egse"
+    )
+endif()
+    
+
+if(TGT_BSP)
+    if (TGT_BSP MATCHES "arm/raspberrypi" OR TGT_BSP MATCHES "arm/beagleboneblack")
+        set(BSP_PATH "bsp_linux_board")
+    elseif(TGT_BSP MATCHES "arm/q7s")
+        set(BSP_PATH "bsp_q7s")
+  elseif(TGT_BSP MATCHES "arm/egse")
+    set(BSP_PATH "bsp_egse")
+  elseif(TGT_BSP MATCHES "arm/te0720-1cfa")
+    set(BSP_PATH "bsp_te0720_1cfa")
+    else() 
+        message(WARNING "CMake not configured for this target!")
+        message(FATAL_ERROR "Target: ${TGT_BSP}!")
+    endif()
+else()
+    set(BSP_PATH "bsp_hosted")
+endif()
+        
+set(BSP_PATH ${BSP_PATH} PARENT_SCOPE)
+
+endfunction()
+
 function(pre_project_config)
 
 # Basic input sanitization
@@ -14,7 +92,7 @@ endif()
 if(FSFW_OSAL MATCHES linux AND TGT_BSP AND EIVE_HARDCODED_TOOLCHAIN_FILE)
 	if(TGT_BSP MATCHES "arm/q7s" OR TGT_BSP MATCHES "arm/te0720-1cfa")
 		set(CMAKE_TOOLCHAIN_FILE 
-			"${CMAKE_SCRIPT_PATH}/Zynq7020CrossCompileConfig.cmake"
+			"${CMAKE_CURRENT_SOURCE_DIR}/cmake/Zynq7020CrossCompileConfig.cmake"
 			PARENT_SCOPE
 		)
 	elseif(TGT_BSP MATCHES "arm/raspberrypi" OR TGT_BSP MATCHES "arm/egse")
@@ -48,13 +126,13 @@ if(FSFW_OSAL MATCHES linux AND TGT_BSP AND EIVE_HARDCODED_TOOLCHAIN_FILE)
 		endif()
 
 		set(CMAKE_TOOLCHAIN_FILE 
-			"${CMAKE_SCRIPT_PATH}/RPiCrossCompileConfig.cmake"
+			"${CMAKE_CURRENT_SOURCE_DIR}/cmake/RPiCrossCompileConfig.cmake"
 			PARENT_SCOPE
 		)
     elseif(${TGT_BSP} MATCHES "arm/beagleboneblack")
         if(LINUX_CROSS_COMPILE)
             set(CMAKE_TOOLCHAIN_FILE
-                "${CMAKE_SCRIPT_PATH}/BBBCrossCompileConfig.cmake"
+                "${CMAKE_CURRENT_SOURCE_DIR}/cmake/BBBCrossCompileConfig.cmake"
                 PARENT_SCOPE
             )
         endif()

cmake/scripts/Host/make-debug-cfg.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-counter=0
-cfg_script_name="cmake-build-cfg.py"
-while [ ${counter} -lt 5 ]
-do
-    cd ..
-    if [ -f ${cfg_script_name} ];then
-        break
-    fi
-    counter=$((counter=counter + 1))
-done
-
-if [ "${counter}" -ge 5 ];then
-    echo "${cfg_script_name} not found in upper directories!"
-    exit 1
-fi
-
-build_generator="make"
-os_fsfw="host"
-builddir="build-Debug-Host"
-if [ "${OS}" = "Windows_NT" ]; then
-    python="py"
-# Could be other OS but this works for now.
-else
-    python="python3"
-fi
-
-echo "Running command (without the leading +):"
-set -x # Print command 
-${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "debug" -l "${builddir}"
-# Use this if commands are added which should not be printed
-# set +x

cmake/scripts/Host/make-release-cfg.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-counter=0
-cfg_script_name="cmake-build-cfg.py"
-while [ ${counter} -lt 5 ]
-do
-    cd ..
-    if [ -f ${cfg_script_name} ];then
-        break
-    fi
-    counter=$((counter=counter + 1))
-done
-
-if [ "${counter}" -ge 5 ];then
-    echo "${cfg_script_name} not found in upper directories!"
-    exit 1
-fi
-
-build_generator="make"
-os_fsfw="host"
-builddir="build-Release-Host"
-if [ "${OS}" = "Windows_NT" ]; then
-    python="py"
-# Could be other OS but this works for now.
-else
-    python="python3"
-fi
-
-echo "Running command (without the leading +):"
-set -x # Print command 
-${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "release" -l "${builddir}"
-# Use this if commands are added which should not be printed
-# set +x

cmake/scripts/Host/ninja-debug-cfg.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-counter=0
-cfg_script_name="cmake-build-cfg.py"
-while [ ${counter} -lt 5 ]
-do
-    cd ..
-    if [ -f ${cfg_script_name} ];then
-        break
-    fi
-    counter=$((counter=counter + 1))
-done
-
-if [ "${counter}" -ge 5 ];then
-    echo "${cfg_script_name} not found in upper directories!"
-    exit 1
-fi
-
-build_generator="ninja"
-os_fsfw="host"
-builddir="build-Debug-Host"
-if [ "${OS}" = "Windows_NT" ]; then
-    python="py"
-# Could be other OS but this works for now.
-else
-    python="python3"
-fi
-
-echo "Running command (without the leading +):"
-set -x # Print command 
-${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "debug" -l "${builddir}"
-# Use this if commands are added which should not be printed
-# set +x

cmake/scripts/Linux/make-debug-cfg.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-counter=0
-cfg_script_name="cmake-build-cfg.py"
-while [ ${counter} -lt 5 ]
-do
-    cd ..
-    if [ -f ${cfg_script_name} ];then
-        break
-    fi
-    counter=$((counter=counter + 1))
-done
-
-if [ "${counter}" -ge 5 ];then
-    echo "${cfg_script_name} not found in upper directories!"
-    exit 1
-fi
-
-build_generator="make"
-os_fsfw="linux"
-builddir="build-Debug-Host"
-if [ "${OS}" = "Windows_NT" ]; then
-    python="py"
-# Could be other OS but this works for now.
-else
-    python="python3"
-fi
-
-echo "Running command (without the leading +):"
-set -x # Print command 
-${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "debug" -l "${builddir}"
-# Use this if commands are added which should not be printed
-# set +x

cmake/scripts/Linux/make-release-cfg.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-counter=0
-cfg_script_name="cmake-build-cfg.py"
-while [ ${counter} -lt 5 ]
-do
-    cd ..
-    if [ -f ${cfg_script_name} ];then
-        break
-    fi
-    counter=$((counter=counter + 1))
-done
-
-if [ "${counter}" -ge 5 ];then
-    echo "${cfg_script_name} not found in upper directories!"
-    exit 1
-fi
-
-build_generator="Unix Makefiles"
-os_fsfw="linux"
-builddir="build-Release-Host"
-if [ "${OS}" = "Windows_NT" ]; then
-    python="py"
-# Could be other OS but this works for now.
-else
-    python="python3"
-fi
-
-echo "Running command (without the leading +):"
-set -x # Print command 
-${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "release" -l "${builddir}"
-# Use this if commands are added which should not be printed
-# set +x

cmake/scripts/Linux/ninja-debug-cfg.sh

@@ -1,33 +0,0 @@
-#!/bin/sh
-counter=0
-cfg_script_name="cmake-build-cfg.py"
-while [ ${counter} -lt 5 ]
-do
-    cd ..
-    if [ -f ${cfg_script_name} ];then
-        break
-    fi
-    counter=$((counter=counter + 1))
-done
-
-if [ "${counter}" -ge 5 ];then
-    echo "${cfg_script_name} not found in upper directories!"
-    exit 1
-fi
-
-build_generator="ninja"
-os_fsfw="linux"
-builddir="build-Debug-Host"
-if [ "${OS}" = "Windows_NT" ]; then
-    python="py"
-# Could be other OS but this works for now.
-else
-    python="python3"
-fi
-
-echo "Running command (without the leading +):"
-set -x # Print command 
-${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "debug" -l "${builddir}"
-# Use this if commands are added which should not be printed
-# set +x
-

cmake/scripts/Q7S/make-debug-cfg.sh

@@ -1,34 +0,0 @@
-#!/bin/sh
-counter=0
-cfg_script_name="cmake-build-cfg.py"
-while [ ${counter} -lt 5 ]
-do
-    cd ..
-    if [ -f ${cfg_script_name} ];then
-        break
-    fi
-    counter=$((counter=counter + 1))
-done
-
-if [ "${counter}" -ge 5 ];then
-    echo "${cfg_script_name} not found in upper directories!"
-    exit 1
-fi
-
-os_fsfw="linux"
-tgt_bsp="arm/q7s"
-build_dir="build-Debug-Q7S"
-build_generator="make"
-if [ "${OS}" = "Windows_NT" ]; then
-    python="py"
-# Could be other OS but this works for now.
-else
-    python="python3"
-fi
-
-echo "Running command (without the leading +):"
-set -x # Print command 
-${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" \
-	-l"${build_dir}"
-# set +x
-

cmake/scripts/Q7S/make-release-cfg.sh

@@ -1,33 +0,0 @@
-#!/bin/sh
-counter=0
-cfg_script_name="cmake-build-cfg.py"
-while [ ${counter} -lt 5 ]
-do
-    cd ..
-    if [ -f ${cfg_script_name} ];then
-        break
-    fi
-    counter=$((counter=counter + 1))
-done
-
-if [ "${counter}" -ge 5 ];then
-    echo "${cfg_script_name} not found in upper directories!"
-    exit 1
-fi
-
-os_fsfw="linux"
-tgt_bsp="arm/q7s"
-build_dir="build-Release-Q7S"
-build_generator="make"
-if [ "${OS}" = "Windows_NT" ]; then
-    python="py"
-# Could be other OS but this works for now.
-else
-    python="python3"
-fi
-
-echo "Running command (without the leading +):"
-set -x # Print command 
-${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "release" -t "${tgt_bsp}" \
-	-l"${build_dir}"
-# set +x

cmake/scripts/Q7S/ninja-debug-cfg.sh

@@ -1,34 +0,0 @@
-#!/bin/sh
-counter=0
-cfg_script_name="cmake-build-cfg.py"
-while [ ${counter} -lt 5 ]
-do
-    cd ..
-    if [ -f ${cfg_script_name} ];then
-        break
-    fi
-    counter=$((counter=counter + 1))
-done
-
-if [ "${counter}" -ge 5 ];then
-    echo "${cfg_script_name} not found in upper directories!"
-    exit 1
-fi
-
-os_fsfw="linux"
-tgt_bsp="arm/q7s"
-build_dir="build-Debug-Q7S"
-build_generator="ninja"
-if [ "${OS}" = "Windows_NT" ]; then
-    python="py"
-# Could be other OS but this works for now.
-else
-    python="python3"
-fi
-
-echo "Running command (without the leading +):"
-set -x # Print command 
-${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" \
-	-l "${build_dir}"
-# set +x
-

cmake/scripts/Q7S/ninja-release-cfg.sh

@@ -1,34 +0,0 @@
-#!/bin/sh
-counter=0
-cfg_script_name="cmake-build-cfg.py"
-while [ ${counter} -lt 5 ]
-do
-    cd ..
-    if [ -f ${cfg_script_name} ];then
-        break
-    fi
-    counter=$((counter=counter + 1))
-done
-
-if [ "${counter}" -ge 5 ];then
-    echo "${cfg_script_name} not found in upper directories!"
-    exit 1
-fi
-
-os_fsfw="linux"
-tgt_bsp="arm/q7s"
-build_dir="build-Release-Q7S"
-build_generator="ninja"
-if [ "${OS}" = "Windows_NT" ]; then
-    python="py"
-# Could be other OS but this works for now.
-else
-    python="python3"
-fi
-
-echo "Running command (without the leading +):"
-set -x # Print command 
-${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "release" -t "${tgt_bsp}" \
-	-l"${build_dir}"
-# set +x
-

cmake/scripts/Q7S/q7s-env.sh

@@ -1,7 +0,0 @@
-#!/bin/bash -i
-export PATH=$PATH:"$HOME/EIVE/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf/bin"
-export CROSS_COMPILE="arm-linux-gnueabihf"
-
-export ZYNQ_7020_SYSROOT="/opt/xiphos/sdk/ark/sysroots/cortexa9hf-neon-xiphos-linux-gnueabi"
-export CONSOLE_PREFIX="[Q7S ENV]"
-/bin/bash

cmake/scripts/host/host-make-debug.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+cfg_script_name="cmake-build-cfg.py"
+init_dir=$(pwd)
+if [ -z "${EIVE_OBSW_ROOT}" ]; then
+    counter=0
+    while [ ${counter} -lt 5 ]
+    do
+        cd ..
+        if [ -f ${cfg_script_name} ];then
+            break
+        fi
+        counter=$((counter=counter + 1))
+    done
+
+    if [ "${counter}" -ge 5 ];then
+        echo "${cfg_script_name} not found in upper directories!"
+        exit 1
+    fi
+else
+    cfg_script_name="${EIVE_OBSW_ROOT}/cmake/scripts/${cfg_script_name}"
+fi
+
+build_generator="make"
+os_fsfw="host"
+builddir="cmake-build-debug"
+if [ "${OS}" = "Windows_NT" ]; then
+    python="py"
+# Could be other OS but this works for now.
+else
+    python="python3"
+fi
+
+echo "Running command (without the leading +):"
+set -x # Print command 
+${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "debug" -l "${builddir}"
+# Use this if commands are added which should not be printed
+# set +x

cmake/scripts/host/host-make-release.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+cfg_script_name="cmake-build-cfg.py"
+init_dir=$(pwd)
+if [ -z "${EIVE_OBSW_ROOT}" ]; then
+    counter=0
+    while [ ${counter} -lt 5 ]
+    do
+        cd ..
+        if [ -f ${cfg_script_name} ];then
+            break
+        fi
+        counter=$((counter=counter + 1))
+    done
+
+    if [ "${counter}" -ge 5 ];then
+        echo "${cfg_script_name} not found in upper directories!"
+        exit 1
+    fi
+else
+    cfg_script_name="${EIVE_OBSW_ROOT}/cmake/scripts/${cfg_script_name}"
+fi
+
+build_generator="Unix Makefiles"
+os_fsfw="host"
+builddir="cmake-build-release"
+if [ "${OS}" = "Windows_NT" ]; then
+    python="py"
+# Could be other OS but this works for now.
+else
+    python="python3"
+fi
+
+echo "Running command (without the leading +):"
+set -x # Print command 
+${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "release" -l "${builddir}"
+# Use this if commands are added which should not be printed
+# set +x

cmake/scripts/host/host-ninja-debug.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+cfg_script_name="cmake-build-cfg.py"
+init_dir=$(pwd)
+if [ -z "${EIVE_OBSW_ROOT}" ]; then
+    counter=0
+    while [ ${counter} -lt 5 ]
+    do
+        cd ..
+        if [ -f ${cfg_script_name} ];then
+            break
+        fi
+        counter=$((counter=counter + 1))
+    done
+
+    if [ "${counter}" -ge 5 ];then
+        echo "${cfg_script_name} not found in upper directories!"
+        exit 1
+    fi
+else
+    cfg_script_name="${EIVE_OBSW_ROOT}/cmake/scripts/${cfg_script_name}"
+fi
+
+build_generator="ninja"
+os_fsfw="host"
+builddir="cmake-build-debug"
+if [ "${OS}" = "Windows_NT" ]; then
+    python="py"
+# Could be other OS but this works for now.
+else
+    python="python3"
+fi
+
+echo "Running command (without the leading +):"
+set -x # Print command 
+${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "debug" -l "${builddir}"
+# Use this if commands are added which should not be printed
+# set +x
+

cmake/scripts/linux/host-make-debug.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+cfg_script_name="cmake-build-cfg.py"
+init_dir=$(pwd)
+if [ -z "${EIVE_OBSW_ROOT}" ]; then
+    counter=0
+    while [ ${counter} -lt 5 ]
+    do
+        cd ..
+        if [ -f ${cfg_script_name} ];then
+            break
+        fi
+        counter=$((counter=counter + 1))
+    done
+
+    if [ "${counter}" -ge 5 ];then
+        echo "${cfg_script_name} not found in upper directories!"
+        exit 1
+    fi
+else
+    cfg_script_name="${EIVE_OBSW_ROOT}/cmake/scripts/${cfg_script_name}"
+fi
+
+build_generator="make"
+os_fsfw="linux"
+builddir="cmake-build-debug"
+if [ "${OS}" = "Windows_NT" ]; then
+    python="py"
+# Could be other OS but this works for now.
+else
+    python="python3"
+fi
+
+echo "Running command (without the leading +):"
+set -x # Print command 
+${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "debug" -l "${builddir}"
+# Use this if commands are added which should not be printed
+# set +x

cmake/scripts/linux/host-make-release.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+cfg_script_name="cmake-build-cfg.py"
+init_dir=$(pwd)
+if [ -z "${EIVE_OBSW_ROOT}" ]; then
+    counter=0
+    while [ ${counter} -lt 5 ]
+    do
+        cd ..
+        if [ -f ${cfg_script_name} ];then
+            break
+        fi
+        counter=$((counter=counter + 1))
+    done
+
+    if [ "${counter}" -ge 5 ];then
+        echo "${cfg_script_name} not found in upper directories!"
+        exit 1
+    fi
+else
+    cfg_script_name="${EIVE_OBSW_ROOT}/cmake/scripts/${cfg_script_name}"
+fi
+
+build_generator="Unix Makefiles"
+os_fsfw="linux"
+builddir="cmake-build-release"
+if [ "${OS}" = "Windows_NT" ]; then
+    python="py"
+# Could be other OS but this works for now.
+else
+    python="python3"
+fi
+
+echo "Running command (without the leading +):"
+set -x # Print command 
+${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "release" -l "${builddir}"
+# Use this if commands are added which should not be printed
+# set +x

cmake/scripts/linux/host-ninja-debug.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+cfg_script_name="cmake-build-cfg.py"
+init_dir=$(pwd)
+if [ -z "${EIVE_OBSW_ROOT}" ]; then
+    counter=0
+    while [ ${counter} -lt 5 ]
+    do
+        cd ..
+        if [ -f ${cfg_script_name} ];then
+            break
+        fi
+        counter=$((counter=counter + 1))
+    done
+
+    if [ "${counter}" -ge 5 ];then
+        echo "${cfg_script_name} not found in upper directories!"
+        exit 1
+    fi
+else
+    cfg_script_name="${EIVE_OBSW_ROOT}/cmake/scripts/${cfg_script_name}"
+fi
+
+build_generator="ninja"
+os_fsfw="linux"
+builddir="cmake-build-debug"
+if [ "${OS}" = "Windows_NT" ]; then
+    python="py"
+# Could be other OS but this works for now.
+else
+    python="python3"
+fi
+
+echo "Running command (without the leading +):"
+set -x # Print command 
+${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "debug" -l "${builddir}"
+# Use this if commands are added which should not be printed
+# set +x
+

cmake/scripts/q7s/q7s-make-debug.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+cfg_script_name="cmake-build-cfg.py"
+init_dir=$(pwd)
+if [ -z "${EIVE_OBSW_ROOT}" ]; then
+    counter=0
+    while [ ${counter} -lt 5 ]
+    do
+        cd ..
+        if [ -f ${cfg_script_name} ];then
+            break
+        fi
+        counter=$((counter=counter + 1))
+    done
+
+    if [ "${counter}" -ge 5 ];then
+        echo "${cfg_script_name} not found in upper directories!"
+        exit 1
+    fi
+else
+    cfg_script_name="${EIVE_OBSW_ROOT}/cmake/scripts/${cfg_script_name}"
+fi
+
+if [ ! -z "${EIVE_Q7S_EM}" ]; then
+    build_defs="EIVE_Q7S_EM=ON"
+fi
+
+os_fsfw="linux"
+tgt_bsp="arm/q7s"
+build_dir="cmake-build-debug-q7s"
+if [ ! -z "${EIVE_Q7S_EM}" ]; then
+    build_dir="${build_dir}-em"
+fi
+
+build_generator="make"
+if [ "${OS}" = "Windows_NT" ]; then
+    python="py"
+# Could be other OS but this works for now.
+else
+    python="python3"
+fi
+
+echo "Running command (without the leading +):"
+set -x # Print command 
+${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" \
+	-l"${build_dir}" -d "${build_defs}"
+set +x
+
+cd ${init_dir}

cmake/scripts/q7s/q7s-make-release.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+cfg_script_name="cmake-build-cfg.py"
+init_dir=$(pwd)
+if [[ -z ${EIVE_OBSW_ROOT} ]]; then
+    counter=0
+    while [ ${counter} -lt 5 ]
+    do
+        cd ..
+        if [ -f ${cfg_script_name} ];then
+            break
+        fi
+        counter=$((counter=counter + 1))
+    done
+
+    if [ "${counter}" -ge 5 ];then
+        echo "${cfg_script_name} not found in upper directories!"
+        exit 1
+    fi
+else
+    cfg_script_name="${EIVE_OBSW_ROOT}/cmake/scripts/${cfg_script_name}"
+fi
+
+if [[ -z "${EIVE_Q7S_EM}" ]]; then
+    build_defs="EIVE_Q7S_EM=ON"
+fi
+
+os_fsfw="linux"
+tgt_bsp="arm/q7s"
+build_dir="cmake-build-release-q7s"
+if [ ! -z "${EIVE_Q7S_EM}" ]; then
+    build_dir="${build_dir}-em"
+fi
+build_generator="make"
+
+if [ "${OS}" = "Windows_NT" ]; then
+    python="py"
+# Could be other OS but this works for now.
+else
+    python="python3"
+fi
+
+echo "Running command (without the leading +):"
+set -x # Print command 
+${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "release" -t "${tgt_bsp}" \
+	-l"${build_dir}" -d "${build_defs}"
+set +x
+
+cd ${init_dir}

cmake/scripts/q7s/q7s-ninja-debug.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+cfg_script_name="cmake-build-cfg.py"
+init_dir=$(pwd)
+if [[ -z ${EIVE_OBSW_ROOT} ]]; then
+    counter=0
+    while [ ${counter} -lt 5 ]
+    do
+        cd ..
+        if [ -f ${cfg_script_name} ];then
+            break
+        fi
+        counter=$((counter=counter + 1))
+    done
+
+    if [ "${counter}" -ge 5 ];then
+        echo "${cfg_script_name} not found in upper directories!"
+        exit 1
+    fi
+else
+    cfg_script_name="${EIVE_OBSW_ROOT}/cmake/scripts/${cfg_script_name}"
+fi
+
+if [[ -z "${EIVE_Q7S_EM}" ]]; then
+    build_defs="EIVE_Q7S_EM=ON"
+fi
+
+os_fsfw="linux"
+tgt_bsp="arm/q7s"
+build_dir="cmake-build-debug-q7s"
+if [ ! -z "${EIVE_Q7S_EM}" ]; then
+    build_dir="${build_dir}-em"
+fi
+
+build_generator="ninja"
+if [ "${OS}" = "Windows_NT" ]; then
+    python="py"
+# Could be other OS but this works for now.
+else
+    python="python3"
+fi
+
+echo "Running command (without the leading +):"
+set -x # Print command 
+${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" \
+	-l "${build_dir}" -d "${build_defs}"
+set +x
+
+cd ${init_dir}

cmake/scripts/q7s/q7s-ninja-release.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+cfg_script_name="cmake-build-cfg.py"
+init_dir=$(pwd)
+if [[ -z ${EIVE_OBSW_ROOT} ]]; then
+    counter=0
+    while [ ${counter} -lt 5 ]
+    do
+        cd ..
+        if [ -f ${cfg_script_name} ];then
+            break
+        fi
+        counter=$((counter=counter + 1))
+    done
+
+    if [ "${counter}" -ge 5 ];then
+        echo "${cfg_script_name} not found in upper directories!"
+        exit 1
+    fi
+else
+    cfg_script_name="${EIVE_OBSW_ROOT}/cmake/scripts/${cfg_script_name}"
+fi
+
+if [[ -z "${EIVE_Q7S_EM}" ]]; then
+    build_defs="EIVE_Q7S_EM=ON"
+fi
+
+os_fsfw="linux"
+tgt_bsp="arm/q7s"
+build_dir="cmake-build-release-q7s"
+if [ ! -z "${EIVE_Q7S_EM}" ]; then
+    build_dir="${build_dir}-em"
+fi
+
+build_generator="ninja"
+if [ "${OS}" = "Windows_NT" ]; then
+    python="py"
+# Could be other OS but this works for now.
+else
+    python="python3"
+fi
+
+echo "Running command (without the leading +):"
+set -x # Print command 
+${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "release" -t "${tgt_bsp}" \
+	-l"${build_dir}" -d "${build_defs}"
+set +x
+
+cd ${init_dir}

common/config/OBSWVersion.h

@@ -4,7 +4,7 @@
 const char* const SW_NAME = "eive";
 
 #define SW_VERSION 1
-#define SW_SUBVERSION 9
+#define SW_SUBVERSION 10
 #define SW_REVISION 1
 
 #endif /* COMMON_CONFIG_OBSWVERSION_H_ */

common/config/commonConfig.cpp

@@ -2,4 +2,5 @@
 #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 };
 const uint16_t common::PUS_PACKET_ID = spacepacket::getTcSpacePacketIdFromApid(apid::EIVE_OBSW);

common/config/commonConfig.h.in

@@ -2,19 +2,39 @@
 #define COMMON_CONFIG_COMMONCONFIG_H_
 
 #include <cstdint>
+#include "fsfw/version.h"
 
-#define OBSW_ADD_LWGPS_TEST             0
+#cmakedefine RASPBERRY_PI
+#cmakedefine XIPHOS_Q7S
+#cmakedefine BEAGLEBONEBLACK
+#cmakedefine EGSE
+#cmakedefine TE0720_1CFA
+
+/* These defines should be disabled for mission code but are useful for
+debugging. */
+#define OBSW_VERBOSE_LEVEL                  1
+
+#define OBSW_ADD_LWGPS_TEST                 0   
 
 // Disable this for mission code. It allows exchanging TMTC packets via the Ethernet port
-#define OBSW_ADD_TCPIP_BRIDGE           1
+#define OBSW_ADD_TCPIP_BRIDGE               1
 
 // Use TCP instead of UDP for the TMTC bridge. This allows using the TMTC client locally
 // because UDP packets are not allowed in the VPN
 // This will cause the OBSW to initialize the TMTC bridge responsible for exchanging data with the
 // CCSDS IP Cores. 
-#define OBSW_USE_TMTC_TCP_BRIDGE        1
+#define OBSW_USE_TMTC_TCP_BRIDGE            1
 
 namespace common {
+
+static constexpr uint8_t OBSW_VERSION_MAJOR = @OBSW_VERSION_MAJOR@;
+static constexpr uint8_t OBSW_VERSION_MINOR = @OBSW_VERSION_MINOR@;
+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 uint16_t PUS_PACKET_ID;
 
 static constexpr uint32_t CCSDS_HANDLER_QUEUE_SIZE = 50;

common/config/commonSubsystemIds.h

@@ -30,6 +30,7 @@ enum: uint8_t {
 	PDU1_HANDLER = 133,
 	PDU2_HANDLER = 134,
 	ACU_HANDLER = 135,
+	SYRLINKS = 136,
 	COMMON_SUBSYSTEM_ID_END
 };
 }

generators/bsp_q7s_events.csv

@@ -80,6 +80,7 @@
 11300;0x2c24;SWITCH_CMD_SENT;INFO;Indicates that a FSFW object requested setting a switch P1: 1 if on was requested, 0 for off | P2: Switch Index;mission/devices/devicedefinitions/powerDefinitions.h
 11301;0x2c25;SWITCH_HAS_CHANGED;INFO;Indicated that a swithc state has changed P1: New switch state, 1 for on, 0 for off | P2: Switch Index;mission/devices/devicedefinitions/powerDefinitions.h
 11302;0x2c26;SWITCHING_Q7S_DENIED;MEDIUM;;mission/devices/devicedefinitions/powerDefinitions.h
+11303;0x2c27;FDIR_REACTION_IGNORED;MEDIUM;;mission/devices/devicedefinitions/powerDefinitions.h
 11400;0x2c88;GPIO_PULL_HIGH_FAILED;LOW;;mission/devices/HeaterHandler.h
 11401;0x2c89;GPIO_PULL_LOW_FAILED;LOW;;mission/devices/HeaterHandler.h
 11402;0x2c8a;SWITCH_ALREADY_ON;LOW;;mission/devices/HeaterHandler.h

generators/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
- * @brief    Auto-generated event translation file. Contains 186 translations.
+ * @brief    Auto-generated event translation file. Contains 187 translations.
  * @details
- * Generated on: 2022-04-08 14:13:35
+ * Generated on: 2022-05-03 16:32:00
  */
 #include "translateEvents.h"
 
@@ -87,6 +87,7 @@ const char *CHANGE_OF_SETUP_PARAMETER_STRING = "CHANGE_OF_SETUP_PARAMETER";
 const char *SWITCH_CMD_SENT_STRING = "SWITCH_CMD_SENT";
 const char *SWITCH_HAS_CHANGED_STRING = "SWITCH_HAS_CHANGED";
 const char *SWITCHING_Q7S_DENIED_STRING = "SWITCHING_Q7S_DENIED";
+const char *FDIR_REACTION_IGNORED_STRING = "FDIR_REACTION_IGNORED";
 const char *GPIO_PULL_HIGH_FAILED_STRING = "GPIO_PULL_HIGH_FAILED";
 const char *GPIO_PULL_LOW_FAILED_STRING = "GPIO_PULL_LOW_FAILED";
 const char *SWITCH_ALREADY_ON_STRING = "SWITCH_ALREADY_ON";
@@ -354,6 +355,8 @@ const char *translateEvents(Event event) {
       return SWITCH_HAS_CHANGED_STRING;
     case (11302):
       return SWITCHING_Q7S_DENIED_STRING;
+    case (11303):
+      return FDIR_REACTION_IGNORED_STRING;
     case (11400):
       return GPIO_PULL_HIGH_FAILED_STRING;
     case (11401):

generators/objects/translateObjects.cpp

@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 117 translations.
- * Generated on: 2022-04-08 14:13:35
+ * Generated on: 2022-05-03 16:32:00
  */
 #include "translateObjects.h"
 

generators/system/eive-system.yml

@@ -0,0 +1,464 @@
+# nml -> normal
+# brd -> board
+# ss -> subsystem
+# ass -> assembly
+# ctrl -> controller
+# dh -> device handler
+# dft -> default
+# All uppermost system components are automatically subsystems
+system:
+  eps:
+    pcdu:
+      id: 0x442000a1
+    acu:
+      id: 0x44250003
+    pdu1:
+      id: 0x44250001
+    pdu2:
+      id: 0x44250002
+  tcs:
+    tcs-ctrl:
+    tcs-brd-ass:
+      id: 0x73000003
+  acs:
+    acs-brd-ass:
+      id: 0x73000001
+    sus-brd-ass:
+      id: 0x73000002
+    acs-ctrl:
+    rw:
+    mgt:
+    str:
+  payload:
+    scex-dh:
+    ploc-ss:
+    cam-switcher:
+    pl-pcdu-dh:
+  com:
+    syrlinks-dh:
+
+
+modes:
+  # If nothing is specified for a particular mode, use default configuration
+  default:
+    system:
+      # The power system is/should always be on. We can't even turn it off
+      eps: nml
+        pcdu: nml
+        acu: nml
+        pdu1: nml
+        pdu2: nml
+      tcs: nml
+        tcs-brd-ass: nml
+        tcs-ctrl: nml
+      payload: off
+        scex: off
+        ploc-ss: off
+        cam-ss: off
+        pl-pcdu-dh: off
+      com: nml
+        syrlinks-dh: nml
+      acs:
+        mgt: nml
+        acs-brd-ass: nml
+        sus-brd-ass: nml
+  detumble:
+    system:
+      acs: detumble
+        acs-ctrl: detumble
+        # Requires MGM and Gyros
+        rw: off
+        str: off
+  safe:
+    system:
+      acs: safe
+        acs-ctrl: safe
+        rw: off
+        str: off
+    submodes:
+      cold: 1
+      system:
+        # Inherit rest of mode table from default submode
+        tcs:
+          tcs-ctrl: heat
+  idle:
+    system:
+      acs: idle
+        acs-ctrl: idle
+        rw: nml
+        str: off
+    submodes:
+      charge: 1
+      system:
+        # Inherit rest of mode table from default submode
+        acs:
+          rw: off
+  target-gs:
+    system:
+      acs: target-pt
+        acs-ctrl: target-pt
+        rw: nml
+        str: nml
+  target-gs-pl-dac:
+    system:
+      acs: target-pt
+        acs-ctrl: target-pt
+        rw: nml
+        str: nml
+      payload: dac
+        cam-switcher: off
+        scex: off
+        ploc-ss: nml
+        pl-pcdu-dh: on
+  target-gs-pl-cam:
+    system:
+      acs: target-pt
+        acs-ctrl: target-pt
+        rw: nml
+        str: nml
+      payload: cam
+        cam-switcher: on
+        scex: off
+        ploc-ss: nml
+          submode: dac-off
+        pl-pcdu-dh: on
+  target-gs-pl-data:
+    system:
+      acs: target-pt
+        acs-ctrl: target-pt
+        rw: nml
+        str: nml
+      payload: pl-data
+        cam-switcher: off
+        scex: off
+        ploc-ss: nml
+          submode: dac-off
+        pl-pcdu-ss: on
+  earth-obsv:
+    acs: target-pt
+      acs-ctrl: target-pt
+      rw: nml
+      str: nml
+    payload: earth-obsv
+      cam-switcher: on
+      scex: off
+      ploc-ss: off
+      pl-pcdu-ss: off
+  scex:
+    acs: target-pt
+      acs-ctrl: target-pt
+      rw: nml
+      str: nml
+    payload: scex
+      cam-switcher: off
+      scex: on
+      ploc-ss: off
+      pl-pcdu-ss: off
+
+sequences:
+  default:
+  acs:
+    off:
+      fallback: none
+      seq-id: off
+      target:
+        name: off-target
+        tab-id: 0x61000000
+        modes: ignore
+      trans:
+        0:
+          name: off-trans
+          tab-id: 0x61000001
+          modes:
+            acs-ctrl: off
+            acs-brd-ass: off
+            sus-brd-ass: off
+            rw: off
+            mgt: off
+            str: off
+    detumble:
+      seq-id: 1
+      target:
+        name: detumble-target
+        tab-id: 0x61000100
+        modes:
+          acs-ctrl: detumble
+          mgt: nml
+          sus-brd-ass: nml
+          acs-brd-ass: nml
+          rw: ignore
+          str: ignore
+        trans:
+          0:
+            name: detumble-trans-0
+            tab-id: 0x61000101
+            modes:
+              acs-ctrl: ignore
+              mgt: nml
+              rw: off
+              str: off
+              sus-brd-ass: nml
+              acs-brd-ass: nml
+          1:
+            name: detumble-trans-1
+            tab-id: 0x61000102
+            modes:
+              acs-ctrl: detumble
+              mgt: ignore
+              acs-brd-ass: ignore
+              sus-brd-ass: ignore
+              rw: ignore
+              str: ignore
+    safe:
+      seq-id: 2
+      target:
+        name: safe-target
+        tab-id: 0x61000200
+        modes:
+          acs-ctrl: safe
+          mgt: nml
+          acs-brd-ass: nml
+          sus-brd-ass: nml
+          rw: ignore
+          str: ignore
+      trans:
+        0:
+          name: safe-trans-1
+          tab-id: 0x61000201
+          modes:
+            acs-ctrl: ignore
+            mgt: nml
+            acs-brd-ass: nml
+            sus-brd-ass: nml
+            rw: off
+            str: off
+        1:
+          name: safe-trans-2
+          tab-id: 0x61000202
+          modes:
+            acs-ctrl: safe
+            mgt: ignore
+            acs-brd-ass: ignore
+            sus-brd-ass: ignore
+            rw: ignore
+            str: ignore
+    idle:
+      seq-id: 3
+      target:
+        name: idle-target
+        tab-id: 0x61000300
+        modes:
+          acs-ctrl: idle
+          mgt: nml
+          acs-brd-ass: nml
+          sus-brd-ass: nml
+          rw: nml
+          str: ignore
+      trans:
+        0:
+          name: idle-trans-0
+          tab-id: 0x61000301
+          modes:
+            acs-ctrl: ignore
+            mgt: nml
+            acs-brd-ass: nml
+            sus-brd-ass: nml
+            rw: nml
+            str: off
+        1:
+          name: idle-trans-1
+          tab-id: 0x61000302
+          modes:
+            acs-ctrl: idle
+            mgt: ignore
+            acs-brd-ass: ignore
+            sus-brd-ass: ignore
+            rw: ignore
+            str: ignore
+    idle-charge:
+      derive: idle
+      seq-id: 4
+      target:
+        name: idle-charge-target
+        tab-id: 0x61000400
+        modes:
+          acs-ctrl: idle
+            submode: charge
+      trans:
+        0:
+          name: idle-charge-trans-0
+          tab-id: 0x61000401
+          modes:
+            rw: off
+        1:
+          name: idle-charge-trans-1
+          tab-id: 0x61000402
+          modes:
+            acs-ctrl: idle
+              submode: charge
+    target-pt:
+      seq-id: 5
+      target:
+        name: target-pt-target
+        tab-id: 0x61000500
+        modes:
+          acs-ctrl: target-pt
+          mgt: nml
+          acs-brd-ass: nml
+          sus-brd-ass: nml
+          rw: nml
+          str: nml
+      trans:
+        0:
+          name: target-pt-trans-0
+          tab-id: 0x61000501
+          modes:
+            acs-ctrl: ignore
+            mgt: nml
+            acs-brd-ass: nml
+            sus-brd-ass: nml
+            rw: nml
+            str: nml
+        1:
+          name: target-pt-trans-1
+          tab-id: 0x61000502
+          modes:
+            acs-ctrl: target-pt
+            mgt: ignore
+            acs-brd-ass: ignore
+            sus-brd-ass: ignore
+            rw: ignore
+            str: ignore
+  payload:
+    off:
+      seq-id: 0
+      target:
+        name: off-target
+        tab-id: 0x70000000
+        modes: ignore
+      trans:
+        0:
+          name: off-trans-0
+          tab-id: 0x70000001
+          modes:
+            ploc-switcher: off
+            cam-switcher: off
+            scex-dh: off
+            ploc-ss: off
+            pl-pcdu-dh: off
+    dac:
+      seq-id: 1
+      target:
+        name: target-dac
+        tab-id: 0x70000100
+        modes:
+          ploc-switcher: on
+          cam-switcher: off
+          scex-dh: off
+          ploc-ss: dac
+          pl-pcdu-dh: nml
+            submode: all-on
+      trans:
+        0:
+          name: dac-trans-0
+          tab-id: 0x70000101
+          modes:
+            ploc-switcher: on
+            cam-switcher: off
+            scex-dh: off
+            ploc-ss: on
+              submode: dac-on
+            pl-pcdu-dh: ignore
+    cam:
+      seq-id: 2
+      target:
+        name: target-cam
+        tab-id: 0x70000200
+        modes:
+          ploc-switcher: on
+          cam-switcher: on
+          scex-dh: off
+          ploc-ss: on
+            submode: dac-off
+          pl-pcdu-dh: nml
+            submode: all-on
+      trans:
+        0:
+          name: cam-trans-0
+          tab-id: 0x70000201
+          modes:
+            ploc-switcher: on
+            cam-switcher: off
+            scex-dh: off
+            ploc-ss: on
+              submode: dac-off
+            pl-pcdu-dh: ignore
+    pl-data:
+      seq-id: 3
+      target:
+        name: target-pl-data
+        tab-id: 0x70000300
+        modes:
+          ploc-switcher: on
+          cam-switcher: off
+          scex-dh: off
+          ploc-ss: on
+            submode: dac-off
+          pl-pcdu-dh: nml
+            submode: all-on
+    earth-obsv:
+      seq-id: 4
+      target:
+        name: target-earth-obsv
+        tab-id: 0x70000400
+        modes:
+          ploc-switcher: on
+          cam-switcher: on
+          scex-dh: off
+          ploc-ss: on
+            submode: dac-off
+          pl-pcdu-dh: off
+      trans:
+        0:
+          name: trans-earth-obsv-0
+          tab-id: 0x70000401
+          modes:
+            ploc-switcher: on
+            cam-switcher: on
+            scex-dh: off
+            ploc-ss: on
+              submode: dac-off
+            pl-pcdu-dh: off
+    scex:
+      seq-id: 4
+      target: scex
+        name: target-scex
+        tab-id: 0x70000500
+        modes:
+          ploc-switcher: off
+          cam-switcher: off
+          scex-dh: on
+          ploc-ss: off
+          pl-pcdu-dh: off
+      trans:
+        0:
+          name: trans-scex-0
+          tab-id: 0x70000501
+          modes:
+            ploc-switcher: off
+            cam-switcher: off
+            scex-dh: on
+            ploc-ss: off
+            pl-pcdu-dh: off
+  system:
+    detumble:
+      seq-id: 0
+      target:
+        name: target-detumble
+        tab-id: 0x73000000
+        modes:
+          acs: detumble
+          tcs: nml
+          com: nml
+          payload: ignore
+          eps: nml

linux/ObjectFactory.cpp

@@ -9,10 +9,10 @@
 #include <linux/callbacks/gpioCallbacks.h>
 #include <mission/devices/Max31865PT1000Handler.h>
 #include <mission/devices/SusHandler.h>
-#include <mission/system/RtdFdir.h>
 #include <mission/system/SusAssembly.h>
-#include <mission/system/SusFdir.h>
 #include <mission/system/TcsBoardAssembly.h>
+#include <mission/system/fdir/RtdFdir.h>
+#include <mission/system/fdir/SusFdir.h>
 
 #include "OBSWConfig.h"
 #include "devConf.h"
@@ -267,6 +267,9 @@ void ObjectFactory::createRtdComponents(std::string spiDev, GpioIF* gpioComIF,
     rtdFdir = new RtdFdir(rtdIds[idx]);
     rtds[idx]->setCustomFdir(rtdFdir);
     rtds[idx]->setDeviceIdx(idx + 3);
+#if OBSW_DEBUG_RTD == 1
+    rtds[idx]->setDebugMode(true);
+#endif
   }
 
 #if OBSW_TEST_RTD == 1

linux/boardtest/LibgpiodTest.cpp

@@ -19,18 +19,18 @@ LibgpiodTest::LibgpiodTest(object_id_t objectId, object_id_t gpioIfobjectId, Gpi
 LibgpiodTest::~LibgpiodTest() {}
 
 ReturnValue_t LibgpiodTest::performPeriodicAction() {
-  int gpioState;
+  gpio::Levels gpioState;
   ReturnValue_t result;
 
   switch (testCase) {
     case (TestCases::READ): {
-      result = gpioInterface->readGpio(gpioIds::TEST_ID_0, &gpioState);
+      result = gpioInterface->readGpio(gpioIds::TEST_ID_0, gpioState);
       if (result != RETURN_OK) {
         sif::warning << "LibgpiodTest::performPeriodicAction: Failed to read gpio " << std::endl;
         return RETURN_FAILED;
       } else {
-        sif::debug << "LibgpiodTest::performPeriodicAction: MIO 0 state = " << gpioState
-                   << std::endl;
+        sif::debug << "LibgpiodTest::performPeriodicAction: MIO 0 state = " <<
+            static_cast<int>(gpioState) << std::endl;
       }
       break;
     }
@@ -38,19 +38,19 @@ ReturnValue_t LibgpiodTest::performPeriodicAction() {
       break;
     }
     case (TestCases::BLINK): {
-      result = gpioInterface->readGpio(gpioIds::TEST_ID_0, &gpioState);
+      result = gpioInterface->readGpio(gpioIds::TEST_ID_0, gpioState);
       if (result != HasReturnvaluesIF::RETURN_OK) {
         sif::warning << "LibgpiodTest::performPeriodicAction: Failed to read gpio " << std::endl;
         return RETURN_FAILED;
       }
-      if (gpioState == 1) {
+      if (gpioState == gpio::Levels::HIGH) {
         result = gpioInterface->pullLow(gpioIds::TEST_ID_0);
         if (result != HasReturnvaluesIF::RETURN_OK) {
           sif::warning << "LibgpiodTest::performPeriodicAction: Could not pull GPIO low!"
                        << std::endl;
           return HasReturnvaluesIF::RETURN_FAILED;
         }
-      } else if (gpioState == 0) {
+      } else if (gpioState == gpio::Levels::LOW) {
         result = gpioInterface->pullHigh(gpioIds::TEST_ID_0);
         if (result != HasReturnvaluesIF::RETURN_OK) {
           sif::warning << "LibgpiodTest::performPeriodicAction: Could not pull GPIO high!"
@@ -72,7 +72,7 @@ ReturnValue_t LibgpiodTest::performPeriodicAction() {
 }
 
 ReturnValue_t LibgpiodTest::performOneShotAction() {
-  int gpioState;
+  gpio::Levels gpioState;
   ReturnValue_t result;
 
   switch (testCase) {
@@ -93,8 +93,8 @@ ReturnValue_t LibgpiodTest::performOneShotAction() {
                      << std::endl;
         return HasReturnvaluesIF::RETURN_OK;
       }
-      result = gpioInterface->readGpio(gpioIds::TEST_ID_1, &gpioState);
-      if (result == HasReturnvaluesIF::RETURN_OK and gpioState == 1) {
+      result = gpioInterface->readGpio(gpioIds::TEST_ID_1, gpioState);
+      if (result == HasReturnvaluesIF::RETURN_OK and gpioState == gpio::Levels::HIGH) {
         sif::info << "LibgpiodTest::performOneShotAction: "
                      "GPIO state read successfully and is high"
                   << std::endl;
@@ -110,8 +110,8 @@ ReturnValue_t LibgpiodTest::performOneShotAction() {
                      "GPIO pulled low successfully for loopback test"
                   << std::endl;
       }
-      result = gpioInterface->readGpio(gpioIds::TEST_ID_1, &gpioState);
-      if (result == HasReturnvaluesIF::RETURN_OK and gpioState == 0) {
+      result = gpioInterface->readGpio(gpioIds::TEST_ID_1, gpioState);
+      if (result == HasReturnvaluesIF::RETURN_OK and gpioState == gpio::Levels::LOW) {
         sif::info << "LibgpiodTest::performOneShotAction: "
                      "GPIO state read successfully and is low"
                   << std::endl;

linux/devices/GPSHyperionLinuxController.cpp

@@ -1,5 +1,7 @@
 #include "GPSHyperionLinuxController.h"
 
+#include <fsfw/timemanager/Stopwatch.h>
+
 #include "OBSWConfig.h"
 #include "fsfw/FSFW.h"
 #include "fsfw/datapool/PoolReadGuard.h"
@@ -22,7 +24,10 @@ GPSHyperionLinuxController::GPSHyperionLinuxController(object_id_t objectId, obj
   timeUpdateCd.resetTimer();
 }
 
-GPSHyperionLinuxController::~GPSHyperionLinuxController() {}
+GPSHyperionLinuxController::~GPSHyperionLinuxController() {
+  gps_stream(&gps, WATCH_DISABLE, nullptr);
+  gps_close(&gps);
+}
 
 void GPSHyperionLinuxController::performControlOperation() {
 #ifdef FSFW_OSAL_LINUX
@@ -97,6 +102,27 @@ ReturnValue_t GPSHyperionLinuxController::initialize() {
   if (result != HasReturnvaluesIF::RETURN_OK) {
     return result;
   }
+  auto openError = [&](const char *type, int error) {
+    if (gpsNotOpenSwitch) {
+      // Opening failed
+#if FSFW_VERBOSE_LEVEL >= 1
+      sif::warning << "GPSHyperionHandler::readGpsDataFromGpsd: Opening GPSMM " << type
+                   << " failed | Error " << error << " | " << gps_errstr(error) << std::endl;
+#endif
+      gpsNotOpenSwitch = false;
+    }
+  };
+  if (readMode == ReadModes::SOCKET) {
+    int retval = gps_open("localhost", DEFAULT_GPSD_PORT, &gps);
+    if (retval != 0) {
+      openError("Socket", retval);
+    }
+  } else if (readMode == ReadModes::SHM) {
+    int retval = gps_open(GPSD_SHARED_MEMORY, "", &gps);
+    if (retval != 0) {
+      openError("SHM", retval);
+    }
+  }
   return result;
 }
 
@@ -105,43 +131,64 @@ ReturnValue_t GPSHyperionLinuxController::handleCommandMessage(CommandMessage *m
 }
 
 #ifdef FSFW_OSAL_LINUX
-void GPSHyperionLinuxController::readGpsDataFromGpsd() {
-  gpsmm myGpsmm(GPSD_SHARED_MEMORY, nullptr);
-  // The data from the device will generally be read all at once. Therefore, we
-  // can set all field here
-  if (not myGpsmm.is_open()) {
-    if(gpsNotOpenSwitch) {
-      // Opening failed
-  #if FSFW_VERBOSE_LEVEL >= 1
-      sif::warning << "GPSHyperionHandler::readGpsDataFromGpsd: Opening GPSMM failed | " <<
-          "Error " << errno << " | " << gps_errstr(errno) << std::endl;
-  #endif
 
-      gpsNotOpenSwitch = false;
-    }
-    return;
-  }
-  gps_data_t *gps = nullptr;
-  gps = myGpsmm.read();
-  if (gps == nullptr) {
-    if(gpsReadFailedSwitch) {
+void GPSHyperionLinuxController::readGpsDataFromGpsd() {
+  auto readError = [&](int error) {
+    if (gpsReadFailedSwitch) {
       gpsReadFailedSwitch = false;
-      sif::warning << "GPSHyperionHandler::readGpsDataFromGpsd: Reading GPS data failed" << std::endl;
+      sif::warning << "GPSHyperionHandler::readGpsDataFromGpsd: Reading GPS data failed | "
+                      "Error "
+                   << error << " | " << gps_errstr(error) << std::endl;
+    }
+  };
+  currentClientBuf = gps_data(&gps);
+  if (readMode == ReadModes::SOCKET) {
+    gps_stream(&gps, WATCH_ENABLE | WATCH_JSON, nullptr);
+    // Exit if no data is seen in 2 seconds (should not happen)
+    if (not gps_waiting(&gps, 2000000)) {
+      return;
+    }
+    int result = gps_read(&gps);
+    if (result == -1) {
+      readError(result);
+      return;
+    }
+    if (MODE_SET != (MODE_SET & gps.set)) {
+      if (noModeSetCntr >= 0) {
+        noModeSetCntr++;
+      }
+      if (noModeSetCntr == 10) {
+        // TODO: Trigger event here
+        sif::warning << "GPSHyperionHandler::readGpsDataFromGpsd: No mode could be "
+                        "read for 10 consecutive reads"
+                     << std::endl;
+        noModeSetCntr = -1;
+      }
+    }
+    noModeSetCntr = 0;
+  } else if (readMode == ReadModes::SHM) {
+    int result = gps_read(&gps);
+    if (result == -1) {
+      readError(result);
+      return;
     }
-    return;
   }
+  handleGpsRead();
+}
+
+ReturnValue_t GPSHyperionLinuxController::handleGpsRead() {
   PoolReadGuard pg(&gpsSet);
   if (pg.getReadResult() != HasReturnvaluesIF::RETURN_OK) {
 #if FSFW_VERBOSE_LEVEL >= 1
     sif::warning << "GPSHyperionHandler::readGpsDataFromGpsd: Reading dataset failed" << std::endl;
 #endif
-    return;
+    return RETURN_FAILED;
   }
 
   bool validFix = false;
   static_cast<void>(validFix);
   // 0: Not seen, 1: No fix, 2: 2D-Fix, 3: 3D-Fix
-  int newFixMode = gps->fix.mode;
+  int newFixMode = gps.fix.mode;
   if (newFixMode == 2 or newFixMode == 3) {
     validFix = true;
   }
@@ -149,7 +196,7 @@ void GPSHyperionLinuxController::readGpsDataFromGpsd() {
     triggerEvent(GpsHyperion::GPS_FIX_CHANGE, gpsSet.fixMode.value, newFixMode);
   }
   gpsSet.fixMode.value = newFixMode;
-  if (gps->fix.mode == 0 or gps->fix.mode == 1) {
+  if (gps.fix.mode == 0 or gps.fix.mode == 1) {
     if (modeCommanded and maxTimeToReachFix.hasTimedOut()) {
       // We are supposed to be on and functioning, but not fix was found
       if (mode == MODE_ON or mode == MODE_NORMAL) {
@@ -158,51 +205,51 @@ void GPSHyperionLinuxController::readGpsDataFromGpsd() {
       modeCommanded = false;
     }
     gpsSet.setValidity(false, true);
-  } else if (gps->satellites_used > 0) {
+  } else if (gps.satellites_used > 0) {
     gpsSet.setValidity(true, true);
   }
 
-  gpsSet.satInUse.value = gps->satellites_used;
-  gpsSet.satInView.value = gps->satellites_visible;
+  gpsSet.satInUse.value = gps.satellites_used;
+  gpsSet.satInView.value = gps.satellites_visible;
 
-  if (std::isfinite(gps->fix.latitude)) {
+  if (std::isfinite(gps.fix.latitude)) {
     // Negative latitude -> South direction
-    gpsSet.latitude.value = gps->fix.latitude;
+    gpsSet.latitude.value = gps.fix.latitude;
   } else {
     gpsSet.latitude.setValid(false);
   }
 
-  if (std::isfinite(gps->fix.longitude)) {
+  if (std::isfinite(gps.fix.longitude)) {
     // Negative longitude -> West direction
-    gpsSet.longitude.value = gps->fix.longitude;
+    gpsSet.longitude.value = gps.fix.longitude;
   } else {
     gpsSet.longitude.setValid(false);
   }
 
-  if (std::isfinite(gps->fix.altitude)) {
-    gpsSet.altitude.value = gps->fix.altitude;
+  if (std::isfinite(gps.fix.altitude)) {
+    gpsSet.altitude.value = gps.fix.altitude;
   } else {
     gpsSet.altitude.setValid(false);
   }
 
-  if (std::isfinite(gps->fix.speed)) {
-    gpsSet.speed.value = gps->fix.speed;
+  if (std::isfinite(gps.fix.speed)) {
+    gpsSet.speed.value = gps.fix.speed;
   } else {
     gpsSet.speed.setValid(false);
   }
 
 #if LIBGPS_VERSION_MINOR <= 17
-  gpsSet.unixSeconds.value = gps->fix.time;
+  gpsSet.unixSeconds.value = gps.fix.time;
 #else
-  gpsSet.unixSeconds.value = gps->fix.time.tv_sec;
+  gpsSet.unixSeconds.value = gps.fix.time.tv_sec;
 #endif
   timeval time = {};
   time.tv_sec = gpsSet.unixSeconds.value;
 #if LIBGPS_VERSION_MINOR <= 17
-  double fractionalPart = gps->fix.time - std::floor(gps->fix.time);
+  double fractionalPart = gps.fix.time - std::floor(gps.fix.time);
   time.tv_usec = fractionalPart * 1000.0 * 1000.0;
 #else
-  time.tv_usec = gps->fix.time.tv_nsec / 1000;
+  time.tv_usec = gps.fix.time.tv_nsec / 1000;
 #endif
   std::time_t t = std::time(nullptr);
   if (time.tv_sec == t) {
@@ -243,26 +290,28 @@ void GPSHyperionLinuxController::readGpsDataFromGpsd() {
   if (debugHyperionGps) {
     sif::info << "-- Hyperion GPS Data --" << std::endl;
 #if LIBGPS_VERSION_MINOR <= 17
-    time_t timeRaw = gps->fix.time;
+    time_t timeRaw = gps.fix.time;
 #else
-    time_t timeRaw = gps->fix.time.tv_sec;
+    time_t timeRaw = gps.fix.time.tv_sec;
 #endif
     std::tm *time = gmtime(&timeRaw);
     std::cout << "Time: " << std::put_time(time, "%c %Z") << std::endl;
-    std::cout << "Visible satellites: " << gps->satellites_visible << std::endl;
-    std::cout << "Satellites used: " << gps->satellites_used << std::endl;
-    std::cout << "Fix (0:Not Seen|1:No Fix|2:2D|3:3D): " << gps->fix.mode << std::endl;
-    std::cout << "Latitude: " << gps->fix.latitude << std::endl;
-    std::cout << "Longitude: " << gps->fix.longitude << std::endl;
+    std::cout << "Visible satellites: " << gps.satellites_visible << std::endl;
+    std::cout << "Satellites used: " << gps.satellites_used << std::endl;
+    std::cout << "Fix (0:Not Seen|1:No Fix|2:2D|3:3D): " << gps.fix.mode << std::endl;
+    std::cout << "Latitude: " << gps.fix.latitude << std::endl;
+    std::cout << "Longitude: " << gps.fix.longitude << std::endl;
 #if LIBGPS_VERSION_MINOR <= 17
-    std::cout << "Altitude(MSL): " << gps->fix.altitude << std::endl;
+    std::cout << "Altitude(MSL): " << gps.fix.altitude << std::endl;
 #else
-    std::cout << "Altitude(MSL): " << gps->fix.altMSL << std::endl;
+    std::cout << "Altitude(MSL): " << gps.fix.altMSL << std::endl;
 #endif
-    std::cout << "Speed(m/s): " << gps->fix.speed << std::endl;
+    std::cout << "Speed(m/s): " << gps.fix.speed << std::endl;
     std::time_t t = std::time(nullptr);
     std::tm tm = *std::gmtime(&t);
     std::cout << "C Time: " << std::put_time(&tm, "%c") << std::endl;
   }
+  return RETURN_OK;
 }
+
 #endif

linux/devices/GPSHyperionLinuxController.h

@@ -24,6 +24,8 @@ class GPSHyperionLinuxController : public ExtendedControllerBase {
  public:
   static constexpr uint32_t MAX_SECONDS_TO_REACH_FIX = 60 * 60 * 5;
 
+  enum ReadModes { SHM = 0, SOCKET = 1 };
+
   GPSHyperionLinuxController(object_id_t objectId, object_id_t parentId,
                              bool debugHyperionGps = false);
   virtual ~GPSHyperionLinuxController();
@@ -47,14 +49,20 @@ class GPSHyperionLinuxController : public ExtendedControllerBase {
   ReturnValue_t initializeLocalDataPool(localpool::DataPool& localDataPoolMap,
                                         LocalDataPoolManager& poolManager) override;
 
+  ReturnValue_t handleGpsRead();
+
  private:
   GpsPrimaryDataset gpsSet;
+  gps_data_t gps = {};
+  const char* currentClientBuf = nullptr;
+  ReadModes readMode = ReadModes::SOCKET;
   Countdown maxTimeToReachFix = Countdown(MAX_SECONDS_TO_REACH_FIX * 1000);
   bool modeCommanded = true;
   bool timeInit = true;
   bool gpsNotOpenSwitch = true;
   bool gpsReadFailedSwitch = true;
   bool debugHyperionGps = false;
+  int32_t noModeSetCntr = 0;
   uint32_t timeIsConstantCounter = 0;
   Countdown timeUpdateCd = Countdown(60);
 

linux/devices/devicedefinitions/PlocMPSoCDefinitions.h

@@ -643,24 +643,24 @@ class TcModeIdle : public TcBase {
 };
 
 class TcCamcmdSend : public TcBase {
-public:
+ public:
   TcCamcmdSend(uint16_t sequenceCount) : TcBase(apid::TC_CAM_CMD_SEND, sequenceCount) {}
 
-protected:
-    ReturnValue_t initPacket(const uint8_t* commandData, size_t commandDataLen) {
-      if (commandDataLen > MAX_DATA_LENGTH) {
-        return INVALID_LENGTH;
-      }
-      std::memcpy(this->getPacketData(), commandData, commandDataLen);
-      *(this->getPacketData() + commandDataLen) = CARRIAGE_RETURN;
-      uint16_t trueLength = commandDataLen + sizeof(CARRIAGE_RETURN) + CRC_SIZE;
-      this->setPacketDataLength(trueLength - 1);
-      return HasReturnvaluesIF::RETURN_OK;
+ protected:
+  ReturnValue_t initPacket(const uint8_t* commandData, size_t commandDataLen) {
+    if (commandDataLen > MAX_DATA_LENGTH) {
+      return INVALID_LENGTH;
     }
-private:
-    static const uint8_t MAX_DATA_LENGTH = 10;
-    static const uint8_t CARRIAGE_RETURN = 0xD;
+    std::memcpy(this->getPacketData(), commandData, commandDataLen);
+    *(this->getPacketData() + commandDataLen) = CARRIAGE_RETURN;
+    uint16_t trueLength = commandDataLen + sizeof(CARRIAGE_RETURN) + CRC_SIZE;
+    this->setPacketDataLength(trueLength - 1);
+    return HasReturnvaluesIF::RETURN_OK;
+  }
 
+ private:
+  static const uint8_t MAX_DATA_LENGTH = 10;
+  static const uint8_t CARRIAGE_RETURN = 0xD;
 };
 
 }  // namespace mpsoc

linux/devices/ploc/PlocMPSoCHandler.cpp

@@ -255,7 +255,7 @@ void PlocMPSoCHandler::fillCommandAndReplyMap() {
   this->insertInReplyMap(mpsoc::ACK_REPORT, 3, nullptr, mpsoc::SIZE_ACK_REPORT);
   this->insertInReplyMap(mpsoc::EXE_REPORT, 3, nullptr, mpsoc::SIZE_EXE_REPORT);
   this->insertInReplyMap(mpsoc::TM_MEMORY_READ_REPORT, 2, nullptr, mpsoc::SIZE_TM_MEM_READ_REPORT);
-   this->insertInReplyMap(mpsoc::TM_CAM_CMD_RPT, 2, nullptr, SpacePacket::PACKET_MAX_SIZE);
+  this->insertInReplyMap(mpsoc::TM_CAM_CMD_RPT, 2, nullptr, SpacePacket::PACKET_MAX_SIZE);
 }
 
 ReturnValue_t PlocMPSoCHandler::scanForReply(const uint8_t* start, size_t remainingSize,
@@ -653,8 +653,9 @@ ReturnValue_t PlocMPSoCHandler::handleCamCmdRpt(const uint8_t* data) {
     sif::warning << "PlocMPSoCHandler::handleCamCmdRpt: CRC failure" << std::endl;
   }
   const uint8_t* dataFieldPtr = data + mpsoc::SPACE_PACKET_HEADER_SIZE;
-  std::string camCmdRptMsg(reinterpret_cast<const char*>(
-      dataFieldPtr), tmCamCmdRpt.rememberSpacePacketSize - mpsoc::SPACE_PACKET_HEADER_SIZE - 3);
+  std::string camCmdRptMsg(
+      reinterpret_cast<const char*>(dataFieldPtr),
+      tmCamCmdRpt.rememberSpacePacketSize - mpsoc::SPACE_PACKET_HEADER_SIZE - 3);
   uint8_t ackValue = *(packet.getPacketData() + packet.getPacketDataLength() - 2);
   sif::info << "CamCmdRpt message: " << camCmdRptMsg << std::endl;
   sif::info << "CamCmdRpt Ack value: 0x" << std::hex << static_cast<unsigned int>(ackValue)

linux/devices/ploc/PlocMPSoCHandler.h

@@ -4,11 +4,11 @@
 #include <string>
 
 #include "PlocMPSoCHelper.h"
-#include "fsfw/tmtcpacket/SpacePacket.h"
 #include "fsfw/action/CommandActionHelper.h"
 #include "fsfw/action/CommandsActionsIF.h"
 #include "fsfw/devicehandlers/DeviceHandlerBase.h"
 #include "fsfw/ipc/QueueFactory.h"
+#include "fsfw/tmtcpacket/SpacePacket.h"
 #include "fsfw/tmtcservices/SourceSequenceCounter.h"
 #include "fsfw_hal/linux/gpio/Gpio.h"
 #include "fsfw_hal/linux/uart/UartComIF.h"

linux/fsfwconfig/FSFWConfig.h.in

@@ -76,9 +76,4 @@ static constexpr size_t FSFW_MAX_TM_PACKET_SIZE = 2048;
 #define FSFW_HAL_I2C_WIRETAPPING                0
 #define FSFW_DEV_HYPERION_GPS_CREATE_NMEA_CSV   0
 
-#define FSFW_HAL_L3GD20_GYRO_DEBUG              0
-#define FSFW_HAL_RM3100_MGM_DEBUG               0
-#define FSFW_HAL_LIS3MDL_MGM_DEBUG              0
-#define FSFW_HAL_ADIS1650X_GYRO_DEBUG           0
-
 #endif /* CONFIG_FSFWCONFIG_H_ */

linux/fsfwconfig/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
- * @brief    Auto-generated event translation file. Contains 186 translations.
+ * @brief    Auto-generated event translation file. Contains 187 translations.
  * @details
- * Generated on: 2022-04-08 14:13:35
+ * Generated on: 2022-05-03 16:32:00
  */
 #include "translateEvents.h"
 
@@ -87,6 +87,7 @@ const char *CHANGE_OF_SETUP_PARAMETER_STRING = "CHANGE_OF_SETUP_PARAMETER";
 const char *SWITCH_CMD_SENT_STRING = "SWITCH_CMD_SENT";
 const char *SWITCH_HAS_CHANGED_STRING = "SWITCH_HAS_CHANGED";
 const char *SWITCHING_Q7S_DENIED_STRING = "SWITCHING_Q7S_DENIED";
+const char *FDIR_REACTION_IGNORED_STRING = "FDIR_REACTION_IGNORED";
 const char *GPIO_PULL_HIGH_FAILED_STRING = "GPIO_PULL_HIGH_FAILED";
 const char *GPIO_PULL_LOW_FAILED_STRING = "GPIO_PULL_LOW_FAILED";
 const char *SWITCH_ALREADY_ON_STRING = "SWITCH_ALREADY_ON";
@@ -354,6 +355,8 @@ const char *translateEvents(Event event) {
       return SWITCH_HAS_CHANGED_STRING;
     case (11302):
       return SWITCHING_Q7S_DENIED_STRING;
+    case (11303):
+      return FDIR_REACTION_IGNORED_STRING;
     case (11400):
       return GPIO_PULL_HIGH_FAILED_STRING;
     case (11401):

linux/fsfwconfig/objects/translateObjects.cpp

@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 117 translations.
- * Generated on: 2022-04-08 14:13:35
+ * Generated on: 2022-05-03 16:32:00
  */
 #include "translateObjects.h"
 

linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp

@@ -510,11 +510,8 @@ ReturnValue_t pst::pstUart(FixedTimeslotTaskIF *thisSequence) {
 
 ReturnValue_t pst::pstGompaceCan(FixedTimeslotTaskIF *thisSequence) {
   uint32_t length = thisSequence->getPeriodMs();
-#ifndef TE0720_1CFA
-#if Q7S_EM != 1
   // PCDU handlers receives two messages and both must be handled
   thisSequence->addSlot(objects::PCDU_HANDLER, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::PCDU_HANDLER, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
 
   thisSequence->addSlot(objects::P60DOCK_HANDLER, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
   thisSequence->addSlot(objects::PDU1_HANDLER, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
@@ -544,8 +541,6 @@ ReturnValue_t pst::pstGompaceCan(FixedTimeslotTaskIF *thisSequence) {
     sif::error << "GomSpace PST initialization failed" << std::endl;
     return HasReturnvaluesIF::RETURN_FAILED;
   }
-#endif /* Q7S_EM == 0 */
-#endif
   static_cast<void>(length);
   return HasReturnvaluesIF::RETURN_OK;
 }

linux/obc/PapbVcInterface.cpp

@@ -42,17 +42,17 @@ void PapbVcInterface::startPacketTransfer() { *vcBaseReg = CONFIG_START; }
 void PapbVcInterface::endPacketTransfer() { *vcBaseReg = CONFIG_END; }
 
 ReturnValue_t PapbVcInterface::pollPapbBusySignal() {
-  int papbBusyState = 0;
+  gpio::Levels papbBusyState = gpio::Levels::LOW;
   ReturnValue_t result = RETURN_OK;
 
   /** Check if PAPB interface is ready to receive data */
-  result = gpioComIF->readGpio(papbBusyId, &papbBusyState);
+  result = gpioComIF->readGpio(papbBusyId, papbBusyState);
   if (result != RETURN_OK) {
     sif::warning << "PapbVcInterface::pollPapbBusySignal: Failed to read papb busy signal"
                  << std::endl;
     return RETURN_FAILED;
   }
-  if (!papbBusyState) {
+  if (papbBusyState == gpio::Levels::LOW) {
     sif::warning << "PapbVcInterface::pollPapbBusySignal: PAPB busy" << std::endl;
     return PAPB_BUSY;
   }
@@ -62,9 +62,9 @@ ReturnValue_t PapbVcInterface::pollPapbBusySignal() {
 
 void PapbVcInterface::isVcInterfaceBufferEmpty() {
   ReturnValue_t result = RETURN_OK;
-  int papbEmptyState = 1;
+  gpio::Levels papbEmptyState = gpio::Levels::HIGH;
 
-  result = gpioComIF->readGpio(papbEmptyId, &papbEmptyState);
+  result = gpioComIF->readGpio(papbEmptyId, papbEmptyState);
 
   if (result != RETURN_OK) {
     sif::warning << "PapbVcInterface::isVcInterfaceBufferEmpty: Failed to read papb empty signal"
@@ -72,7 +72,7 @@ void PapbVcInterface::isVcInterfaceBufferEmpty() {
     return;
   }
 
-  if (papbEmptyState == 1) {
+  if (papbEmptyState == gpio::Levels::HIGH) {
     sif::debug << "PapbVcInterface::isVcInterfaceBufferEmpty: Buffer is empty" << std::endl;
   } else {
     sif::debug << "PapbVcInterface::isVcInterfaceBufferEmpty: Buffer is not empty" << std::endl;

misc/eclipse/.cproject

@@ -143,7 +143,7 @@
 					<folderInfo id="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473." name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.base.451747644" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.base">
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.GNU_ELF;org.eclipse.cdt.core.PE64" id="cdt.managedbuild.target.gnu.platform.base.1935224860" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/>
-							<builder arguments="--build . -j" buildPath="${workspace_loc:/eive-obsw/build-Debug-Host}" command="cmake" id="cdt.managedbuild.target.gnu.builder.base.1977029024" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cdt.managedbuild.target.gnu.builder.base"/>
+							<builder arguments="--build . -j" buildPath="${workspace_loc:/eive-obsw/cmake-build-debug}" command="cmake" id="cdt.managedbuild.target.gnu.builder.base.1977029024" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cdt.managedbuild.target.gnu.builder.base"/>
 							<tool id="cdt.managedbuild.tool.gnu.archiver.base.1958098629" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
 							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.1405808772" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.include.paths.44677510" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
@@ -589,7 +589,7 @@
 		<cconfiguration id="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689">
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689" moduleId="org.eclipse.cdt.core.settings" name="eive-q7s-debug">
 				<macros>
-					<stringMacro name="Q7S_SYSROOT_UNIX" type="VALUE_PATH_DIR" value="${HOME}/Xilinx/eive-compile-rootfs"/>
+					<stringMacro name="Q7S_SYSROOT_UNIX" type="VALUE_PATH_DIR" value="/opt/xiphos/sdk/ark/sysroots/cortexa9hf-neon-xiphos-linux-gnueabi"/>
 					<stringMacro name="Q7S_SYSROOT" type="VALUE_TEXT" value="C:\Xilinx\cortexa9hf-neon-xiphos-linux-gnueabi"/>
 				</macros>
 				<externalSettings/>
@@ -680,7 +680,7 @@
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.other.1721137382" name="Other debugging flags" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.other"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.showDevicesTab.2014131279" name="showDevicesTab" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.showDevicesTab"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.363832829" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
-							<builder arguments="--build . -j" buildPath="${workspace_loc:/eive-obsw/build-Debug-Q7S}" command="cmake" enableCleanBuild="false" enabledIncrementalBuild="true" id="ilg.gnuarmeclipse.managedbuild.cross.builder.1895725167" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder"/>
+							<builder arguments="--build . -j" buildPath="${workspace_loc:/eive-obsw/cmake-build-debug-q7s}" command="cmake" enableCleanBuild="false" enabledIncrementalBuild="true" id="ilg.gnuarmeclipse.managedbuild.cross.builder.1895725167" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder"/>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.2035413172" name="GNU Arm Cross Assembler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.1527860624" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" value="true" valueType="boolean"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths.1772224733" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths" valueType="includePath">
@@ -758,7 +758,7 @@
 		<cconfiguration id="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689.1939781894">
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689.1939781894" moduleId="org.eclipse.cdt.core.settings" name="eive-q7s-release">
 				<macros>
-					<stringMacro name="Q7S_SYSROOT_UNIX" type="VALUE_TEXT" value="${HOME}/Xilinx/cortexa9hf-neon-xiphos-linux-gnueabi"/>
+					<stringMacro name="Q7S_SYSROOT_UNIX" type="VALUE_TEXT" value="/opt/xiphos/sdk/ark/sysroots/cortexa9hf-neon-xiphos-linux-gnueabi"/>
 					<stringMacro name="Q7S_SYSROOT" type="VALUE_TEXT" value="C:\Xilinx\cortexa9hf-neon-xiphos-linux-gnueabi"/>
 				</macros>
 				<externalSettings/>
@@ -1482,12 +1482,184 @@
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
+		<cconfiguration id="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689.1171630561">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689.1171630561" moduleId="org.eclipse.cdt.core.settings" name="eive-q7s-debug-em">
+				<macros>
+					<stringMacro name="Q7S_SYSROOT_UNIX" type="VALUE_PATH_DIR" value="/opt/xiphos/sdk/ark/sysroots/cortexa9hf-neon-xiphos-linux-gnueabi"/>
+					<stringMacro name="Q7S_SYSROOT" type="VALUE_TEXT" value="C:\Xilinx\cortexa9hf-neon-xiphos-linux-gnueabi"/>
+				</macros>
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactName="${ProjName}" buildProperties="" description="" errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GCCErrorParser" id="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689.1171630561" name="eive-q7s-debug-em" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.enablement=null,org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.image=null,org.eclipse.cdt.docker.launcher.containerbuild.property.connection=null" parent="org.eclipse.cdt.build.core.emptycfg">
+					<folderInfo id="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689.1171630561." name="/" resourcePath="">
+						<toolChain id="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base.1640701365" name="Arm Cross GCC" superClass="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base">
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.564607779" name="Architecture" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.architecture" value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.arm" valueType="enumerated"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.prefix.1062059664" name="Prefix" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.prefix" value="arm-linux-gnueabihf-" valueType="string"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.suffix.1867175220" name="Suffix" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.suffix"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.c.842471178" name="C compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.c" value="gcc" valueType="string"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.cpp.832270214" name="C++ compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.cpp" value="g++" valueType="string"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.ar.1394665208" name="Archiver" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.ar" value="ar" valueType="string"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.objcopy.1631195348" name="Hex/Bin converter" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.objcopy" value="objcopy" valueType="string"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.objdump.1511320647" name="Listing generator" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.objdump" value="objdump" valueType="string"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.size.363688892" name="Size command" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.size" value="size" valueType="string"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.make.341053282" name="Build command" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.make" value="make" valueType="string"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.rm.416254613" name="Remove command" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.rm" value="rm" valueType="string"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.useglobalpath.477868517" name="Use global path" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.useglobalpath"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.path.1586567135" name="Path" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.path"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.createflash.809797385" name="Create flash image" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.createflash" value="true" valueType="boolean"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.createlisting.1959365399" name="Create extended listing" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.createlisting"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.printsize.1392869600" name="Print size" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.printsize" value="true" valueType="boolean"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family.1571196982" name="Arm family (-mcpu)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.mcpu.cortex-m3" valueType="enumerated"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.architecture.22711890" name="Architecture (-march)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.architecture"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.instructionset.1125806320" name="Instruction set" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.instructionset" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.instructionset.thumb" valueType="enumerated"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.thumbinterwork.1131524798" name="Thumb interwork (-mthumb-interwork)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.thumbinterwork"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.endianness.1234447963" name="Endianness" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.endianness"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.fpu.abi.1736425635" name="Float ABI" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.fpu.abi"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.fpu.unit.1460067331" name="FPU Type" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.fpu.unit"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.unalignedaccess.510021756" name="Unaligned access" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.unalignedaccess"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.mcmse.1608610765" name="TrustZone (-mcmse)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.mcmse"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.aarch64.target.family.299022697" name="AArch64 family" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.aarch64.target.family"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.aarch64.target.feature.crc.203220242" name="Feature crc" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.aarch64.target.feature.crc"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.aarch64.target.feature.crypto.1667261315" name="Feature crypto" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.aarch64.target.feature.crypto"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.aarch64.target.feature.fp.1673623600" name="Feature fp" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.aarch64.target.feature.fp"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.aarch64.target.feature.simd.647069817" name="Feature simd" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.aarch64.target.feature.simd"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.aarch64.target.cmodel.1138056479" name="Code model" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.aarch64.target.cmodel"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.aarch64.target.strictalign.547063769" name="Strict align (-mstrict-align)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.aarch64.target.strictalign"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.target.other.1429241713" name="Other target flags" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.target.other"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.133372003" name="Optimization Level" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.messagelength.1069412790" name="Message length (-fmessage-length=0)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.messagelength"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.signedchar.1677199615" name="'char' is signed (-fsigned-char)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.signedchar"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.functionsections.1470024176" name="Function sections (-ffunction-sections)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.functionsections"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.datasections.1984174152" name="Data sections (-fdata-sections)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.datasections"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.nocommon.92677559" name="No common unitialized (-fno-common)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.nocommon"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.noinlinefunctions.1743056719" name="Do not inline functions (-fno-inline-functions)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.noinlinefunctions"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.freestanding.924717000" name="Assume freestanding environment (-ffreestanding)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.freestanding"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.nobuiltin.839792870" name="Disable builtin (-fno-builtin)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.nobuiltin"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.spconstant.1390020716" name="Single precision constants (-fsingle-precision-constant)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.spconstant"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.PIC.1259038800" name="Position independent code (-fPIC)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.PIC"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.lto.609692360" name="Link-time optimizer (-flto)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.lto"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.nomoveloopinvariants.1313079795" name="Disable loop invariant move (-fno-move-loop-invariants)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.nomoveloopinvariants"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.other.348159834" name="Other optimization flags" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.other"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.name.1108913226" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.name" value="Linaro ARMv7 Linux GNU EABI HF" valueType="string"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.id.1129506757" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.id" value="4014586055" valueType="string"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.syntaxonly.1398373384" name="Check syntax only (-fsyntax-only)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.syntaxonly"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.pedantic.1990860882" name="Pedantic (-pedantic)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.pedantic"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.pedanticerrors.911427496" name="Pedantic warnings as errors (-pedantic-errors)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.pedanticerrors"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.nowarn.318463934" name="Inhibit all warnings (-w)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.nowarn"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.unused.2083557710" name="Warn on various unused elements (-Wunused)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.unused"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.uninitialized.1817471578" name="Warn on uninitialized variables (-Wuninitialised)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.uninitialized"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.allwarn.1060938507" name="Enable all common warnings (-Wall)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.allwarn"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.extrawarn.181299392" name="Enable extra warnings (-Wextra)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.extrawarn"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.missingdeclaration.1594157079" name="Warn on undeclared global function (-Wmissing-declaration)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.missingdeclaration"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.conversion.115795688" name="Warn on implicit conversions (-Wconversion)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.conversion"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.pointerarith.801332040" name="Warn if pointer arithmetic (-Wpointer-arith)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.pointerarith"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.padded.965509029" name="Warn if padding is included (-Wpadded)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.padded"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.shadow.2079743065" name="Warn if shadowed variable (-Wshadow)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.shadow"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.logicalop.1042887247" name="Warn if suspicious logical ops (-Wlogical-op)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.logicalop"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.agreggatereturn.2037287733" name="Warn if struct is returned (-Wagreggate-return)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.agreggatereturn"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.floatequal.1450280203" name="Warn if floats are compared as equal (-Wfloat-equal)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.floatequal"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.toerrors.773376925" name="Generate errors instead of warnings (-Werror)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.toerrors"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.other.555672897" name="Other warning flags" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.other"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.level.687679969" name="Debug level" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.level"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.format.1213297390" name="Debug format" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.format"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.prof.569169089" name="Generate prof information (-p)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.prof"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.gprof.1790579348" name="Generate gprof information (-pg)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.gprof"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.other.1030974849" name="Other debugging flags" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.other"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.showDevicesTab.1461454340" name="showDevicesTab" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.showDevicesTab"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.1477533001" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
+							<builder arguments="--build . -j" buildPath="${workspace_loc:/eive-obsw/cmake-build-debug-q7s-em}" command="cmake" enableCleanBuild="false" enabledIncrementalBuild="true" id="ilg.gnuarmeclipse.managedbuild.cross.builder.1029428617" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder"/>
+							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.1718062118" name="GNU Arm Cross Assembler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler">
+								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.1257863943" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" value="true" valueType="boolean"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths.1703046819" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths" valueType="includePath">
+									<listOptionValue builtIn="false" value="&quot;${Q7S_SYSROOT_UNIX}/usr/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw/fsfw/src}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw/fsfw/hal/src}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw/build-Debug-Q7S/fsfw}&quot;"/>
+								</option>
+								<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.input.1731007799" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.input"/>
+							</tool>
+							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.1477130926" name="GNU Arm Cross C Compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths.838728051" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths" useByScannerDiscovery="true" valueType="includePath">
+									<listOptionValue builtIn="false" value="&quot;${Q7S_SYSROOT_UNIX}/usr/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw/common/config}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw/linux/fsfwconfig}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw/fsfw/src}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw/fsfw/hal/src}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw/build-Debug-Q7S/fsfw}&quot;"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs.1490629801" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs" useByScannerDiscovery="true" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="LINUX=1"/>
+								</option>
+								<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input.779990384" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input"/>
+							</tool>
+							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.308264050" name="GNU Arm Cross C++ Compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.include.paths.469771810" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.include.paths" useByScannerDiscovery="true" valueType="includePath">
+									<listOptionValue builtIn="false" value="&quot;../${Q7S_SYSROOT}/usr/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${Q7S_SYSROOT_UNIX}/usr/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw/linux/fsfwconfig}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw/common/config}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw/build-Debug-Q7S}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw/fsfw/src}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw/fsfw/hal/src}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw/build-Debug-Q7S/fsfw}&quot;"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.defs.1692092339" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.defs" useByScannerDiscovery="true" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="LINUX=1"/>
+								</option>
+								<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.input.259982159" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.input"/>
+							</tool>
+							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.linker.1974387385" name="GNU Arm Cross C Linker" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.linker">
+								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.gcsections.1504385753" name="Remove unused sections (-Xlinker --gc-sections)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.gcsections" value="true" valueType="boolean"/>
+							</tool>
+							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.linker.778224442" name="GNU Arm Cross C++ Linker" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.linker">
+								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.gcsections.1894384941" name="Remove unused sections (-Xlinker --gc-sections)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.gcsections" value="true" valueType="boolean"/>
+								<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.linker.input.2064035684" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.archiver.1013675852" name="GNU Arm Cross Archiver" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.archiver"/>
+							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.createflash.653363853" name="GNU Arm Cross Create Flash Image" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.createflash"/>
+							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.createlisting.6021583" name="GNU Arm Cross Create Listing" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.createlisting">
+								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.source.1044186164" name="Display source (--source|-S)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.source" value="true" valueType="boolean"/>
+								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.allheaders.702471697" name="Display all headers (--all-headers|-x)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.allheaders" value="true" valueType="boolean"/>
+								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.demangle.1993012856" name="Demangle names (--demangle|-C)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.demangle" value="true" valueType="boolean"/>
+								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.linenumbers.402738823" name="Display line numbers (--line-numbers|-l)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.linenumbers" value="true" valueType="boolean"/>
+								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.wide.646452266" name="Wide lines (--wide|-w)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.wide" value="true" valueType="boolean"/>
+							</tool>
+							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.printsize.1800220133" name="GNU Arm Cross Print Size" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.printsize">
+								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.printsize.format.1281210873" name="Size format" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.printsize.format"/>
+							</tool>
+						</toolChain>
+					</folderInfo>
+					<sourceEntries>
+						<entry excluding="build-Debug-Host|build-Watchdog-Debug" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+					</sourceEntries>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+			<storageModule moduleId="ilg.gnumcueclipse.managedbuild.packs"/>
+		</cconfiguration>
 	</storageModule>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
 		<project id="eive_obsw.null.1109622296" name="eive_obsw"/>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="refreshScope" versionNumber="2">
+		<configuration configurationName="eive-q7s-debug-em">
+			<resource resourceType="PROJECT" workspacePath="/eive-obsw"/>
+		</configuration>
 		<configuration configurationName="eive-q7s-simple">
 			<resource resourceType="PROJECT" workspacePath="/eive-obsw"/>
 		</configuration>

misc/eclipse/Host/eive-linux-host-debug-cmake.launch

@@ -18,7 +18,7 @@
     <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="run"/>
     <booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
     <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build-Debug-Host/eive-obsw"/>
+    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="cmake-build-debug/eive-obsw"/>
     <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="eive-obsw"/>
     <booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="false"/>
     <stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473"/>

mission/core/GenericFactory.cpp

@@ -111,9 +111,9 @@ void ObjectFactory::produceGenericObjects() {
   tcpServer->setSpacePacketParsingOptions({common::PUS_PACKET_ID});
   sif::info << "Created TCP server for TMTC commanding with listener port "
             << tcpServer->getTcpPort() << std::endl;
-#if TCP_SERVER_WIRETAPPING == 1
+#if OBSW_TCP_SERVER_WIRETAPPING == 1
   tcpServer->enableWiretapping(true);
-#endif /* TCP_SERVER_WIRETAPPING == 1 */
+#endif /* OBSW_TCP_SERVER_WIRETAPPING == 1 */
 #endif /* OBSW_USE_TMTC_TCP_BRIDGE == 0 */
   tmtcBridge->setMaxNumberOfPacketsStored(70);
 #endif /* OBSW_ADD_TCPIP_BRIDGE == 1 */

mission/devices/ACUHandler.cpp

@@ -2,8 +2,9 @@
 
 #include "OBSWConfig.h"
 
-ACUHandler::ACUHandler(object_id_t objectId, object_id_t comIF, CookieIF *comCookie)
-    : GomspaceDeviceHandler(objectId, comIF, comCookie, ACU::MAX_CONFIGTABLE_ADDRESS,
+ACUHandler::ACUHandler(object_id_t objectId, object_id_t comIF, CookieIF *comCookie,
+                       FailureIsolationBase *customFdir)
+    : GomspaceDeviceHandler(objectId, comIF, comCookie, customFdir, ACU::MAX_CONFIGTABLE_ADDRESS,
                             ACU::MAX_HKTABLE_ADDRESS, ACU::HK_TABLE_REPLY_SIZE),
       acuHkTableDataset(this) {}
 
@@ -23,20 +24,22 @@ void ACUHandler::letChildHandleHkReply(DeviceCommandId_t id, const uint8_t *pack
   parseHkTableReply(packet);
   handleDeviceTM(&acuHkTableDataset, id, true);
 
-#if OBSW_VERBOSE_LEVEL >= 1 && OBSW_DEBUG_ACU == 1
-  acuHkTableDataset.read();
-  float temperatureC_1 = acuHkTableDataset.temperature1.value * 0.1;
-  float temperatureC_2 = acuHkTableDataset.temperature2.value * 0.1;
-  float temperatureC_3 = acuHkTableDataset.temperature3.value * 0.1;
-  sif::info << "ACU: Temperature 1: " << temperatureC_1 << " °C" << std::endl;
-  sif::info << "ACU: Temperature 2: " << temperatureC_2 << " °C" << std::endl;
-  sif::info << "ACU: Temperature 3: " << temperatureC_3 << " °C" << std::endl;
-  sif::info << "ACU: Ground Watchdog Timer Count: " << acuHkTableDataset.wdtCntGnd.value
-            << std::endl;
-  sif::info << "ACU: Ground watchdog timer, seconds left before reboot: "
-            << acuHkTableDataset.wdtGndLeft.value << std::endl;
-  acuHkTableDataset.commit();
+  if (debugMode) {
+#if OBSW_VERBOSE_LEVEL >= 1
+    acuHkTableDataset.read();
+    float temperatureC_1 = acuHkTableDataset.temperature1.value * 0.1;
+    float temperatureC_2 = acuHkTableDataset.temperature2.value * 0.1;
+    float temperatureC_3 = acuHkTableDataset.temperature3.value * 0.1;
+    sif::info << "ACU: Temperature 1: " << temperatureC_1 << " °C" << std::endl;
+    sif::info << "ACU: Temperature 2: " << temperatureC_2 << " °C" << std::endl;
+    sif::info << "ACU: Temperature 3: " << temperatureC_3 << " °C" << std::endl;
+    sif::info << "ACU: Ground Watchdog Timer Count: " << acuHkTableDataset.wdtCntGnd.value
+              << std::endl;
+    sif::info << "ACU: Ground watchdog timer, seconds left before reboot: "
+              << acuHkTableDataset.wdtGndLeft.value << std::endl;
+    acuHkTableDataset.commit();
 #endif
+  }
 }
 
 LocalPoolDataSetBase *ACUHandler::getDataSetHandle(sid_t sid) {
@@ -317,3 +320,5 @@ void ACUHandler::printChannelStats() {
             << static_cast<unsigned int>(acuHkTableDataset.currentInChannel5.value) << std::setw(15)
             << std::right << acuHkTableDataset.voltageInChannel5.value << std::endl;
 }
+
+void ACUHandler::setDebugMode(bool enable) { this->debugMode = enable; }

mission/devices/ACUHandler.h

@@ -12,9 +12,12 @@
  */
 class ACUHandler : public GomspaceDeviceHandler {
  public:
-  ACUHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie);
+  ACUHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie,
+             FailureIsolationBase* customFdir);
   virtual ~ACUHandler();
 
+  void setDebugMode(bool enable);
+
   virtual ReturnValue_t initializeLocalDataPool(localpool::DataPool& localDataPoolMap,
                                                 LocalDataPoolManager& poolManager) override;
 
@@ -37,6 +40,7 @@ class ACUHandler : public GomspaceDeviceHandler {
   static const DeviceCommandId_t PRINT_CHANNEL_STATS = 51;
 
   ACU::HkTableDataset acuHkTableDataset;
+  bool debugMode = false;
 
   /**
    * @brief   Function extracts the hk table information from the received csp packet and stores

mission/devices/BpxBatteryHandler.cpp

@@ -197,19 +197,19 @@ ReturnValue_t BpxBatteryHandler::interpretDeviceReply(DeviceCommandId_t id, cons
       if (result != HasReturnvaluesIF::RETURN_OK) {
         return result;
       }
-#if OBSW_DEBUG_BPX_BATT == 1
-      sif::info << "BPX Battery HK output:" << std::endl;
-      sif::info << "Charge current [mA]: " << hkSet.chargeCurrent << std::endl;
-      sif::info << "Discharge current [mA]: " << hkSet.dischargeCurrent << std::endl;
-      sif::info << "Heater current [mA]: " << hkSet.heaterCurrent << std::endl;
-      sif::info << "Battery voltage [mV]: " << hkSet.battVoltage << std::endl;
-      sif::info << "Battery Temperature 1 [C]: " << hkSet.battTemp1 << std::endl;
-      sif::info << "Battery Temperature 2 [C]: " << hkSet.battTemp2 << std::endl;
-      sif::info << "Battery Temperature 3 [C]: " << hkSet.battTemp3 << std::endl;
-      sif::info << "Battery Temperature 4 [C]: " << hkSet.battTemp4 << std::endl;
-      sif::info << "Battery Reboot Counter: " << hkSet.rebootCounter << std::endl;
-      sif::info << "Battery Boot Cause: " << static_cast<int>(hkSet.bootcause.value) << std::endl;
-#endif
+      if (debugMode) {
+        sif::info << "BPX Battery HK output:" << std::endl;
+        sif::info << "Charge current [mA]: " << hkSet.chargeCurrent << std::endl;
+        sif::info << "Discharge current [mA]: " << hkSet.dischargeCurrent << std::endl;
+        sif::info << "Heater current [mA]: " << hkSet.heaterCurrent << std::endl;
+        sif::info << "Battery voltage [mV]: " << hkSet.battVoltage << std::endl;
+        sif::info << "Battery Temperature 1 [C]: " << hkSet.battTemp1 << std::endl;
+        sif::info << "Battery Temperature 2 [C]: " << hkSet.battTemp2 << std::endl;
+        sif::info << "Battery Temperature 3 [C]: " << hkSet.battTemp3 << std::endl;
+        sif::info << "Battery Temperature 4 [C]: " << hkSet.battTemp4 << std::endl;
+        sif::info << "Battery Reboot Counter: " << hkSet.rebootCounter << std::endl;
+        sif::info << "Battery Boot Cause: " << static_cast<int>(hkSet.bootcause.value) << std::endl;
+      }
       break;
     }
     case (BpxBattery::PING): {
@@ -277,3 +277,5 @@ ReturnValue_t BpxBatteryHandler::initializeLocalDataPool(localpool::DataPool& lo
 void BpxBatteryHandler::setToGoToNormalMode(bool enable) {
   this->goToNormalModeImmediately = enable;
 }
+
+void BpxBatteryHandler::setDebugMode(bool enable) { this->debugMode = enable; }

mission/devices/BpxBatteryHandler.h

@@ -11,6 +11,7 @@ class BpxBatteryHandler : public DeviceHandlerBase {
   virtual ~BpxBatteryHandler();
 
   void setToGoToNormalMode(bool enable);
+  void setDebugMode(bool enable);
 
  protected:
   enum class States {
@@ -20,6 +21,7 @@ class BpxBatteryHandler : public DeviceHandlerBase {
 
   States state = States::CHECK_COM;
   bool commandExecuted = false;
+  bool debugMode = false;
   bool goToNormalModeImmediately = false;
   uint8_t sentPingByte = BpxBattery::DEFAULT_PING_SENT_BYTE;
   BpxBatteryHk hkSet;

mission/devices/GomspaceDeviceHandler.cpp

@@ -7,9 +7,10 @@
 #include "devicedefinitions/powerDefinitions.h"
 
 GomspaceDeviceHandler::GomspaceDeviceHandler(object_id_t objectId, object_id_t comIF,
-                                             CookieIF* comCookie, uint16_t maxConfigTableAddress,
+                                             CookieIF* comCookie, FailureIsolationBase* customFdir,
+                                             uint16_t maxConfigTableAddress,
                                              uint16_t maxHkTableAddress, uint16_t hkTableReplySize)
-    : DeviceHandlerBase(objectId, comIF, comCookie),
+    : DeviceHandlerBase(objectId, comIF, comCookie, customFdir),
       maxConfigTableAddress(maxConfigTableAddress),
       maxHkTableAddress(maxHkTableAddress),
       hkTableReplySize(hkTableReplySize) {

mission/devices/GomspaceDeviceHandler.h

@@ -38,8 +38,8 @@ class GomspaceDeviceHandler : public DeviceHandlerBase {
    * 							device.
    */
   GomspaceDeviceHandler(object_id_t objectId, object_id_t comIF, CookieIF *comCookie,
-                        uint16_t maxConfigTableAddress, uint16_t maxHkTableAddress,
-                        uint16_t hkTableReplySize);
+                        FailureIsolationBase *customFdir, uint16_t maxConfigTableAddress,
+                        uint16_t maxHkTableAddress, uint16_t hkTableReplySize);
   virtual ~GomspaceDeviceHandler();
 
   /**