2022-05-04 15:08:19 +02:00
73 changed files with 2781 additions and 1099 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +1,5 @@
 /build*
+/cmake-build*

 # Eclipse
 .settings
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -18,16 +18,18 @@ list yields a list of all related PRs for each release.

 ## 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
- Rename GPS device to `/dev/gps0`
 - 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
@ -35,6 +37,31 @@ list yields a list of all related PRs for each release.
  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
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -25,10 +25,13 @@ if(NOT FSFW_OSAL)
 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)
@ -53,8 +56,27 @@ include(EiveHelpers)
 option(EIVE_ADD_ETL_LIB "Add ETL library" ON)
 option(EIVE_ADD_JSON_LIB "Add JSON library" ON)

-set(OBSW_ADD_STAR_TRACKER 0)
-set(OBSW_DEBUG_STARTRACKER 0)
+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
@ -98,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)
@ -188,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")
@ -305,16 +327,25 @@ add_subdirectory(${UNITTEST_PATH})

 # This should have already been downloaded by the FSFW
 # Still include it to be safe
-include(FetchContent)
-FetchContent_Declare(
-    etl
-    GIT_REPOSITORY https://github.com/ETLCPP/etl
-    GIT_TAG        ${FSFW_ETL_LIB_VERSION}
-)
-FetchContent_MakeAvailable(etl)
+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"))
+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
@ -328,8 +359,21 @@ if (NOT(TGT_BSP MATCHES "arm/te0720-1cfa") AND NOT(TGT_BSP MATCHES "arm/q7s"))
            GIT_TAG        ${FSFW_CATCH2_LIB_VERSION}
        )

-        FetchContent_MakeAvailable(Catch2)
-        #fixes regression -preview4, to be confirmed in later releases
+        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")
@ -378,7 +422,7 @@ endif()

 if(EIVE_ADD_ETL_LIB)
    target_link_libraries(${LIB_EIVE_MISSION} PUBLIC
-        etl
+        ${LIB_ETL_TARGET}
    )
 endif()

--- a/README.md
+++ b/README.md
@ -107,28 +107,47 @@ When using Windows, run theses steps in MSYS2.
   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
   ```

@ -167,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
 ```
@ -175,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
 ```
@ -190,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
 ```
@ -201,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
 ```
--- a/bsp_hosted/OBSWConfig.h.in
+++ b/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_ */
--- a/bsp_hosted/ObjectFactory.cpp
+++ b/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"

--- a/bsp_hosted/bsp_hosted.mk
+++ b/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
--- a/bsp_hosted/main.cpp
+++ b/bsp_hosted/main.cpp
@ -20,7 +20,7 @@ int main(void) {
  std::cout << "-- EIVE OBSW --" << std::endl;
  std::cout << "-- Compiled for " << COMPILE_PRINTOUT << " --" << std::endl;
  std::cout << "-- OBSW "
-            << " v" << common::OBSW_VERSION << " | FSFW v" << fsfw::FSFW_VERSION << " --"
+            << "v" << common::OBSW_VERSION << " | FSFW v" << fsfw::FSFW_VERSION << " --"
            << std::endl;
  std::cout << "-- " << __DATE__ << " " << __TIME__ << " --" << std::endl;

--- a/bsp_linux_board/OBSWConfig.h.in
+++ b/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_ */
--- a/bsp_linux_board/ObjectFactory.cpp
+++ b/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
 }
--- a/bsp_q7s/CMakeLists.txt
+++ b/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)
--- a/bsp_q7s/OBSWConfig.h.in
+++ b/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_ */
--- a/bsp_q7s/boardconfig/q7sConfig.h.in
+++ b/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  */
 /*******************************************************************/
--- a/bsp_q7s/core/CMakeLists.txt
+++ b/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
--- a/bsp_q7s/core/InitMission.cpp
+++ b/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,
--- a/bsp_q7s/core/ParameterHandler.cpp
+++ b/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; }
--- a/bsp_q7s/core/ParameterHandler.h
+++ b/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_ */
--- a/bsp_q7s/em/CMakeLists.txt
+++ b/bsp_q7s/em/CMakeLists.txt
@ -0,0 +1,3 @@
+target_sources(${OBSW_NAME} PRIVATE
+    emObjectFactory.cpp
+)
--- a/bsp_q7s/em/emObjectFactory.cpp
+++ b/bsp_q7s/em/emObjectFactory.cpp
@ -1,5 +1,3 @@
-#include "ObjectFactory.h"
-
 #include <mission/system/fdir/GomspacePowerFdir.h>
 #include <mission/system/fdir/SyrlinksFdir.h>

@ -10,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"
@ -47,11 +46,9 @@
 #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"
@ -99,7 +96,6 @@
 #include "mission/tmtc/CCSDSHandler.h"
 #include "mission/tmtc/VirtualChannel.h"
 #include "mission/utility/TmFunnel.h"
-
 ResetArgs resetArgsGnss0;
 ResetArgs resetArgsGnss1;

@ -114,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
@ -150,7 +145,6 @@ void ObjectFactory::produce(void* args) {
 #if OBSW_ADD_ACS_BOARD == 1
  createAcsBoardComponents(gpioComIF, uartComIF, pwrSwitcher);
 #endif
-
  createHeaterComponents();
  createSolarArrayDeploymentComponents();
  createPlPcduComponents(gpioComIF, spiComIF, pwrSwitcher);
@ -187,7 +181,6 @@ void ObjectFactory::produce(void* args) {
  bpxHandler->setDebugMode(true);
 #endif
 #endif
-
  new FileSystemHandler(objects::FILE_SYSTEM_HANDLER);

 #if OBSW_ADD_STAR_TRACKER == 1
@ -202,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);
 }
@ -439,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);
@ -456,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);
@ -488,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,
@ -507,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,
@ -525,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,
@ -555,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;
@ -681,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(),
@ -765,7 +748,6 @@ void ObjectFactory::createReactionWheelComponents(LinuxLibgpioIF* gpioComIF) {
  rwHandler1->setStartUpImmediately();
  rwHandler1->setDebugMode(true);
 #endif
-
  auto rwHandler2 =
      new RwHandler(objects::RW2, objects::SPI_COM_IF, rw2SpiCookie, gpioComIF, gpioIds::EN_RW2);
  rw2SpiCookie->setCallbackArgs(rwHandler2);
@ -773,7 +755,6 @@ void ObjectFactory::createReactionWheelComponents(LinuxLibgpioIF* gpioComIF) {
  rwHandler2->setStartUpImmediately();
  rwHandler2->setDebugMode(true);
 #endif
-
  auto rwHandler3 =
      new RwHandler(objects::RW3, objects::SPI_COM_IF, rw3SpiCookie, gpioComIF, gpioIds::EN_RW3);
  rw3SpiCookie->setCallbackArgs(rwHandler3);
@ -781,7 +762,6 @@ void ObjectFactory::createReactionWheelComponents(LinuxLibgpioIF* gpioComIF) {
  rwHandler3->setStartUpImmediately();
  rwHandler3->setDebugMode(true);
 #endif
-
  auto rwHandler4 =
      new RwHandler(objects::RW4, objects::SPI_COM_IF, rw4SpiCookie, gpioComIF, gpioIds::EN_RW4);
  rw4SpiCookie->setCallbackArgs(rwHandler4);
@ -789,7 +769,6 @@ void ObjectFactory::createReactionWheelComponents(LinuxLibgpioIF* gpioComIF) {
  rwHandler4->setStartUpImmediately();
  rwHandler4->setDebugMode(true);
 #endif
-
 #endif /* OBSW_ADD_RW == 1 */
 }

--- a/bsp_q7s/fm/CMakeLists.txt
+++ b/bsp_q7s/fm/CMakeLists.txt
@ -0,0 +1,3 @@
+target_sources(${OBSW_NAME} PRIVATE
+    fmObjectFactory.cpp
+)
--- a/bsp_q7s/fm/fmObjectFactory.cpp
+++ b/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;
+  }
+}
--- a/bsp_q7s/main.cpp
+++ b/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
--- a/bsp_q7s/core/obsw.cpp
+++ b/bsp_q7s/core/obsw.cpp
@ -3,9 +3,9 @@
 #include <filesystem>
 #include <iostream>

-#include "InitMission.h"
 #include "OBSWConfig.h"
 #include "commonConfig.h"
+#include "core/InitMission.h"
 #include "fsfw/tasks/TaskFactory.h"
 #include "fsfw/version.h"
 #include "watchdog/definitions.h"
--- a/bsp_q7s/core/obsw.h
+++ b/bsp_q7s/core/obsw.h
--- a/linux/fsfwconfig/OBSWConfig.h.in
+++ b/linux/fsfwconfig/OBSWConfig.h.in
@ -6,69 +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"
-                             
-#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                        1
-#define OBSW_ADD_RAD_SENSORS                        1
-#define OBSW_ADD_PL_PCDU                            1
-#define OBSW_ADD_SYRLINKS                           1
-#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
@ -91,7 +41,13 @@
 #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 */
@ -146,43 +102,10 @@

 #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 OBSW_TCP_SERVER_WIRETAPPING                 0

 /*******************************************************************/
@ -193,12 +116,6 @@
 #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"
--- a/cmake/PreProjectConfig.cmake
+++ b/cmake/PreProjectConfig.cmake
@ -1,3 +1,6 @@
+function(obsw_module_config)
+endfunction()
+
 function(pre_source_hw_os_config)

 # FreeRTOS
--- a/cmake/scripts/Host/make-debug-cfg.sh
+++ b/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
--- a/cmake/scripts/Host/make-release-cfg.sh
+++ b/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
--- a/cmake/scripts/Host/ninja-debug-cfg.sh
+++ b/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
--- a/cmake/scripts/Linux/make-debug-cfg.sh
+++ b/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
--- a/cmake/scripts/Linux/make-release-cfg.sh
+++ b/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
--- a/cmake/scripts/Linux/ninja-debug-cfg.sh
+++ b/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
-
--- a/cmake/scripts/Q7S/make-debug-cfg.sh
+++ b/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
-
--- a/cmake/scripts/Q7S/make-release-cfg.sh
+++ b/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
--- a/cmake/scripts/Q7S/ninja-debug-cfg.sh
+++ b/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
-
--- a/cmake/scripts/Q7S/ninja-release-cfg.sh
+++ b/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
-
--- a/cmake/scripts/Q7S/q7s-env.sh
+++ b/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
--- a/cmake/scripts/BeagleBoneBlack/crosscompile/bbb_path_helper.sh
+++ b/cmake/scripts/BeagleBoneBlack/crosscompile/bbb_path_helper.sh
--- a/cmake/scripts/BeagleBoneBlack/crosscompile/make-debug-cfg.sh
+++ b/cmake/scripts/BeagleBoneBlack/crosscompile/make-debug-cfg.sh
--- a/cmake/scripts/BeagleBoneBlack/crosscompile/make-release-cfg.sh
+++ b/cmake/scripts/BeagleBoneBlack/crosscompile/make-release-cfg.sh
--- a/cmake/scripts/BeagleBoneBlack/make-debug-cfg.sh
+++ b/cmake/scripts/BeagleBoneBlack/make-debug-cfg.sh
--- a/cmake/scripts/host/host-make-debug.sh
+++ b/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
--- a/cmake/scripts/host/host-make-release.sh
+++ b/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
--- a/cmake/scripts/host/host-ninja-debug.sh
+++ b/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
+
--- a/cmake/scripts/linux/host-make-debug.sh
+++ b/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
--- a/cmake/scripts/linux/host-make-release.sh
+++ b/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
--- a/cmake/scripts/linux/host-ninja-debug.sh
+++ b/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
+
--- a/cmake/scripts/q7s/q7s-make-debug.sh
+++ b/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}
--- a/cmake/scripts/q7s/q7s-make-release.sh
+++ b/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}
--- a/cmake/scripts/q7s/q7s-make-size.sh
+++ b/cmake/scripts/q7s/q7s-make-size.sh
--- a/cmake/scripts/q7s/q7s-ninja-debug.sh
+++ b/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}
--- a/cmake/scripts/q7s/q7s-ninja-release.sh
+++ b/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}
--- a/cmake/scripts/rpi/make-debug-cfg.sh
+++ b/cmake/scripts/rpi/make-debug-cfg.sh
--- a/cmake/scripts/rpi/make-release-cfg.sh
+++ b/cmake/scripts/rpi/make-release-cfg.sh
--- a/cmake/scripts/rpi/ninja-debug-cfg.sh
+++ b/cmake/scripts/rpi/ninja-debug-cfg.sh
--- a/cmake/scripts/rpi/rpi_path_helper.sh
+++ b/cmake/scripts/rpi/rpi_path_helper.sh
--- a/cmake/scripts/rpi/rpi_path_helper_win.sh
+++ b/cmake/scripts/rpi/rpi_path_helper_win.sh
--- a/common/config/commonConfig.h.in
+++ b/common/config/commonConfig.h.in
@ -4,6 +4,12 @@
 #include <cstdint>
 #include "fsfw/version.h"

+#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
--- a/generators/bsp_q7s_events.csv
+++ b/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
--- a/generators/bsp_q7s_returnvalues.csv
+++ b/generators/bsp_q7s_returnvalues.csv
--- a/generators/events/translateEvents.cpp
+++ b/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):
--- a/generators/objects/translateObjects.cpp
+++ b/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"

--- a/linux/fsfwconfig/FSFWConfig.h.in
+++ b/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_ */
--- a/linux/fsfwconfig/events/translateEvents.cpp
+++ b/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):
--- a/linux/fsfwconfig/objects/translateObjects.cpp
+++ b/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"

--- a/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp
+++ b/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp
@ -510,8 +510,6 @@ 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);

@ -543,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;
 }
--- a/misc/eclipse/.cproject
+++ b/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>
--- a/misc/eclipse/Host/eive-linux-host-debug-cmake.launch
+++ b/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"/>
--- a/scripts/q7s-env-em.sh
+++ b/scripts/q7s-env-em.sh
@ -0,0 +1,22 @@
+#!/bin/bash -i
+# This script is intended to be copied outside of the source directory on the
+# same folder level as the eive-obsw folder. This allows to tweak it to
+# custom cross-compiler and sysroot path setups
+
+# Adapt the following two entries to your need
+CROSS_COMPILE_BIN_PATH="$HOME/EIVE/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf/bin"
+export ZYNQ_7020_SYSROOT="/opt/xiphos/sdk/ark/sysroots/cortexa9hf-neon-xiphos-linux-gnueabi"
+
+export PATH=$PATH:${CROSS_COMPILE_BIN_PATH}
+export CROSS_COMPILE="arm-linux-gnueabihf"
+export EIVE_Q7S_EM=1
+
+if [[ -d "eive-obsw" ]]; then
+	echo "Detected EIVE OBSW root directory at $(pwd)/eive-obsw. Setting to EIVE_OBSW_ROOT"
+	export EIVE_OBSW_ROOT="$(pwd)/eive-obsw"
+	echo "Adding $(pwd)/eive-obsw/cmake/scripts/q7s helper script path to PATH"
+	export PATH=$PATH:"$(pwd)/eive-obsw/cmake/scripts/q7s"
+	cd "eive-obsw"
+fi
+export CONSOLE_PREFIX="[Q7S ENV]"
+/bin/bash
--- a/scripts/q7s-env.sh
+++ b/scripts/q7s-env.sh
@ -0,0 +1,22 @@
+#!/bin/bash -i
+# This script is intended to be copied outside of the source directory on the
+# same folder level as the eive-obsw folder. This allows to tweak it to
+# custom cross-compiler and sysroot path setups
+
+# Adapt the following two entries to your need
+CROSS_COMPILE_BIN_PATH="$HOME/EIVE/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf/bin"
+export ZYNQ_7020_SYSROOT="/opt/xiphos/sdk/ark/sysroots/cortexa9hf-neon-xiphos-linux-gnueabi"
+
+export PATH=$PATH:${CROSS_COMPILE_BIN_PATH}
+export CROSS_COMPILE="arm-linux-gnueabihf"
+# export EIVE_Q7S_EM=1
+
+if [[ -d "eive-obsw" ]]; then
+	echo "Detected EIVE OBSW root directory at $(pwd)/eive-obsw. Setting to EIVE_OBSW_ROOT"
+	export EIVE_OBSW_ROOT="$(pwd)/eive-obsw"
+	echo "Adding $(pwd)/eive-obsw/cmake/scripts/q7s helper script path to PATH"
+	export PATH=$PATH:"$(pwd)/eive-obsw/cmake/scripts/q7s"
+	cd "eive-obsw"
+fi
+export CONSOLE_PREFIX="[Q7S ENV]"
+/bin/bash
--- a/scripts/win-q7s-env-em.sh
+++ b/scripts/win-q7s-env-em.sh
@ -0,0 +1,58 @@
+#!/bin/sh
+# Run with: source win-q7s-env.sh [OPTIONS]
+function help () {
+	echo "source win-q7s-env.sh [options] -t|--toolchain=<toolchain path> -s|--sysroot=<sysroot path>"
+}
+
+TOOLCHAIN_PATH="/c/Xilinx/Vitis/2019.2/gnu/aarch32/nt/gcc-arm-linux-gnueabi/bin"
+SYSROOT="/c/Users/${USER}/eive-software/eive-compile-rootfs"
+export EIVE_Q7S_EM=1
+
+for i in "$@"; do
+  case $i in
+    -t=*|--toolchain=*)
+      TOOLCHAIN_PATH="${i#*=}"
+      shift
+      ;;
+    -s=*|--sysroot=*)
+      SYSROOT="${i#*=}"
+      shift
+      ;;
+	-h|--help)
+	  help
+	  shift
+      ;;
+    -*|--*)
+      echo "Unknown option $i"
+	  help
+      return
+      ;;
+    *)
+      ;;
+  esac
+done
+
+if [ -d "$TOOLCHAIN_PATH" ]; then
+	export PATH=$PATH:"/c/Xilinx/Vitis/2019.2/gnu/aarch32/nt/gcc-arm-linux-gnueabi/bin"
+	export CROSS_COMPILE="arm-linux-gnueabihf"
+	echo "Set toolchain path to /c/Xilinx/Vitis/2019.2/gnu/aarch32/nt/gcc-arm-linux-gnueabi/bin"
+else 
+	echo "Toolchain path $TOOLCHAIN_PATH does not exist"
+	return
+fi
+
+if [ -d "$SYSROOT" ]; then
+	export ZYNQ_7020_SYSROOT=$SYSROOT
+	echo "Set sysroot path to $SYSROOT"
+else 
+	echo "Sysroot path $SYSROOT does not exist"
+	return
+fi
+
+if [ -d "eive-obsw" ]; then
+	echo "Detected EIVE OBSW root directory at $(pwd)/eive-obsw. Setting to EIVE_OBSW_ROOT"
+	export EIVE_OBSW_ROOT="$(pwd)/eive-obsw"
+	echo "Adding $(pwd)/eive-obsw/cmake/scripts/q7s helper script path to PATH"
+	export PATH=$PATH:"$(pwd)/eive-obsw/cmake/scripts/q7s"
+	cd "eive-obsw"
+fi
--- a/cmake/scripts/Q7S/win-q7s-env.sh
+++ b/cmake/scripts/Q7S/win-q7s-env.sh
@ -6,6 +6,7 @@ function help () {

 TOOLCHAIN_PATH="/c/Xilinx/Vitis/2019.2/gnu/aarch32/nt/gcc-arm-linux-gnueabi/bin"
 SYSROOT="/c/Users/${USER}/eive-software/eive-compile-rootfs"
+# export EIVE_Q7S_EM=1

 for i in "$@"; do
  case $i in
@ -47,3 +48,11 @@ else
 	echo "Sysroot path $SYSROOT does not exist"
 	return
 fi
+
+if [ -d "eive-obsw" ]; then
+	echo "Detected EIVE OBSW root directory at $(pwd)/eive-obsw. Setting to EIVE_OBSW_ROOT"
+	export EIVE_OBSW_ROOT="$(pwd)/eive-obsw"
+	echo "Adding $(pwd)/eive-obsw/cmake/scripts/q7s helper script path to PATH"
+	export PATH=$PATH:"$(pwd)/eive-obsw/cmake/scripts/q7s"
+	cd "eive-obsw"
+fi
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 0a47c17fa699dc571d2d3e63ec08c9f4cf513f65
+Subproject commit aab5c289601a0d80d7104414a34df26d87789fd4