Merge remote-tracking branch 'origin/develop' into mueller/reboot-cmd

CHANGELOG.md

@@ -14,6 +14,8 @@ list yields a list of all related PRs for each release.
 
 ## Added
 
+- Commands for individual RTD devices
+  PR: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/84
 - `RwAssembly` added to system components. Assembly works in principle,
   issues making 4 consecutives RWs communicate at once..
   PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/224
@@ -27,6 +29,14 @@ list yields a list of all related PRs for each release.
   username appended at the end is created as a side-product now
   PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/248
 
+### Heater
+
+- Adds `HealthIF` to heaters. Heaters are own system object with queues now which allows to set them faulty.
+- SW will attempt to shut down heaters which are on but marked faulty
+- Some simplifications for `HeaterHandler`, use `std::vector` instead of `std::unordered_map` for primary container. Using the heater indexes 0 to 7 allows to use natural array indexing
+- Some additional input sanity checks in `executeAction`
+  PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/236
+
 ## Changed
 
 - Build unittest as default side product of hosted builds

CMakeLists.txt

@@ -1,12 +1,12 @@
-################################################################################
+# ##############################################################################
 # CMake support for the EIVE OBSW
-# 
+#
 # Author: R. Mueller
-################################################################################
+# ##############################################################################
 
-################################################################################
+# ##############################################################################
 # Pre-Project preparation
-################################################################################
+# ##############################################################################
 cmake_minimum_required(VERSION 3.13)
 
 set(OBSW_VERSION_MAJOR_IF_GIT_FAILS 0)
@@ -15,28 +15,36 @@ set(OBSW_VERSION_REVISION_IF_GIT_FAILS 0)
 
 # set(CMAKE_VERBOSE TRUE)
 
-option(EIVE_HARDCODED_TOOLCHAIN_FILE "\
+option(
+  EIVE_HARDCODED_TOOLCHAIN_FILE
+  "\
 For Linux Board Target BSPs, a default toolchain file will be set. Should be set to OFF \
-if a different toolchain file is set externally" ON
+if a different toolchain file is set externally"
-)
+  ON)
 
 if(NOT FSFW_OSAL)
-    set(FSFW_OSAL linux CACHE STRING "OS for the FSFW.")
+  set(FSFW_OSAL
+      linux
+      CACHE STRING "OS for the FSFW.")
 endif()
 
 if(TGT_BSP)
-    if(TGT_BSP MATCHES "arm/q7s" OR TGT_BSP MATCHES "arm/raspberrypi" OR TGT_BSP MATCHES "arm/beagleboneblack")
+  if(TGT_BSP MATCHES "arm/q7s"
-        option(LINUX_CROSS_COMPILE ON)
+     OR TGT_BSP MATCHES "arm/raspberrypi"
-    endif()
+     OR TGT_BSP MATCHES "arm/beagleboneblack")
-    if(TGT_BSP MATCHES "arm/raspberrypi" OR TGT_BSP MATCHES "arm/beagleboneblack")
+    option(LINUX_CROSS_COMPILE ON)
-        option(EIVE_BUILD_GPSD_GPS_HANDLER "Build GPSD dependent GPS Handler" OFF)
+  endif()
-    elseif(TGT_BSP MATCHES "arm/q7s")
+  if(TGT_BSP MATCHES "arm/raspberrypi" OR TGT_BSP MATCHES "arm/beagleboneblack")
-        option(EIVE_Q7S_EM "Build configuration for the EM" OFF)
+    option(EIVE_BUILD_GPSD_GPS_HANDLER "Build GPSD dependent GPS Handler" OFF)
-        option(EIVE_BUILD_GPSD_GPS_HANDLER "Build GPSD dependent GPS Handler" ON)
+  elseif(TGT_BSP MATCHES "arm/q7s")
-    endif()
+    option(EIVE_Q7S_EM "Build configuration for the EM" OFF)
-    option(EIVE_CREATE_UNIQUE_OBSW_BIN "Append username to generated binary name" ON)
+    option(EIVE_BUILD_GPSD_GPS_HANDLER "Build GPSD dependent GPS Handler" ON)
+  endif()
+  option(EIVE_CREATE_UNIQUE_OBSW_BIN "Append username to generated binary name"
+         ON)
 else()
-    option(EIVE_CREATE_UNIQUE_OBSW_BIN "Append username to generated binary name" OFF)
+  option(EIVE_CREATE_UNIQUE_OBSW_BIN "Append username to generated binary name"
+         OFF)
 endif()
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
@@ -57,60 +65,96 @@ option(EIVE_ADD_ETL_LIB "Add ETL library" ON)
 option(EIVE_ADD_JSON_LIB "Add JSON library" ON)
 
 if(EIVE_Q7S_EM)
-    set(OBSW_Q7S_EM 1 CACHE STRING "Q7S EM configuration")
+  set(OBSW_Q7S_EM
-    set(INIT_VAL 0)
+      1
+      CACHE STRING "Q7S EM configuration")
+  set(INIT_VAL 0)
 else()
-    set(OBSW_Q7S_EM 0 CACHE STRING "Q7S EM configuration")
+  set(OBSW_Q7S_EM
-    set(INIT_VAL 1)
+      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_MGT
-set(OBSW_ADD_BPX_BATTERY_HANDLER ${INIT_VAL} CACHE STRING "Add MGT module")
+    ${INIT_VAL}
-set(OBSW_ADD_STAR_TRACKER ${INIT_VAL} CACHE STRING "Add Startracker module")
+    CACHE STRING "Add MGT module")
-set(OBSW_ADD_SUN_SENSORS ${INIT_VAL} CACHE STRING "Add sun sensor module")
+set(OBSW_ADD_BPX_BATTERY_HANDLER
-set(OBSW_ADD_SUS_BOARD_ASS ${INIT_VAL} CACHE STRING "Add sun sensor board assembly")
+    ${INIT_VAL}
-set(OBSW_ADD_ACS_BOARD ${INIT_VAL} CACHE STRING "Add ACS board module")
+    CACHE STRING "Add MGT module")
-set(OBSW_ADD_ACS_HANDLERS ${INIT_VAL} CACHE STRING "Add ACS handlers")
+set(OBSW_ADD_STAR_TRACKER
-set(OBSW_ADD_RTD_DEVICES ${INIT_VAL} CACHE STRING "Add RTD devices")
+    ${INIT_VAL}
-set(OBSW_ADD_RAD_SENSORS ${INIT_VAL} CACHE STRING "Add Rad Sensor module")
+    CACHE STRING "Add Startracker module")
-set(OBSW_ADD_PL_PCDU ${INIT_VAL} CACHE STRING "Add Payload PCDU modukle")
+set(OBSW_ADD_SUN_SENSORS
-set(OBSW_ADD_SYRLINKS ${INIT_VAL} CACHE STRING "Add Syrlinks module")
+    ${INIT_VAL}
-set(OBSW_ADD_TMP_DEVICES ${INIT_VAL} CACHE STRING "Add TMP devices")
+    CACHE STRING "Add sun sensor module")
-set(OBSW_ADD_GOMSPACE_PCDU ${INIT_VAL} CACHE STRING "Add GomSpace PCDU modules")
+set(OBSW_ADD_SUS_BOARD_ASS
-set(OBSW_ADD_RW ${INIT_VAL} CACHE STRING "Add RW modules")
+    ${INIT_VAL}
+    CACHE STRING "Add sun sensor board assembly")
+set(OBSW_ADD_ACS_BOARD
+    ${INIT_VAL}
+    CACHE STRING "Add ACS board module")
+set(OBSW_ADD_ACS_HANDLERS
+    ${INIT_VAL}
+    CACHE STRING "Add ACS handlers")
+set(OBSW_ADD_RTD_DEVICES
+    ${INIT_VAL}
+    CACHE STRING "Add RTD devices")
+set(OBSW_ADD_RAD_SENSORS
+    ${INIT_VAL}
+    CACHE STRING "Add Rad Sensor module")
+set(OBSW_ADD_PL_PCDU
+    ${INIT_VAL}
+    CACHE STRING "Add Payload PCDU modukle")
+set(OBSW_ADD_SYRLINKS
+    ${INIT_VAL}
+    CACHE STRING "Add Syrlinks module")
+set(OBSW_ADD_TMP_DEVICES
+    ${INIT_VAL}
+    CACHE STRING "Add TMP devices")
+set(OBSW_ADD_GOMSPACE_PCDU
+    ${INIT_VAL}
+    CACHE STRING "Add GomSpace PCDU modules")
+set(OBSW_ADD_RW
+    ${INIT_VAL}
+    CACHE STRING "Add RW modules")
 
-################################################################################
+# ##############################################################################
 # Pre-Sources preparation
-################################################################################
+# ##############################################################################
 
 # Version handling
 set(GIT_VER_HANDLING_OK FALSE)
 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
-    determine_version_with_git("--exclude" "docker_*")
+  determine_version_with_git("--exclude" "docker_*")
-    set(GIT_INFO ${GIT_INFO} CACHE STRING "Version information retrieved with git describe")
+  set(GIT_INFO
-    if(GIT_INFO)
+      ${GIT_INFO}
-        set(GIT_INFO ${GIT_INFO} CACHE STRING "Version information retrieved with git describe")
+      CACHE STRING "Version information retrieved with git describe")
-        list(GET GIT_INFO 1 OBSW_VERSION_MAJOR)
+  if(GIT_INFO)
-        list(GET GIT_INFO 2 OBSW_VERSION_MINOR)
+    set(GIT_INFO
-        list(GET GIT_INFO 3 OBSW_VERSION_REVISION)
+        ${GIT_INFO}
-        list(GET GIT_INFO 4 OBSW_VERSION_CST_GIT_SHA1)
+        CACHE STRING "Version information retrieved with git describe")
-        if(NOT OBSW_VERSION_MAJOR)
+    list(GET GIT_INFO 1 OBSW_VERSION_MAJOR)
-            set(OBSW_VERSION_MAJOR ${OBSW_VERSION_MAJOR_IF_GIT_FAILS})
+    list(GET GIT_INFO 2 OBSW_VERSION_MINOR)
-        endif()
+    list(GET GIT_INFO 3 OBSW_VERSION_REVISION)
-        if(NOT OBSW_VERSION_MINOR)
+    list(GET GIT_INFO 4 OBSW_VERSION_CST_GIT_SHA1)
-            set(FSFW_SUBVERSION ${OBSW_VERSION_MINOR_IF_GIT_FAILS})
+    if(NOT OBSW_VERSION_MAJOR)
-        endif()
+      set(OBSW_VERSION_MAJOR ${OBSW_VERSION_MAJOR_IF_GIT_FAILS})
-        if(NOT OBSW_VERSION_REVISION)
+    endif()
-            set(FSFW_REVISION ${OBSW_VERSION_REVISION_IF_GIT_FAILS})
+    if(NOT OBSW_VERSION_MINOR)
-        endif()
+      set(FSFW_SUBVERSION ${OBSW_VERSION_MINOR_IF_GIT_FAILS})
-        set(GIT_VER_HANDLING_OK TRUE)
+    endif()
-   else()
+    if(NOT OBSW_VERSION_REVISION)
-        set(GIT_VER_HANDLING_OK FALSE)
+      set(FSFW_REVISION ${OBSW_VERSION_REVISION_IF_GIT_FAILS})
-   endif()
+    endif()
+    set(GIT_VER_HANDLING_OK TRUE)
+  else()
+    set(GIT_VER_HANDLING_OK FALSE)
+  endif()
 endif()
 if(NOT GIT_VER_HANDLING_OK)
-    set(OBSW_VERSION_MAJOR ${OBSW_VERSION_MAJOR_IF_GIT_FAILS})
+  set(OBSW_VERSION_MAJOR ${OBSW_VERSION_MAJOR_IF_GIT_FAILS})
-    set(OBSW_VERSION_MINOR ${OBSW_VERSION_MINOR_IF_GIT_FAILS})
+  set(OBSW_VERSION_MINOR ${OBSW_VERSION_MINOR_IF_GIT_FAILS})
-    set(OBSW_VERSION_REVISION ${OBSW_VERSION_REVISION_IF_GIT_FAILS})
+  set(OBSW_VERSION_REVISION ${OBSW_VERSION_REVISION_IF_GIT_FAILS})
 endif()
 
 # Set names and variables
@@ -156,119 +200,113 @@ set(EIVE_ADD_LINUX_FILES False)
 pre_source_hw_os_config()
 
 if(TGT_BSP)
+  set(LIBGPS_VERSION_MAJOR 3)
+  # I assume a newer version than 3.17 will be installed on other Linux board
+  # than the Q7S
+  set(LIBGPS_VERSION_MINOR 20)
+  if(TGT_BSP MATCHES "arm/q7s"
+     OR TGT_BSP MATCHES "arm/raspberrypi"
+     OR TGT_BSP MATCHES "arm/beagleboneblack"
+     OR TGT_BSP MATCHES "arm/egse"
+     OR TGT_BSP MATCHES "arm/te0720-1cfa")
+    find_library(${LIB_GPS} gps)
+    set(FSFW_CONFIG_PATH "linux/fsfwconfig")
+    if(NOT BUILD_Q7S_SIMPLE_MODE)
+      set(EIVE_ADD_LINUX_FILES TRUE)
+      set(ADD_CSP_LIB TRUE)
+      set(FSFW_HAL_ADD_LINUX ON)
+    endif()
+  endif()
+
+  if(TGT_BSP MATCHES "arm/raspberrypi")
+    # Used by configure file
+    set(RASPBERRY_PI ON)
+    set(FSFW_HAL_ADD_RASPBERRY_PI ON)
+  endif()
+
+  if(TGT_BSP MATCHES "arm/egse")
+    # Used by configure file
+    set(EGSE ON)
+    set(FSFW_HAL_LINUX_ADD_LIBGPIOD OFF)
+    set(OBSW_ADD_STAR_TRACKER 1)
+    set(OBSW_DEBUG_STARTRACKER 1)
+  endif()
+
+  if(TGT_BSP MATCHES "arm/beagleboneblack")
+    # Used by configure file
+    set(BEAGLEBONEBLACK ON)
+  endif()
+
+  if(TGT_BSP MATCHES "arm/q7s")
+    # Used by configure file
+    set(XIPHOS_Q7S ON)
     set(LIBGPS_VERSION_MAJOR 3)
-    # I assume a newer version than 3.17 will be installed on other Linux board than the Q7S
+    set(LIBGPS_VERSION_MINOR 17)
-    set(LIBGPS_VERSION_MINOR 20)
+  endif()
-    if(TGT_BSP MATCHES "arm/q7s" OR TGT_BSP MATCHES "arm/raspberrypi"
-        OR TGT_BSP MATCHES "arm/beagleboneblack" OR TGT_BSP MATCHES "arm/egse" 
-        OR TGT_BSP MATCHES "arm/te0720-1cfa"
-    )
-        find_library(${LIB_GPS} gps)
-        set(FSFW_CONFIG_PATH "linux/fsfwconfig")
-        if(NOT BUILD_Q7S_SIMPLE_MODE)
-            set(EIVE_ADD_LINUX_FILES TRUE)
-            set(ADD_CSP_LIB TRUE)
-            set(FSFW_HAL_ADD_LINUX ON)
-        endif()
-    endif()
-   
-    if(TGT_BSP MATCHES "arm/raspberrypi" )
-        # Used by configure file
-        set(RASPBERRY_PI ON)
-        set(FSFW_HAL_ADD_RASPBERRY_PI ON)
-    endif()
 
-    if(TGT_BSP MATCHES "arm/egse")
+  if(TGT_BSP MATCHES "arm/te0720-1cfa")
-        # Used by configure file
+    set(TE0720_1CFA ON)
-        set(EGSE ON)
+  endif()
-        set(FSFW_HAL_LINUX_ADD_LIBGPIOD OFF)
-        set(OBSW_ADD_STAR_TRACKER 1)
-        set(OBSW_DEBUG_STARTRACKER 1)
-    endif()
-    
-    if(TGT_BSP MATCHES "arm/beagleboneblack")
-        # Used by configure file
-        set(BEAGLEBONEBLACK ON)
-    endif()
-    
-    if(TGT_BSP MATCHES "arm/q7s")
-        # Used by configure file
-        set(XIPHOS_Q7S ON)
-        set(LIBGPS_VERSION_MAJOR 3)
-        set(LIBGPS_VERSION_MINOR 17)
-    endif()
-    
-    if(TGT_BSP MATCHES "arm/te0720-1cfa")
-        set(TE0720_1CFA ON)
-    endif()
 else()
-    # Required by FSFW library
+  # Required by FSFW library
-    set(FSFW_CONFIG_PATH "${BSP_PATH}/fsfwconfig")
+  set(FSFW_CONFIG_PATH "${BSP_PATH}/fsfwconfig")
 endif()
 
-
 # Configuration files
 configure_file(${COMMON_CONFIG_PATH}/commonConfig.h.in commonConfig.h)
 configure_file(${FSFW_CONFIG_PATH}/FSFWConfig.h.in FSFWConfig.h)
 configure_file(${BSP_PATH}/OBSWConfig.h.in OBSWConfig.h)
 if(TGT_BSP MATCHES "arm/q7s")
-    configure_file(${BSP_PATH}/boardconfig/q7sConfig.h.in q7sConfig.h)
+  configure_file(${BSP_PATH}/boardconfig/q7sConfig.h.in q7sConfig.h)
 elseif(TGT_BSP MATCHES "arm/raspberrypi" OR TGT_BSP MATCHES "arm/egse")
-    configure_file(${BSP_PATH}/boardconfig/rpiConfig.h.in rpiConfig.h)
+  configure_file(${BSP_PATH}/boardconfig/rpiConfig.h.in rpiConfig.h)
 endif()
 
 configure_file(${WATCHDOG_PATH}/watchdogConf.h.in watchdogConf.h)
 
 # Set common config path for FSFW
-set(FSFW_ADDITIONAL_INC_PATHS 
+set(FSFW_ADDITIONAL_INC_PATHS "${COMMON_PATH}/config"
-    "${COMMON_PATH}/config"
+                              ${CMAKE_CURRENT_BINARY_DIR})
-    ${CMAKE_CURRENT_BINARY_DIR}
-)
 
-################################################################################
+# ##############################################################################
 # Executable and Sources
-################################################################################
+# ##############################################################################
 
-#global compiler options need to be set before adding executables
+# global compiler options need to be set before adding executables
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    add_compile_options(
+  add_compile_options(
-        "-Wall"
+    "-Wall"
-        "-Wextra"
+    "-Wextra"
-        "-Wimplicit-fallthrough=1"
+    "-Wimplicit-fallthrough=1"
-        "-Wno-unused-parameter"
+    "-Wno-unused-parameter"
-        "-Wno-psabi"
+    "-Wno-psabi"
-        "-Wduplicated-cond" # check for duplicate conditions
+    "-Wduplicated-cond" # check for duplicate conditions
-        "-Wduplicated-branches" # check for duplicate branches
+    "-Wduplicated-branches" # check for duplicate branches
-        "-Wlogical-op" # Search for bitwise operations instead of logical
+    "-Wlogical-op" # Search for bitwise operations instead of logical
-        "-Wnull-dereference" # Search for NULL dereference
+    "-Wnull-dereference" # Search for NULL dereference
-        "-Wundef" # Warn if undefind marcos are used
+    "-Wundef" # Warn if undefind marcos are used
-        "-Wformat=2" # Format string problem detection
+    "-Wformat=2" # Format string problem detection
-        "-Wformat-overflow=2" # Formatting issues in printf
+    "-Wformat-overflow=2" # Formatting issues in printf
-        "-Wformat-truncation=2" # Formatting issues in printf
+    "-Wformat-truncation=2" # Formatting issues in printf
-        "-Wformat-security" # Search for dangerous printf operations
+    "-Wformat-security" # Search for dangerous printf operations
-        "-Wstrict-overflow=3" # Warn if integer overflows might happen
+    "-Wstrict-overflow=3" # Warn if integer overflows might happen
-        "-Warray-bounds=2" # Some array bounds violations will be found
+    "-Warray-bounds=2" # Some array bounds violations will be found
-        "-Wshift-overflow=2" # Search for bit left shift overflows (<c++14)
+    "-Wshift-overflow=2" # Search for bit left shift overflows (<c++14)
-        "-Wcast-qual" # Warn if the constness is cast away
+    "-Wcast-qual" # Warn if the constness is cast away
-        "-Wstringop-overflow=4"
+    "-Wstringop-overflow=4"
-        # -Wstack-protector # Emits a few false positives for low level access
+    # -Wstack-protector # Emits a few false positives for low level access
-        # -Wconversion # Creates many false positives
+    # -Wconversion # Creates many false positives -Warith-conversion # Use with
-        # -Warith-conversion # Use with Wconversion to find more implicit conversions
+    # Wconversion to find more implicit conversions -fanalyzer # Should be used
-        # -fanalyzer # Should be used to look through problems
+    # to look through problems
-    )
+  )
-    # Remove unused sections.
+  # Remove unused sections.
-    add_compile_options(
+  add_compile_options("-ffunction-sections" "-fdata-sections")
-        "-ffunction-sections"
-        "-fdata-sections"
-    )
 
-    # Removed unused sections.
+  # Removed unused sections.
-    add_link_options(
+  add_link_options("-Wl,--gc-sections")
-        "-Wl,--gc-sections"
-    )
 
 elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-	set(COMPILER_FLAGS "/permissive-")
+  set(COMPILER_FLAGS "/permissive-")
 endif()
 
 add_library(${LIB_EIVE_MISSION})
@@ -281,42 +319,39 @@ set_target_properties(${OBSW_NAME} PROPERTIES OUTPUT_NAME ${OBSW_BIN_NAME})
 
 # Watchdog
 if(TGT_BSP MATCHES "arm/q7s")
-    add_executable(${WATCHDOG_NAME})
+  add_executable(${WATCHDOG_NAME})
 else()
-    add_executable(${WATCHDOG_NAME} EXCLUDE_FROM_ALL)
+  add_executable(${WATCHDOG_NAME} EXCLUDE_FROM_ALL)
 endif()
 
-add_subdirectory(${WATCHDOG_PATH}) 
+add_subdirectory(${WATCHDOG_PATH})
-target_link_libraries(${WATCHDOG_NAME} PUBLIC
+target_link_libraries(${WATCHDOG_NAME} PUBLIC ${LIB_CXX_FS})
-    ${LIB_CXX_FS}
+target_include_directories(${WATCHDOG_NAME} PUBLIC ${CMAKE_BINARY_DIR})
-)
-target_include_directories(${WATCHDOG_NAME} PUBLIC
-    ${CMAKE_BINARY_DIR}
-)
 
 # unittests
 if(NOT TGT_BSP)
-    add_executable(${UNITTEST_NAME})
+  add_executable(${UNITTEST_NAME})
 else()
-    add_executable(${UNITTEST_NAME} EXCLUDE_FROM_ALL)
+  add_executable(${UNITTEST_NAME} EXCLUDE_FROM_ALL)
 endif()
 
 if(EIVE_ADD_ETL_LIB)
+
 endif()
 
 if(EIVE_ADD_JSON_LIB)
-    add_subdirectory(${LIB_JSON_PATH})
+  add_subdirectory(${LIB_JSON_PATH})
 endif()
- 
+
 add_subdirectory(thirdparty/rapidcsv)
 
 if(EIVE_ADD_LINUX_FILES)
-    add_subdirectory(${LIB_ARCSEC_PATH})
+  add_subdirectory(${LIB_ARCSEC_PATH})
-    add_subdirectory(${LINUX_PATH})
+  add_subdirectory(${LINUX_PATH})
 endif()
 add_subdirectory(${BSP_PATH})
 if(ADD_CSP_LIB)
-    add_subdirectory(${LIB_CSP_PATH})
+  add_subdirectory(${LIB_CSP_PATH})
 endif()
 
 add_subdirectory(${COMMON_PATH})
@@ -328,175 +363,144 @@ add_subdirectory(${TEST_PATH})
 
 add_subdirectory(${UNITTEST_PATH})
 
-# This should have already been downloaded by the FSFW
+# This should have already been downloaded by the FSFW Still include it to be
-# Still include it to be safe
+# safe
 find_package(etl ${FSFW_ETL_LIB_MAJOR_VERSION} CONFIG QUIET)
 # Not installed, so use FetchContent to download and provide etl
 if(NOT etl_FOUND)
-    message(STATUS
+  message(
-        "No ETL installation was found with find_package. Installing and providing "
+    STATUS
-        "etl with FindPackage"
+      "No ETL installation was found with find_package. Installing and providing "
-    )
+      "etl with FindPackage")
-    include(FetchContent)
+  include(FetchContent)
-    FetchContent_Declare(
+  FetchContent_Declare(
-        etl
+    etl
-        GIT_REPOSITORY https://github.com/ETLCPP/etl
+    GIT_REPOSITORY https://github.com/ETLCPP/etl
-        GIT_TAG        ${FSFW_ETL_LIB_VERSION}
+    GIT_TAG ${FSFW_ETL_LIB_VERSION})
-    )
+  list(APPEND FSFW_FETCH_CONTENT_TARGETS etl)
-    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/raspberrypi"))
+   AND NOT (TGT_BSP MATCHES "arm/q7s")
-    # Check whether the user has already installed Catch2 first
+   AND NOT (TGT_BSP MATCHES "arm/raspberrypi"))
-    find_package(Catch2 ${FSFW_CATCH2_LIB_MAJOR_VERSION} CONFIG QUIET)
+  # Check whether the user has already installed Catch2 first
-    # Not installed, so use FetchContent to download and provide Catch2
+  find_package(Catch2 ${FSFW_CATCH2_LIB_MAJOR_VERSION} CONFIG QUIET)
-    if(NOT Catch2_FOUND)
+  # Not installed, so use FetchContent to download and provide Catch2
-        message(STATUS "${MSG_PREFIX} Catch2 installation not found. Downloading Catch2 library with FetchContent")
+  if(NOT Catch2_FOUND)
-        include(FetchContent)
+    message(
+      STATUS
+        "${MSG_PREFIX} Catch2 installation not found. Downloading Catch2 library with FetchContent"
+    )
+    include(FetchContent)
 
-        FetchContent_Declare(
+    FetchContent_Declare(
-            Catch2
+      Catch2
-            GIT_REPOSITORY https://github.com/catchorg/Catch2.git
+      GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-            GIT_TAG        ${FSFW_CATCH2_LIB_VERSION}
+      GIT_TAG ${FSFW_CATCH2_LIB_VERSION})
-        )
 
-        list(APPEND FSFW_FETCH_CONTENT_TARGETS Catch2)
+    list(APPEND FSFW_FETCH_CONTENT_TARGETS Catch2)
-    endif()
+  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})
+  FetchContent_MakeAvailable(${FSFW_FETCH_CONTENT_TARGETS})
-    if(TARGET etl)
+  if(TARGET etl)
-        add_library(${LIB_ETL_TARGET} ALIAS etl)
+    add_library(${LIB_ETL_TARGET} ALIAS etl)
-    endif()
+  endif()
-    if(TARGET Catch2)
+  if(TARGET Catch2)
-        # Fixes regression -preview4, to be confirmed in later releases
+    # Fixes regression -preview4, to be confirmed in later releases Related
-        # Related GitHub issue: https://github.com/catchorg/Catch2/issues/2417
+    # GitHub issue: https://github.com/catchorg/Catch2/issues/2417
-        set_target_properties(Catch2 PROPERTIES DEBUG_POSTFIX "")
+    set_target_properties(Catch2 PROPERTIES DEBUG_POSTFIX "")
-        set_target_properties(Catch2 PROPERTIES EXCLUDE_FROM_ALL "true")
+    set_target_properties(Catch2 PROPERTIES EXCLUDE_FROM_ALL "true")
-        set_target_properties(Catch2WithMain PROPERTIES EXCLUDE_FROM_ALL "true")
+    set_target_properties(Catch2WithMain PROPERTIES EXCLUDE_FROM_ALL "true")
-    endif()
+  endif()
 endif()
 
-################################################################################
+# ##############################################################################
 # Post-Sources preparation
-################################################################################
+# ##############################################################################
 
 # Add libraries
-target_link_libraries(${LIB_EIVE_MISSION} PUBLIC
+target_link_libraries(${LIB_EIVE_MISSION}
-    ${LIB_FSFW_NAME}
+                      PUBLIC ${LIB_FSFW_NAME} ${LIB_LWGPS_NAME} ${LIB_OS_NAME})
-    ${LIB_LWGPS_NAME}
-    ${LIB_OS_NAME}
-)
 
-target_link_libraries(${OBSW_NAME} PRIVATE
+target_link_libraries(${OBSW_NAME} PRIVATE ${LIB_EIVE_MISSION})
-    ${LIB_EIVE_MISSION}
-)
 
 if(TGT_BSP MATCHES "arm/q7s")
-    target_link_libraries(${LIB_EIVE_MISSION} PUBLIC
+  target_link_libraries(${LIB_EIVE_MISSION} PUBLIC ${LIB_GPS} ${LIB_ARCSEC})
-        ${LIB_GPS}
-        ${LIB_ARCSEC}
-    )
 endif()
 
-target_link_libraries(${UNITTEST_NAME} PRIVATE
+target_link_libraries(${UNITTEST_NAME} PRIVATE Catch2 ${LIB_EIVE_MISSION}
-    Catch2
+                                               rapidcsv)
-    ${LIB_EIVE_MISSION}
-    rapidcsv
-)
 
 if(TGT_BSP MATCHES "arm/egse")
-    target_link_libraries(${OBSW_NAME} PRIVATE
+  target_link_libraries(${OBSW_NAME} PRIVATE ${LIB_ARCSEC})
-	    ${LIB_ARCSEC}
-	)
 endif()
 
 if(ADD_CSP_LIB)
-    target_link_libraries(${OBSW_NAME} PRIVATE
+  target_link_libraries(${OBSW_NAME} PRIVATE ${LIB_CSP_NAME})
-        ${LIB_CSP_NAME}
-    )
 endif()
 
-
 if(EIVE_ADD_ETL_LIB)
-    target_link_libraries(${LIB_EIVE_MISSION} PUBLIC
+  target_link_libraries(${LIB_EIVE_MISSION} PUBLIC ${LIB_ETL_TARGET})
-        ${LIB_ETL_TARGET}
-    )
 endif()
 
 if(EIVE_ADD_JSON_LIB)
-    target_link_libraries(${LIB_EIVE_MISSION} PUBLIC
+  target_link_libraries(${LIB_EIVE_MISSION} PUBLIC ${LIB_JSON_NAME})
-        ${LIB_JSON_NAME}
-    )
 endif()
 
-target_link_libraries(${LIB_EIVE_MISSION} PUBLIC
+target_link_libraries(${LIB_EIVE_MISSION} PUBLIC ${LIB_CXX_FS})
-    ${LIB_CXX_FS}
-)
 
 # Add include paths for all sources.
-target_include_directories(${LIB_EIVE_MISSION} PUBLIC
+target_include_directories(
-	${CMAKE_CURRENT_SOURCE_DIR}
+  ${LIB_EIVE_MISSION} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${FSFW_CONFIG_PATH}
-	${FSFW_CONFIG_PATH}
+                             ${CMAKE_CURRENT_BINARY_DIR} ${LIB_ARCSEC_PATH})
-	${CMAKE_CURRENT_BINARY_DIR}
-	${LIB_ARCSEC_PATH}
-)
 
 if(TGT_BSP MATCHES "arm/q7s" OR TGT_BSP MATCHES "arm/egse")
-    target_include_directories(${LIB_EIVE_MISSION} PUBLIC
+  target_include_directories(${LIB_EIVE_MISSION} PUBLIC ${ARCSEC_LIB_PATH})
-        ${ARCSEC_LIB_PATH}
-    )
 endif()
 
 if(CMAKE_VERBOSE)
-	message(STATUS "Warning flags: ${WARNING_FLAGS}")
+  message(STATUS "Warning flags: ${WARNING_FLAGS}")
 endif()
 
-
-
 if(CMAKE_CROSSCOMPILING)
-	include (HardwareOsPostConfig)
+  include(HardwareOsPostConfig)
-	post_source_hw_os_config()
+  post_source_hw_os_config()
 endif()
 
 if(NOT CMAKE_SIZE)
-	set(CMAKE_SIZE size)
+  set(CMAKE_SIZE size)
-	if(WIN32)
+  if(WIN32)
-		set(FILE_SUFFIX ".exe")
+    set(FILE_SUFFIX ".exe")
-	endif()
+  endif()
 endif()
 
 if(EIVE_BUILD_WATCHDOG)
-    set(TARGET_STRING "OBSW Watchdog")
+  set(TARGET_STRING "OBSW Watchdog")
 else()
-    if(TGT_BSP)
+  if(TGT_BSP)
-        set(TARGET_STRING "Target BSP: ${TGT_BSP}")
+    set(TARGET_STRING "Target BSP: ${TGT_BSP}")
-    else()
+  else()
-        set(TARGET_STRING "Target BSP: Hosted")
+    set(TARGET_STRING "Target BSP: Hosted")
-    endif()
+  endif()
 endif()
 
 install(TARGETS ${OBSW_NAME} RUNTIME DESTINATION bin)
 
-string(CONCAT POST_BUILD_COMMENT
+string(CONCAT POST_BUILD_COMMENT "Build directory: ${CMAKE_BINARY_DIR}\n"
-    "Build directory: ${CMAKE_BINARY_DIR}\n"
+              "Target OSAL: ${FSFW_OSAL}\n"
-    "Target OSAL: ${FSFW_OSAL}\n"
+              "Target Build Type: ${CMAKE_BUILD_TYPE}\n" "${TARGET_STRING}")
-    "Target Build Type: ${CMAKE_BUILD_TYPE}\n"
-    "${TARGET_STRING}"
-)
 
 add_custom_command(
-   TARGET ${OBSW_NAME}
+  TARGET ${OBSW_NAME}
-   POST_BUILD
+  POST_BUILD
-   COMMAND ${CMAKE_SIZE} ${OBSW_BIN_NAME}${FILE_SUFFIX}
+  COMMAND ${CMAKE_SIZE} ${OBSW_BIN_NAME}${FILE_SUFFIX}
-   COMMENT ${POST_BUILD_COMMENT}
+  COMMENT ${POST_BUILD_COMMENT})
-)
 
-include (BuildType)
+include(BuildType)
 set_build_type()

bsp_egse/CMakeLists.txt

@@ -1,7 +1,3 @@
-target_sources(${OBSW_NAME} PUBLIC
+target_sources(${OBSW_NAME} PUBLIC InitMission.cpp main.cpp ObjectFactory.cpp)
-	InitMission.cpp
-	main.cpp
-	ObjectFactory.cpp
-)
 
 add_subdirectory(boardconfig)

bsp_egse/boardconfig/CMakeLists.txt

@@ -1,7 +1,3 @@
-target_sources(${OBSW_NAME} PRIVATE
+target_sources(${OBSW_NAME} PRIVATE print.c)
-	print.c
-)
 
-target_include_directories(${OBSW_NAME} PUBLIC
+target_include_directories(${OBSW_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-	${CMAKE_CURRENT_SOURCE_DIR}
-)

bsp_hosted/CMakeLists.txt

@@ -1,8 +1,4 @@
-target_sources(${OBSW_NAME} PUBLIC
+target_sources(${OBSW_NAME} PUBLIC InitMission.cpp main.cpp ObjectFactory.cpp)
-	InitMission.cpp
-	main.cpp
-	ObjectFactory.cpp
-)
 
 add_subdirectory(fsfwconfig)
 add_subdirectory(boardconfig)

bsp_hosted/boardconfig/CMakeLists.txt

@@ -1,10 +1,3 @@
-target_sources(${OBSW_NAME} PRIVATE
+target_sources(${OBSW_NAME} PRIVATE print.c)
-	print.c
-)
-
-target_include_directories(${OBSW_NAME} PUBLIC
-	${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-
 
+target_include_directories(${OBSW_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

bsp_hosted/comIF/CMakeLists.txt

@@ -1,8 +1 @@
-target_sources(${TARGET_NAME} PUBLIC
+target_sources(${TARGET_NAME} PUBLIC ArduinoComIF.cpp ArduinoCookie.cpp)
-	ArduinoComIF.cpp
-	ArduinoCookie.cpp
-)
-
-
-
-

bsp_hosted/fsfwconfig/CMakeLists.txt

@@ -1,27 +1,15 @@
-target_sources(${OBSW_NAME} PRIVATE
+target_sources(${OBSW_NAME} PRIVATE ipc/MissionMessageTypes.cpp)
-	ipc/MissionMessageTypes.cpp
-)
 
-target_include_directories(${OBSW_NAME} PUBLIC
+target_include_directories(${OBSW_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-	${CMAKE_CURRENT_SOURCE_DIR}
-)
 
 # If a special translation file for object IDs exists, compile it.
 if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/objects/translateObjects.cpp")
-    target_sources(${OBSW_NAME} PRIVATE
+  target_sources(${OBSW_NAME} PRIVATE objects/translateObjects.cpp)
-        objects/translateObjects.cpp
+  target_sources(${UNITTEST_NAME} PRIVATE objects/translateObjects.cpp)
-    )
-    target_sources(${UNITTEST_NAME} PRIVATE
-        objects/translateObjects.cpp
-    )
 endif()
 
 # If a special translation file for events exists, compile it.
 if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/objects/translateObjects.cpp")
-    target_sources(${OBSW_NAME} PRIVATE
+  target_sources(${OBSW_NAME} PRIVATE events/translateEvents.cpp)
-        events/translateEvents.cpp
+  target_sources(${UNITTEST_NAME} PRIVATE events/translateEvents.cpp)
-    )
-    target_sources(${UNITTEST_NAME} PRIVATE
-        events/translateEvents.cpp
-    )
 endif()

bsp_linux_board/CMakeLists.txt

@@ -1,9 +1,5 @@
-target_sources(${OBSW_NAME} PUBLIC
+target_sources(${OBSW_NAME} PUBLIC InitMission.cpp main.cpp gpioInit.cpp
-	InitMission.cpp
+                                   ObjectFactory.cpp)
-	main.cpp
-	gpioInit.cpp
-	ObjectFactory.cpp
-)
 
 add_subdirectory(boardconfig)
 add_subdirectory(boardtest)

bsp_linux_board/boardconfig/CMakeLists.txt

@@ -1,7 +1,3 @@
-target_sources(${OBSW_NAME} PRIVATE
+target_sources(${OBSW_NAME} PRIVATE print.c)
-	print.c
-)
 
-target_include_directories(${OBSW_NAME} PUBLIC
+target_include_directories(${OBSW_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-	${CMAKE_CURRENT_SOURCE_DIR}
-)

bsp_linux_board/boardtest/CMakeLists.txt

@@ -1,6 +1 @@
-target_sources(${OBSW_NAME} PRIVATE
+target_sources(${OBSW_NAME} PRIVATE)
-)
-
-
-
-

bsp_q7s/CMakeLists.txt

@@ -1,20 +1,13 @@
-#simple mode
+# simple mode
 add_executable(${SIMPLE_OBSW_NAME} EXCLUDE_FROM_ALL)
 target_compile_definitions(${SIMPLE_OBSW_NAME} PRIVATE "Q7S_SIMPLE_MODE")
-target_sources(${SIMPLE_OBSW_NAME} PUBLIC
+target_sources(${SIMPLE_OBSW_NAME} PUBLIC main.cpp)
-	main.cpp
+# I think this is unintentional? (produces linker errors for stuff in /linux)
-)
+target_link_libraries(${SIMPLE_OBSW_NAME} PUBLIC ${LIB_FSFW_NAME})
-#I think this is unintentional? (produces linker errors for stuff in /linux)
-target_link_libraries(${SIMPLE_OBSW_NAME} PUBLIC
-    ${LIB_FSFW_NAME}
-)
 target_compile_definitions(${SIMPLE_OBSW_NAME} PRIVATE "Q7S_SIMPLE_MODE")
 add_subdirectory(simple)
 
-target_sources(${OBSW_NAME} PUBLIC
+target_sources(${OBSW_NAME} PUBLIC main.cpp obsw.cpp)
-	main.cpp
-    obsw.cpp
-)
 
 add_subdirectory(boardtest)
 
@@ -23,11 +16,9 @@ add_subdirectory(comIF)
 add_subdirectory(core)
 
 if(EIVE_Q7S_EM)
-    add_subdirectory(em)
+  add_subdirectory(em)
 else()
-    target_sources(${OBSW_NAME} PUBLIC
+  target_sources(${OBSW_NAME} PUBLIC fmObjectFactory.cpp)
-        fmObjectFactory.cpp
-    )
 endif()
 
 add_subdirectory(memory)

bsp_q7s/boardconfig/CMakeLists.txt

@@ -1,12 +1,5 @@
-target_sources(${OBSW_NAME} PRIVATE
+target_sources(${OBSW_NAME} PRIVATE print.c)
-	print.c
-)
 
-target_sources(${SIMPLE_OBSW_NAME} PRIVATE
+target_sources(${SIMPLE_OBSW_NAME} PRIVATE print.c)
-	print.c
-)
 
-
+target_include_directories(${OBSW_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-target_include_directories(${OBSW_NAME} PUBLIC
-	${CMAKE_CURRENT_SOURCE_DIR}
-)

bsp_q7s/boardconfig/busConf.h

@@ -4,6 +4,8 @@
 namespace q7s {
 
 static constexpr char SPI_DEFAULT_DEV[] = "/dev/spi-main";
+static constexpr uint32_t SPI_MAIN_BUS_LOCK_TIMEOUT = 50;
+
 static constexpr char SPI_RW_DEV[] = "/dev/spi-rw";
 
 static constexpr char I2C_DEFAULT_DEV[] = "/dev/i2c-eive";

bsp_q7s/boardtest/CMakeLists.txt

@@ -1,10 +1,5 @@
-target_sources(${OBSW_NAME} PRIVATE
+target_sources(${OBSW_NAME} PRIVATE FileSystemTest.cpp Q7STestTask.cpp)
-    FileSystemTest.cpp
-    Q7STestTask.cpp
-)
 
 if(EIVE_BUILD_Q7S_SIMPLE_MODE)
-    target_sources(${SIMPLE_OBSW_NAME} PRIVATE
+  target_sources(${SIMPLE_OBSW_NAME} PRIVATE FileSystemTest.cpp)
-        FileSystemTest.cpp
+endif()
-    )
-endif()

bsp_q7s/callbacks/CMakeLists.txt

@@ -1,6 +1,2 @@
-target_sources(${OBSW_NAME} PRIVATE
+target_sources(${OBSW_NAME} PRIVATE rwSpiCallback.cpp gnssCallback.cpp
-	rwSpiCallback.cpp
+                                    pcduSwitchCb.cpp q7sGpioCallbacks.cpp)
-	gnssCallback.cpp
-	pcduSwitchCb.cpp
-	q7sGpioCallbacks.cpp
-)

bsp_q7s/callbacks/rwSpiCallback.cpp

@@ -44,7 +44,8 @@ ReturnValue_t spiCallback(SpiComIF* comIf, SpiCookie* cookie, const uint8_t* sen
   GpioIF* gpioIF = comIf->getGpioInterface();
   MutexIF::TimeoutType timeoutType = MutexIF::TimeoutType::WAITING;
   uint32_t timeoutMs = 0;
-  MutexIF* mutex = comIf->getMutex(&timeoutType, &timeoutMs);
+  MutexIF* mutex = comIf->getCsMutex();
+  cookie->getMutexParams(timeoutType, timeoutMs);
   if (mutex == nullptr or gpioIF == nullptr) {
     sif::debug << "rwSpiCallback::spiCallback: Mutex or GPIO interface invalid" << std::endl;
     return HasReturnvaluesIF::RETURN_FAILED;

bsp_q7s/comIF/CMakeLists.txt

@@ -1,6 +1 @@
-target_sources(${OBSW_NAME} PRIVATE
+target_sources(${OBSW_NAME} PRIVATE)
-)
-
-
-
-

bsp_q7s/core/CMakeLists.txt

@@ -1,9 +1,4 @@
-target_sources(${OBSW_NAME} PRIVATE
+target_sources(${OBSW_NAME} PRIVATE CoreController.cpp InitMission.cpp
-    CoreController.cpp
+                                    ObjectFactory.cpp)
-    InitMission.cpp
-    ObjectFactory.cpp
-)
 
-target_sources(${SIMPLE_OBSW_NAME} PRIVATE
+target_sources(${SIMPLE_OBSW_NAME} PRIVATE InitMission.cpp)
-    InitMission.cpp
-)

bsp_q7s/core/CoreController.cpp

@@ -87,6 +87,7 @@ ReturnValue_t CoreController::initializeLocalDataPool(localpool::DataPool &local
   localDataPoolMap.emplace(core::TEMPERATURE, new PoolEntry<float>({0}));
   localDataPoolMap.emplace(core::PS_VOLTAGE, new PoolEntry<float>({0}));
   localDataPoolMap.emplace(core::PL_VOLTAGE, new PoolEntry<float>({0}));
+  poolManager.subscribeForPeriodicPacket(hkSet.getSid(), false, 10.0, false);
   return HasReturnvaluesIF::RETURN_OK;
 }
 

bsp_q7s/core/InitMission.cpp

@@ -1,5 +1,7 @@
 #include "bsp_q7s/core/InitMission.h"
 
+#include <fsfw/devicehandlers/DeviceCommunicationIF.h>
+
 #include <iostream>
 #include <vector>
 
@@ -13,6 +15,7 @@
 #include "fsfw/tasks/FixedTimeslotTaskIF.h"
 #include "fsfw/tasks/PeriodicTaskIF.h"
 #include "fsfw/tasks/TaskFactory.h"
+#include "mission/devices/devicedefinitions/Max31865Definitions.h"
 #include "mission/utility/InitMission.h"
 #include "pollingsequence/pollingSequenceFactory.h"
 
@@ -33,8 +36,16 @@ ObjectManagerIF* objectManager = nullptr;
 
 void initmission::initMission() {
   sif::info << "Building global objects.." << std::endl;
-  /* Instantiate global object manager and also create all objects */
+  try {
-  ObjectManager::instance()->setObjectFactoryFunction(ObjectFactory::produce, nullptr);
+    /* Instantiate global object manager and also create all objects */
+    ObjectManager::instance()->setObjectFactoryFunction(ObjectFactory::produce, nullptr);
+  } catch (const std::invalid_argument& e) {
+    sif::error << "initmission::initMission: Object Construction failed with an "
+                  "invalid argument: "
+               << e.what();
+    std::exit(1);
+  }
+
   sif::info << "Initializing all objects.." << std::endl;
   ObjectManager::instance()->initialize();
 
@@ -115,7 +126,7 @@ void initmission::initTasks() {
 
 #if OBSW_ADD_ACS_HANDLERS == 1
   PeriodicTaskIF* acsTask = factory->createPeriodicTask(
-      "ACS_CTRL", 45, PeriodicTaskIF::MINIMUM_STACK_SIZE * 2, 0.4, missedDeadlineFunc);
+      "ACS_TASK", 50, PeriodicTaskIF::MINIMUM_STACK_SIZE * 2, 0.4, missedDeadlineFunc);
   result = acsTask->addComponent(objects::GPS_CONTROLLER);
   if (result != HasReturnvaluesIF::RETURN_OK) {
     initmission::printAddObjectError("GPS_CTRL", objects::GPS_CONTROLLER);
@@ -124,6 +135,7 @@ void initmission::initTasks() {
 
   PeriodicTaskIF* sysTask = factory->createPeriodicTask(
       "SYS_TASK", 40, PeriodicTaskIF::MINIMUM_STACK_SIZE * 2, 0.4, missedDeadlineFunc);
+  static_cast<void>(sysTask);
 #if OBSW_ADD_ACS_HANDLERS == 1
   result = sysTask->addComponent(objects::ACS_BOARD_ASS);
   if (result != HasReturnvaluesIF::RETURN_OK) {
@@ -136,19 +148,49 @@ void initmission::initTasks() {
     initmission::printAddObjectError("RW_ASS", objects::RW_ASS);
   }
 #endif
-
 #if OBSW_ADD_SUS_BOARD_ASS == 1
   result = sysTask->addComponent(objects::SUS_BOARD_ASS);
   if (result != HasReturnvaluesIF::RETURN_OK) {
     initmission::printAddObjectError("SUS_BOARD_ASS", objects::SUS_BOARD_ASS);
   }
 #endif
-#if OBSW_ADD_RTD_DEVICES == 1
+
-  result = sysTask->addComponent(objects::TCS_BOARD_ASS);
+  PeriodicTaskIF* tcsPollingTask = factory->createPeriodicTask(
+      "TCS_POLLING_TASK", 70, PeriodicTaskIF::MINIMUM_STACK_SIZE * 2, 0.5, missedDeadlineFunc);
+  result = tcsPollingTask->addComponent(objects::SPI_RTD_COM_IF);
   if (result != HasReturnvaluesIF::RETURN_OK) {
-    initmission::printAddObjectError("TCS_BOARD_ASS", objects::TCS_BOARD_ASS);
+    initmission::printAddObjectError("SPI_RTD_POLLING", objects::SPI_RTD_COM_IF);
   }
-#endif /* OBSW_ADD_RTD_DEVICES == 1 */
+  PeriodicTaskIF* tcsTask = factory->createPeriodicTask(
+      "TCS_TASK", 45, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.8, missedDeadlineFunc);
+  std::array<object_id_t, EiveMax31855::NUM_RTDS> rtdIds = {
+      objects::RTD_0_IC3_PLOC_HEATSPREADER,
+      objects::RTD_1_IC4_PLOC_MISSIONBOARD,
+      objects::RTD_2_IC5_4K_CAMERA,
+      objects::RTD_3_IC6_DAC_HEATSPREADER,
+      objects::RTD_4_IC7_STARTRACKER,
+      objects::RTD_5_IC8_RW1_MX_MY,
+      objects::RTD_6_IC9_DRO,
+      objects::RTD_7_IC10_SCEX,
+      objects::RTD_8_IC11_X8,
+      objects::RTD_9_IC12_HPA,
+      objects::RTD_10_IC13_PL_TX,
+      objects::RTD_11_IC14_MPA,
+      objects::RTD_12_IC15_ACU,
+      objects::RTD_13_IC16_PLPCDU_HEATSPREADER,
+      objects::RTD_14_IC17_TCS_BOARD,
+      objects::RTD_15_IC18_IMTQ,
+  };
+#if OBSW_ADD_RTD_DEVICES == 1
+  tcsTask->addComponent(objects::TCS_BOARD_ASS);
+  for (const auto& rtd : rtdIds) {
+    tcsTask->addComponent(rtd, DeviceHandlerIF::PERFORM_OPERATION);
+    tcsTask->addComponent(rtd, DeviceHandlerIF::SEND_WRITE);
+    tcsTask->addComponent(rtd, DeviceHandlerIF::GET_WRITE);
+    tcsTask->addComponent(rtd, DeviceHandlerIF::SEND_READ);
+    tcsTask->addComponent(rtd, DeviceHandlerIF::GET_READ);
+  }
+#endif /* OBSW_ADD_RTD_DEVICES */
 
   // FS task, task interval does not matter because it runs in permanent loop, priority low
   // because it is a non-essential background task
@@ -245,12 +287,10 @@ void initmission::initTasks() {
   strHelperTask->startTask();
 #endif /* OBSW_ADD_STAR_TRACKER == 1 */
 
-#if OBSW_ADD_ACS_HANDLERS == 1
   acsTask->startTask();
-#endif
-#if OBSW_ADD_RTD_DEVICES == 1
   sysTask->startTask();
-#endif
+  tcsPollingTask->startTask();
+  tcsTask->startTask();
 #if OBSW_ADD_PLOC_SUPERVISOR == 1
   supvHelperTask->startTask();
 #endif /* OBSW_ADD_PLOC_SUPERVISOR == 1 */
@@ -396,6 +436,10 @@ void initmission::createPusTasks(TaskFactory& factory,
   if (result != HasReturnvaluesIF::RETURN_OK) {
     initmission::printAddObjectError("PUS_200", objects::PUS_SERVICE_200_MODE_MGMT);
   }
+  result = pusMedPrio->addComponent(objects::PUS_SERVICE_201_HEALTH);
+  if (result != HasReturnvaluesIF::RETURN_OK) {
+    initmission::printAddObjectError("PUS_201", objects::PUS_SERVICE_201_HEALTH);
+  }
   result = pusMedPrio->addComponent(objects::PUS_SERVICE_20_PARAMETERS);
   if (result != HasReturnvaluesIF::RETURN_OK) {
     initmission::printAddObjectError("PUS_20", objects::PUS_SERVICE_20_PARAMETERS);

bsp_q7s/core/InitMission.h

@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include "fsfw/tasks/Typedef.h"
+#include "fsfw/tasks/definitions.h"
 
 class PeriodicTaskIF;
 class TaskFactory;

bsp_q7s/core/ObjectFactory.cpp

@@ -214,6 +214,7 @@ void ObjectFactory::createRadSensorComponent(LinuxLibgpioIF* gpioComIF) {
   SpiCookie* spiCookieRadSensor =
       new SpiCookie(addresses::RAD_SENSOR, gpioIds::CS_RAD_SENSOR, RAD_SENSOR::READ_SIZE,
                     spi::DEFAULT_MAX_1227_MODE, spi::DEFAULT_MAX_1227_SPEED);
+  spiCookieRadSensor->setMutexParams(MutexIF::TimeoutType::WAITING, spi::RAD_SENSOR_CS_TIMEOUT);
   auto radSensor = new RadiationSensorHandler(objects::RAD_SENSOR, objects::SPI_MAIN_COM_IF,
                                               spiCookieRadSensor, gpioComIF);
   static_cast<void>(radSensor);
@@ -481,7 +482,8 @@ void ObjectFactory::createAcsBoardComponents(LinuxLibgpioIF* gpioComIF, UartComI
 #endif /* OBSW_ADD_ACS_HANDLERS == 1 */
 }
 
-void ObjectFactory::createHeaterComponents() {
+void ObjectFactory::createHeaterComponents(GpioIF* gpioIF, PowerSwitchIF* pwrSwitcher,
+                                           HealthTableIF* healthTable) {
   using namespace gpio;
   GpioCookie* heaterGpiosCookie = new GpioCookie;
   GpiodRegularByLineName* gpio = nullptr;
@@ -522,8 +524,21 @@ void ObjectFactory::createHeaterComponents() {
                                     Levels::LOW);
   heaterGpiosCookie->addGpio(gpioIds::HEATER_7, gpio);
 
-  new HeaterHandler(objects::HEATER_HANDLER, objects::GPIO_IF, heaterGpiosCookie,
+  gpioIF->addGpios(heaterGpiosCookie);
-                    objects::PCDU_HANDLER, pcdu::Switches::PDU2_CH3_TCS_BOARD_HEATER_IN_8V);
+
+  HeaterHelper helper({{
+      {new HealthDevice(objects::HEATER_0_PLOC_PROC_BRD, MessageQueueIF::NO_QUEUE),
+       gpioIds::HEATER_0},
+      {new HealthDevice(objects::HEATER_1_PCDU_BRD, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_1},
+      {new HealthDevice(objects::HEATER_2_ACS_BRD, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_2},
+      {new HealthDevice(objects::HEATER_3_OBC_BRD, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_3},
+      {new HealthDevice(objects::HEATER_4_CAMERA, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_4},
+      {new HealthDevice(objects::HEATER_5_STR, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_5},
+      {new HealthDevice(objects::HEATER_6_DRO, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_6},
+      {new HealthDevice(objects::HEATER_7_HPA, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_7},
+  }});
+  new HeaterHandler(objects::HEATER_HANDLER, gpioIF, helper, pwrSwitcher,
+                    pcdu::Switches::PDU2_CH3_TCS_BOARD_HEATER_IN_8V);
 }
 
 void ObjectFactory::createSolarArrayDeploymentComponents() {

bsp_q7s/core/ObjectFactory.h

@@ -10,7 +10,9 @@ class UartComIF;
 class SpiComIF;
 class I2cComIF;
 class PowerSwitchIF;
+class HealthTableIF;
 class AcsBoardAssembly;
+class GpioIF;
 
 namespace ObjectFactory {
 
@@ -27,7 +29,7 @@ void createTmpComponents();
 void createRadSensorComponent(LinuxLibgpioIF* gpioComIF);
 void createAcsBoardComponents(LinuxLibgpioIF* gpioComIF, UartComIF* uartComIF,
                               PowerSwitchIF* pwrSwitcher);
-void createHeaterComponents();
+void createHeaterComponents(GpioIF* gpioIF, PowerSwitchIF* pwrSwitcher, HealthTableIF* healthTable);
 void createImtqComponents(PowerSwitchIF* pwrSwitcher);
 void createBpxBatteryComponent();
 void createStrComponents(PowerSwitchIF* pwrSwitcher);

bsp_q7s/em/CMakeLists.txt

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

bsp_q7s/em/emObjectFactory.cpp

@@ -1,3 +1,5 @@
+#include <fsfw/health/HealthTableIF.h>
+
 #include "OBSWConfig.h"
 #include "bsp_q7s/core/CoreController.h"
 #include "bsp_q7s/core/ObjectFactory.h"
@@ -11,7 +13,8 @@
 
 void ObjectFactory::produce(void* args) {
   ObjectFactory::setStatics();
-  ObjectFactory::produceGenericObjects();
+  HealthTableIF* healthTable = nullptr;
+  ObjectFactory::produceGenericObjects(&healthTable);
 
   LinuxLibgpioIF* gpioComIF = nullptr;
   UartComIF* uartComIF = nullptr;
@@ -31,7 +34,7 @@ void ObjectFactory::produce(void* args) {
 #if OBSW_ADD_ACS_BOARD == 1
   createAcsBoardComponents(gpioComIF, uartComIF, pwrSwitcher);
 #endif
-  createHeaterComponents();
+  createHeaterComponents(gpioComIF, pwrSwitcher, healthTable);
   createSolarArrayDeploymentComponents();
   createPlPcduComponents(gpioComIF, spiMainComIF, pwrSwitcher);
 #if OBSW_ADD_SYRLINKS == 1

bsp_q7s/fmObjectFactory.cpp

@@ -11,7 +11,8 @@
 
 void ObjectFactory::produce(void* args) {
   ObjectFactory::setStatics();
-  ObjectFactory::produceGenericObjects();
+  HealthTableIF* healthTable = nullptr;
+  ObjectFactory::produceGenericObjects(&healthTable);
 
   LinuxLibgpioIF* gpioComIF = nullptr;
   UartComIF* uartComIF = nullptr;
@@ -31,13 +32,13 @@ void ObjectFactory::produce(void* args) {
 #if OBSW_ADD_ACS_BOARD == 1
   createAcsBoardComponents(gpioComIF, uartComIF, pwrSwitcher);
 #endif
-  createHeaterComponents();
+  createHeaterComponents(gpioComIF, pwrSwitcher, healthTable);
   createSolarArrayDeploymentComponents();
   createPlPcduComponents(gpioComIF, spiMainComIF, pwrSwitcher);
 #if OBSW_ADD_SYRLINKS == 1
   createSyrlinksComponents(pwrSwitcher);
 #endif /* OBSW_ADD_SYRLINKS == 1 */
-  createRtdComponents(q7s::SPI_DEFAULT_DEV, gpioComIF, pwrSwitcher);
+  createRtdComponents(q7s::SPI_DEFAULT_DEV, gpioComIF, pwrSwitcher, spiMainComIF);
   createPayloadComponents(gpioComIF);
 
 #if OBSW_ADD_MGT == 1

bsp_q7s/memory/CMakeLists.txt

@@ -1,6 +1,2 @@
-target_sources(${OBSW_NAME} PRIVATE
+target_sources(${OBSW_NAME} PRIVATE FileSystemHandler.cpp SdCardManager.cpp
-    FileSystemHandler.cpp
+                                    scratchApi.cpp FilesystemHelper.cpp)
-    SdCardManager.cpp
-    scratchApi.cpp
-    FilesystemHelper.cpp
-)

bsp_q7s/obsw.cpp

@@ -8,14 +8,19 @@
 #include "core/InitMission.h"
 #include "fsfw/tasks/TaskFactory.h"
 #include "fsfw/version.h"
+#include "q7sConfig.h"
 #include "watchdog/definitions.h"
 
 static int OBSW_ALREADY_RUNNING = -2;
-
+#if OBSW_Q7S_EM == 0
+static const char* DEV_STRING = "Xiphos Q7S FM";
+#else
+static const char* DEV_STRING = "Xiphos Q7S EM";
+#endif
 int obsw::obsw() {
   using namespace fsfw;
   std::cout << "-- EIVE OBSW --" << std::endl;
-  std::cout << "-- Compiled for Linux (Xiphos Q7S) --" << std::endl;
+  std::cout << "-- Compiled for Linux (" << DEV_STRING << ") --" << std::endl;
   std::cout << "-- OBSW v" << common::OBSW_VERSION << " | FSFW v" << fsfw::FSFW_VERSION << " --"
             << std::endl;
   std::cout << "-- " << __DATE__ << " " << __TIME__ << " --" << std::endl;

bsp_q7s/simple/CMakeLists.txt

@@ -1,3 +1 @@
-target_sources(${SIMPLE_OBSW_NAME} PRIVATE
+target_sources(${SIMPLE_OBSW_NAME} PRIVATE simple.cpp)
-    simple.cpp
-)

bsp_q7s/xadc/CMakeLists.txt

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

common/config/CMakeLists.txt

@@ -1,7 +1,3 @@
-target_include_directories(${OBSW_NAME} PRIVATE
+target_include_directories(${OBSW_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
-    ${CMAKE_CURRENT_SOURCE_DIR}
-)
 
-target_sources(${OBSW_NAME} PRIVATE
+target_sources(${OBSW_NAME} PRIVATE commonConfig.cpp)
-    commonConfig.cpp
-)

common/config/ccsdsConfig.h

@@ -2,14 +2,7 @@
 #define COMMON_CONFIG_CCSDSCONFIG_H_
 
 namespace ccsds {
-enum {
+enum { VC0, VC1, VC2, VC3 };
-    VC0,
-    VC1,
-    VC2,
-    VC3
-};
 }
 
-
-
 #endif /* COMMON_CONFIG_CCSDSCONFIG_H_ */

common/config/commonClassIds.h

@@ -2,39 +2,40 @@
 #define COMMON_CONFIG_COMMONCLASSIDS_H_
 
 #include <fsfw/returnvalues/FwClassIds.h>
+
 #include <cstdint>
 
 namespace CLASS_ID {
-enum commonClassIds: uint8_t {
+enum commonClassIds : uint8_t {
-	COMMON_CLASS_ID_START = FW_CLASS_ID_COUNT,
+  COMMON_CLASS_ID_START = FW_CLASS_ID_COUNT,
-	PCDU_HANDLER, //PCDU
+  PCDU_HANDLER,             // PCDU
-	HEATER_HANDLER, //HEATER
+  HEATER_HANDLER,           // HEATER
-	SYRLINKS_HANDLER, //SYRLINKS
+  SYRLINKS_HANDLER,         // SYRLINKS
-	IMTQ_HANDLER, //IMTQ
+  IMTQ_HANDLER,             // IMTQ
-	RW_HANDLER, //RWHA
+  RW_HANDLER,               // RWHA
-	STR_HANDLER, //STRH
+  STR_HANDLER,              // STRH
-	DWLPWRON_CMD, //DWLPWRON
+  DWLPWRON_CMD,             // DWLPWRON
-	MPSOC_TM, //MPTM
+  MPSOC_TM,                 // MPTM
-	PLOC_SUPERVISOR_HANDLER, //PLSV
+  PLOC_SUPERVISOR_HANDLER,  // PLSV
-	PLOC_SUPV_HELPER, //PLSPVhLP
+  PLOC_SUPV_HELPER,         // PLSPVhLP
-	SUS_HANDLER, //SUSS
+  SUS_HANDLER,              // SUSS
-	CCSDS_IP_CORE_BRIDGE, //IPCI
+  CCSDS_IP_CORE_BRIDGE,     // IPCI
-	PTME, //PTME
+  PTME,                     // PTME
-	PLOC_UPDATER, //PLUD
+  PLOC_UPDATER,             // PLUD
-	STR_HELPER, //STRHLP
+  STR_HELPER,               // STRHLP
-    GOM_SPACE_HANDLER, //GOMS
+  GOM_SPACE_HANDLER,        // GOMS
-    PLOC_MEMORY_DUMPER, //PLMEMDUMP
+  PLOC_MEMORY_DUMPER,       // PLMEMDUMP
-    PDEC_HANDLER, //PDEC
+  PDEC_HANDLER,             // PDEC
-    CCSDS_HANDLER, //CCSDS
+  CCSDS_HANDLER,            // CCSDS
-    RATE_SETTER, //RS
+  RATE_SETTER,              // RS
-    ARCSEC_JSON_BASE, //JSONBASE
+  ARCSEC_JSON_BASE,         // JSONBASE
-    NVM_PARAM_BASE, //NVMB
+  NVM_PARAM_BASE,           // NVMB
-    FILE_SYSTEM_HELPER, //FSHLP
+  FILE_SYSTEM_HELPER,       // FSHLP
-    PLOC_MPSOC_HELPER, // PLMPHLP
+  PLOC_MPSOC_HELPER,        // PLMPHLP
-	SA_DEPL_HANDLER, //SADPL
+  SA_DEPL_HANDLER,          // SADPL
-	MPSOC_RETURN_VALUES_IF, //MPSOCRTVIF
+  MPSOC_RETURN_VALUES_IF,   // MPSOCRTVIF
-	SUPV_RETURN_VALUES_IF, //SPVRTVIF
+  SUPV_RETURN_VALUES_IF,    // SPVRTVIF
-	COMMON_CLASS_ID_END // [EXPORT] : [END]
+  COMMON_CLASS_ID_END       // [EXPORT] : [END]
 };
 
 }

common/config/commonConfig.cpp

@@ -1,6 +1,8 @@
 #include "commonConfig.h"
-#include "tmtc/apid.h"
-#include "fsfw/tmtcpacket/SpacePacket.h"
 
-const Version common::OBSW_VERSION { OBSW_VERSION_MAJOR, OBSW_VERSION_MINOR, OBSW_VERSION_REVISION, OBSW_VERSION_CST_GIT_SHA1 };
+#include "fsfw/tmtcpacket/SpacePacket.h"
+#include "tmtc/apid.h"
+
+const fsfw::Version common::OBSW_VERSION{OBSW_VERSION_MAJOR, OBSW_VERSION_MINOR,
+                                         OBSW_VERSION_REVISION, OBSW_VERSION_CST_GIT_SHA1};
 const uint16_t common::PUS_PACKET_ID = spacepacket::getTcSpacePacketIdFromApid(apid::EIVE_OBSW);

common/config/commonConfig.h.in

@@ -33,7 +33,7 @@ static constexpr uint8_t OBSW_VERSION_REVISION = @OBSW_VERSION_REVISION@;
 // CST: Commits since tag
 static const char OBSW_VERSION_CST_GIT_SHA1[] = "@OBSW_VERSION_CST_GIT_SHA1@";
 
-extern const Version OBSW_VERSION;
+extern const fsfw::Version OBSW_VERSION;
 
 extern const uint16_t PUS_PACKET_ID;
 

common/config/commonObjects.h

@@ -4,113 +4,125 @@
 #include <cstdint>
 
 namespace objects {
-enum commonObjects: uint32_t {
+enum commonObjects : uint32_t {
-	/* First Byte 0x50-0x52 reserved for PUS Services **/
+  /* First Byte 0x50-0x52 reserved for PUS Services **/
-    CCSDS_PACKET_DISTRIBUTOR = 0x50000100,
+  CCSDS_PACKET_DISTRIBUTOR = 0x50000100,
-    PUS_PACKET_DISTRIBUTOR = 0x50000200,
+  PUS_PACKET_DISTRIBUTOR = 0x50000200,
-    TMTC_BRIDGE = 0x50000300,
+  TMTC_BRIDGE = 0x50000300,
-    TMTC_POLLING_TASK = 0x50000400,
+  TMTC_POLLING_TASK = 0x50000400,
-    FILE_SYSTEM_HANDLER = 0x50000500,
+  FILE_SYSTEM_HANDLER = 0x50000500,
-    SDC_MANAGER = 0x50000550,
+  SDC_MANAGER = 0x50000550,
-    PTME = 0x50000600,
+  PTME = 0x50000600,
-    PDEC_HANDLER = 0x50000700,
+  PDEC_HANDLER = 0x50000700,
-    CCSDS_HANDLER = 0x50000800,
+  CCSDS_HANDLER = 0x50000800,
 
-    /* 0x43 ('C') for Controllers */
+  /* 0x43 ('C') for Controllers */
-    THERMAL_CONTROLLER = 0x43400001,
+  THERMAL_CONTROLLER = 0x43400001,
-    ACS_CONTROLLER = 0x43100002,
+  ACS_CONTROLLER = 0x43100002,
-    CORE_CONTROLLER = 0x43000003,
+  CORE_CONTROLLER = 0x43000003,
 
-    /* 0x44 ('D') for device handlers */
+  /* 0x44 ('D') for device handlers */
-    P60DOCK_HANDLER = 0x44250000,
+  MGM_0_LIS3_HANDLER = 0x44120006,
-    PDU1_HANDLER = 0x44250001,
+  MGM_1_RM3100_HANDLER = 0x44120107,
-    PDU2_HANDLER = 0x44250002,
+  MGM_2_LIS3_HANDLER = 0x44120208,
-    ACU_HANDLER = 0x44250003,
+  MGM_3_RM3100_HANDLER = 0x44120309,
-    BPX_BATT_HANDLER = 0x44260000,
+  GYRO_0_ADIS_HANDLER = 0x44120010,
-    TMP1075_HANDLER_1 = 0x44420004,
+  GYRO_1_L3G_HANDLER = 0x44120111,
-    TMP1075_HANDLER_2 = 0x44420005,
+  GYRO_2_ADIS_HANDLER = 0x44120212,
-    MGM_0_LIS3_HANDLER = 0x44120006,
+  GYRO_3_L3G_HANDLER = 0x44120313,
-    MGM_1_RM3100_HANDLER = 0x44120107,
+  RW1 = 0x44120047,
-    MGM_2_LIS3_HANDLER = 0x44120208,
+  RW2 = 0x44120148,
-    MGM_3_RM3100_HANDLER = 0x44120309,
+  RW3 = 0x44120249,
-    GYRO_0_ADIS_HANDLER = 0x44120010,
+  RW4 = 0x44120350,
-    GYRO_1_L3G_HANDLER = 0x44120111,
+  STAR_TRACKER = 0x44130001,
-    GYRO_2_ADIS_HANDLER = 0x44120212,
+  GPS_CONTROLLER = 0x44130045,
-    GYRO_3_L3G_HANDLER = 0x44120313,
-    PLPCDU_HANDLER = 0x44300000,
 
-    IMTQ_HANDLER = 0x44140014,
+  IMTQ_HANDLER = 0x44140014,
-    PLOC_MPSOC_HANDLER = 0x44330015,
+  TMP1075_HANDLER_1 = 0x44420004,
-    PLOC_SUPERVISOR_HANDLER = 0x44330016,
+  TMP1075_HANDLER_2 = 0x44420005,
-    PLOC_SUPERVISOR_HELPER = 0x44330017,
+  PCDU_HANDLER = 0x442000A1,
+  P60DOCK_HANDLER = 0x44250000,
+  PDU1_HANDLER = 0x44250001,
+  PDU2_HANDLER = 0x44250002,
+  ACU_HANDLER = 0x44250003,
+  BPX_BATT_HANDLER = 0x44260000,
+  PLPCDU_HANDLER = 0x44300000,
+  RAD_SENSOR = 0x443200A5,
+  PLOC_UPDATER = 0x44330000,
+  PLOC_MEMORY_DUMPER = 0x44330001,
+  STR_HELPER = 0x44330002,
+  PLOC_MPSOC_HELPER = 0x44330003,
+  AXI_PTME_CONFIG = 0x44330004,
+  PTME_CONFIG = 0x44330005,
+  PLOC_MPSOC_HANDLER = 0x44330015,
+  PLOC_SUPERVISOR_HANDLER = 0x44330016,
+  PLOC_SUPERVISOR_HELPER = 0x44330017,
+  SOLAR_ARRAY_DEPL_HANDLER = 0x444100A2,
+  HEATER_HANDLER = 0x444100A4,
 
-    /**
+  /**
-     * Not yet specified which pt1000 will measure which device/location in the satellite.
+   * Not yet specified which pt1000 will measure which device/location in the satellite.
-     * Therefore object ids are named according to the IC naming of the RTDs in the schematic.
+   * Therefore object ids are named according to the IC naming of the RTDs in the schematic.
-     */
+   */
-    RTD_0_IC3_PLOC_HEATSPREADER = 0x44420016,
+  RTD_0_IC3_PLOC_HEATSPREADER = 0x44420016,
-    RTD_1_IC4_PLOC_MISSIONBOARD = 0x44420017,
+  RTD_1_IC4_PLOC_MISSIONBOARD = 0x44420017,
-    RTD_2_IC5_4K_CAMERA = 0x44420018,
+  RTD_2_IC5_4K_CAMERA = 0x44420018,
-    RTD_3_IC6_DAC_HEATSPREADER = 0x44420019,
+  RTD_3_IC6_DAC_HEATSPREADER = 0x44420019,
-    RTD_4_IC7_STARTRACKER = 0x44420020,
+  RTD_4_IC7_STARTRACKER = 0x44420020,
-    RTD_5_IC8_RW1_MX_MY = 0x44420021,
+  RTD_5_IC8_RW1_MX_MY = 0x44420021,
-    RTD_6_IC9_DRO = 0x44420022,
+  RTD_6_IC9_DRO = 0x44420022,
-    RTD_7_IC10_SCEX = 0x44420023,
+  RTD_7_IC10_SCEX = 0x44420023,
-    RTD_8_IC11_X8 = 0x44420024,
+  RTD_8_IC11_X8 = 0x44420024,
-    RTD_9_IC12_HPA = 0x44420025,
+  RTD_9_IC12_HPA = 0x44420025,
-    RTD_10_IC13_PL_TX = 0x44420026,
+  RTD_10_IC13_PL_TX = 0x44420026,
-    RTD_11_IC14_MPA = 0x44420027,
+  RTD_11_IC14_MPA = 0x44420027,
-    RTD_12_IC15_ACU = 0x44420028,
+  RTD_12_IC15_ACU = 0x44420028,
-    RTD_13_IC16_PLPCDU_HEATSPREADER = 0x44420029,
+  RTD_13_IC16_PLPCDU_HEATSPREADER = 0x44420029,
-    RTD_14_IC17_TCS_BOARD = 0x44420030,
+  RTD_14_IC17_TCS_BOARD = 0x44420030,
-    RTD_15_IC18_IMTQ = 0x44420031,
+  RTD_15_IC18_IMTQ = 0x44420031,
 
-    // Name convention for SUS devices
+  // Name convention for SUS devices
-    // SUS_<IDX>_<N/R>_LOC_X<F/M/B>Y<F/M/B>Z<F/M/B>_PT_<DIR><F/B>
+  // SUS_<IDX>_<N/R>_LOC_X<F/M/B>Y<F/M/B>Z<F/M/B>_PT_<DIR><F/B>
-    // LOC: Location
+  // LOC: Location
-    // PT: Pointing
+  // PT: Pointing
-    // N/R: Nominal/Redundant
+  // N/R: Nominal/Redundant
-    // F/M/B: Forward/Middle/Backwards
+  // F/M/B: Forward/Middle/Backwards
-    SUS_0_N_LOC_XFYFZM_PT_XF = 0x44120032,
+  SUS_0_N_LOC_XFYFZM_PT_XF = 0x44120032,
-    SUS_6_R_LOC_XFYBZM_PT_XF = 0x44120038,
+  SUS_6_R_LOC_XFYBZM_PT_XF = 0x44120038,
 
-    SUS_1_N_LOC_XBYFZM_PT_XB = 0x44120033,
+  SUS_1_N_LOC_XBYFZM_PT_XB = 0x44120033,
-    SUS_7_R_LOC_XBYBZM_PT_XB = 0x44120039,
+  SUS_7_R_LOC_XBYBZM_PT_XB = 0x44120039,
 
-    SUS_2_N_LOC_XFYBZB_PT_YB = 0x44120034,
+  SUS_2_N_LOC_XFYBZB_PT_YB = 0x44120034,
-    SUS_8_R_LOC_XBYBZB_PT_YB = 0x44120040,
+  SUS_8_R_LOC_XBYBZB_PT_YB = 0x44120040,
 
-    SUS_3_N_LOC_XFYBZF_PT_YF = 0x44120035,
+  SUS_3_N_LOC_XFYBZF_PT_YF = 0x44120035,
-    SUS_9_R_LOC_XBYBZB_PT_YF = 0x44120041,
+  SUS_9_R_LOC_XBYBZB_PT_YF = 0x44120041,
 
-    SUS_4_N_LOC_XMYFZF_PT_ZF = 0x44120036,
+  SUS_4_N_LOC_XMYFZF_PT_ZF = 0x44120036,
-    SUS_10_N_LOC_XMYBZF_PT_ZF = 0x44120042,
+  SUS_10_N_LOC_XMYBZF_PT_ZF = 0x44120042,
 
-    SUS_5_N_LOC_XFYMZB_PT_ZB = 0x44120037,
+  SUS_5_N_LOC_XFYMZB_PT_ZB = 0x44120037,
-    SUS_11_R_LOC_XBYMZB_PT_ZB = 0x44120043,
+  SUS_11_R_LOC_XBYMZB_PT_ZB = 0x44120043,
 
-    GPS_CONTROLLER = 0x44130045,
+  SYRLINKS_HK_HANDLER = 0x445300A3,
 
-    RW1 = 0x44120047,
+  // 0x60 for other stuff
-    RW2 = 0x44120148,
+  HEATER_0_PLOC_PROC_BRD = 0x60000000,
-    RW3 = 0x44120249,
+  HEATER_1_PCDU_BRD = 0x60000001,
-    RW4 = 0x44120350,
+  HEATER_2_ACS_BRD = 0x60000002,
+  HEATER_3_OBC_BRD = 0x60000003,
+  HEATER_4_CAMERA = 0x60000004,
+  HEATER_5_STR = 0x60000005,
+  HEATER_6_DRO = 0x60000006,
+  HEATER_7_HPA = 0x60000007,
 
-    STAR_TRACKER = 0x44130001,
+  // 0x73 ('s') for assemblies and system/subsystem components
-
+  ACS_BOARD_ASS = 0x73000001,
-    PLOC_MEMORY_DUMPER = 0x44330001,
+  SUS_BOARD_ASS = 0x73000002,
-    STR_HELPER = 0x44330002,
+  TCS_BOARD_ASS = 0x73000003,
-    PLOC_MPSOC_HELPER = 0x44330003,
+  RW_ASS = 0x73000004
-    AXI_PTME_CONFIG = 44330004,
-    PTME_CONFIG = 44330005,
-
-    // 0x73 ('s') for assemblies and system/subsystem components
-    ACS_BOARD_ASS = 0x73000001,
-    SUS_BOARD_ASS = 0x73000002,
-    TCS_BOARD_ASS = 0x73000003,
-    RW_ASS = 0x73000004
 };
 }
 
-
 #endif /* COMMON_CONFIG_COMMONOBJECTS_H_ */

common/config/commonSubsystemIds.h

@@ -4,37 +4,36 @@
 #include <fsfw/events/fwSubsystemIdRanges.h>
 
 namespace SUBSYSTEM_ID {
-enum: uint8_t {
+enum : uint8_t {
-	COMMON_SUBSYSTEM_ID_START = FW_SUBSYSTEM_ID_RANGE,
+  COMMON_SUBSYSTEM_ID_START = FW_SUBSYSTEM_ID_RANGE,
-	ACS_SUBSYSTEM = 112,
+  ACS_SUBSYSTEM = 112,
-	PCDU_HANDLER = 113,
+  PCDU_HANDLER = 113,
-	HEATER_HANDLER = 114,
+  HEATER_HANDLER = 114,
-	SA_DEPL_HANDLER = 115,
+  SA_DEPL_HANDLER = 115,
-	PLOC_MPSOC_HANDLER = 116,
+  PLOC_MPSOC_HANDLER = 116,
-	IMTQ_HANDLER = 117,
+  IMTQ_HANDLER = 117,
-	RW_HANDLER = 118,
+  RW_HANDLER = 118,
-	STR_HANDLER = 119,
+  STR_HANDLER = 119,
-	PLOC_SUPERVISOR_HANDLER = 120,
+  PLOC_SUPERVISOR_HANDLER = 120,
-	FILE_SYSTEM = 121,
+  FILE_SYSTEM = 121,
-	PLOC_UPDATER = 122,
+  PLOC_UPDATER = 122,
-	PLOC_MEMORY_DUMPER = 123,
+  PLOC_MEMORY_DUMPER = 123,
-	PDEC_HANDLER = 124,
+  PDEC_HANDLER = 124,
-	STR_HELPER = 125,
+  STR_HELPER = 125,
-	PLOC_MPSOC_HELPER = 126,
+  PLOC_MPSOC_HELPER = 126,
-	PL_PCDU_HANDLER = 127,
+  PL_PCDU_HANDLER = 127,
-	ACS_BOARD_ASS = 128,
+  ACS_BOARD_ASS = 128,
-	SUS_BOARD_ASS = 129,
+  SUS_BOARD_ASS = 129,
-	TCS_BOARD_ASS = 130,
+  TCS_BOARD_ASS = 130,
-	GPS_HANDLER = 131,
+  GPS_HANDLER = 131,
-	P60_DOCK_HANDLER = 132,
+  P60_DOCK_HANDLER = 132,
-	PDU1_HANDLER = 133,
+  PDU1_HANDLER = 133,
-	PDU2_HANDLER = 134,
+  PDU2_HANDLER = 134,
-	ACU_HANDLER = 135,
+  ACU_HANDLER = 135,
-	PLOC_SUPV_HELPER = 136,
+  PLOC_SUPV_HELPER = 136,
-	SYRLINKS = 137,
+  SYRLINKS = 137,
-	COMMON_SUBSYSTEM_ID_END
+  COMMON_SUBSYSTEM_ID_END
 };
 }
 
-
 #endif /* COMMON_CONFIG_COMMONSUBSYSTEMIDS_H_ */

common/config/devConf.h

@@ -1,10 +1,11 @@
 #ifndef COMMON_CONFIG_DEVCONF_H_
 #define COMMON_CONFIG_DEVCONF_H_
 
-#include <cstdint>
 #include <fsfw_hal/linux/spi/spiDefinitions.h>
 #include <fsfw_hal/linux/uart/UartCookie.h>
 
+#include <cstdint>
+
 /**
  * SPI configuration will be contained here to let the device handlers remain independent
  * of SPI specific properties.
@@ -31,6 +32,7 @@ static constexpr spi::SpiModes DEFAULT_L3G_MODE = spi::SpiModes::MODE_3;
 static const uint32_t SUS_MAX1227_SPI_FREQ = 976'000;
 static constexpr spi::SpiModes SUS_MAX_1227_MODE = spi::SpiModes::MODE_3;
 
+static constexpr dur_millis_t RAD_SENSOR_CS_TIMEOUT = 120;
 static constexpr uint32_t DEFAULT_MAX_1227_SPEED = 976'000;
 static constexpr spi::SpiModes DEFAULT_MAX_1227_MODE = spi::SpiModes::MODE_3;
 
@@ -42,10 +44,11 @@ static constexpr spi::SpiModes DEFAULT_ADIS16507_MODE = spi::SpiModes::MODE_3;
 static constexpr uint32_t RW_SPEED = 300'000;
 static constexpr spi::SpiModes RW_MODE = spi::SpiModes::MODE_0;
 
+static constexpr dur_millis_t RTD_CS_TIMEOUT = 50;
 static constexpr uint32_t RTD_SPEED = 2'000'000;
 static constexpr spi::SpiModes RTD_MODE = spi::SpiModes::MODE_3;
 
-}
+}  // namespace spi
 
 namespace uart {
 
@@ -56,6 +59,6 @@ static constexpr UartBaudRate PLOC_MPSOC_BAUD = UartBaudRate::RATE_115200;
 static constexpr UartBaudRate PLOC_SUPV_BAUD = UartBaudRate::RATE_115200;
 static constexpr UartBaudRate STAR_TRACKER_BAUD = UartBaudRate::RATE_921600;
 
-}
+}  // namespace uart
 
 #endif /* COMMON_CONFIG_DEVCONF_H_ */

common/config/devices/heaterSwitcherList.h

@@ -3,18 +3,18 @@
 
 #include <cstdint>
 
-namespace heaterSwitches {
+namespace heater {
-	enum switcherList: uint8_t {
+enum Switchers : uint8_t {
-		HEATER_0,
+  HEATER_0_OBC_BRD,
-		HEATER_1,
+  HEATER_1_PLOC_PROC_BRD,
-		HEATER_2,
+  HEATER_2_ACS_BRD,
-		HEATER_3,
+  HEATER_3_PCDU_PDU,
-		HEATER_4,
+  HEATER_4_CAMERA,
-		HEATER_5,
+  HEATER_5_STR,
-		HEATER_6,
+  HEATER_6_DRO,
-		HEATER_7,
+  HEATER_7_HPA,
-		NUMBER_OF_SWITCHES
+  NUMBER_OF_SWITCHES
-	};
+};
 }
 
 #endif /* FSFWCONFIG_DEVICES_HEATERSWITCHERLIST_H_ */

common/config/eive/definitions.h

@@ -19,7 +19,6 @@ static constexpr uint8_t LIVE_TM = 0;
 static constexpr uint32_t MAX_PATH_SIZE = 100;
 static constexpr uint32_t MAX_FILENAME_SIZE = 50;
 
-}
+}  // namespace config
-
 
 #endif /* COMMON_CONFIG_DEFINITIONS_H_ */

common/config/tmtc/apid.h

@@ -12,8 +12,7 @@
  * APID is a 11 bit number
  */
 namespace apid {
-	static const uint16_t EIVE_OBSW = 0x65;
+static const uint16_t EIVE_OBSW = 0x65;
 }
 
-
 #endif /* FSFWCONFIG_TMTC_APID_H_ */

fsfw

@@ -1 +1 @@
-Subproject commit c0ff84bb9d81bc3444992fef38b74d260d54d5a0
+Subproject commit 4b128d243569e0c87ae8868c545bdd80a354a2e6

generators/bsp_q7s_events.csv

@@ -1,200 +1,206 @@
-2200;0x0898;STORE_SEND_WRITE_FAILED;LOW;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+2200;0x0898;STORE_SEND_WRITE_FAILED;LOW;;fsfw\src\fsfw\tmstorage\TmStoreBackendIF.h
-2201;0x0899;STORE_WRITE_FAILED;LOW;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+2201;0x0899;STORE_WRITE_FAILED;LOW;;fsfw\src\fsfw\tmstorage\TmStoreBackendIF.h
-2202;0x089a;STORE_SEND_READ_FAILED;LOW;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+2202;0x089a;STORE_SEND_READ_FAILED;LOW;;fsfw\src\fsfw\tmstorage\TmStoreBackendIF.h
-2203;0x089b;STORE_READ_FAILED;LOW;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+2203;0x089b;STORE_READ_FAILED;LOW;;fsfw\src\fsfw\tmstorage\TmStoreBackendIF.h
-2204;0x089c;UNEXPECTED_MSG;LOW;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+2204;0x089c;UNEXPECTED_MSG;LOW;;fsfw\src\fsfw\tmstorage\TmStoreBackendIF.h
-2205;0x089d;STORING_FAILED;LOW;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+2205;0x089d;STORING_FAILED;LOW;;fsfw\src\fsfw\tmstorage\TmStoreBackendIF.h
-2206;0x089e;TM_DUMP_FAILED;LOW;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+2206;0x089e;TM_DUMP_FAILED;LOW;;fsfw\src\fsfw\tmstorage\TmStoreBackendIF.h
-2207;0x089f;STORE_INIT_FAILED;LOW;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+2207;0x089f;STORE_INIT_FAILED;LOW;;fsfw\src\fsfw\tmstorage\TmStoreBackendIF.h
-2208;0x08a0;STORE_INIT_EMPTY;INFO;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+2208;0x08a0;STORE_INIT_EMPTY;INFO;;fsfw\src\fsfw\tmstorage\TmStoreBackendIF.h
-2209;0x08a1;STORE_CONTENT_CORRUPTED;LOW;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+2209;0x08a1;STORE_CONTENT_CORRUPTED;LOW;;fsfw\src\fsfw\tmstorage\TmStoreBackendIF.h
-2210;0x08a2;STORE_INITIALIZE;INFO;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+2210;0x08a2;STORE_INITIALIZE;INFO;;fsfw\src\fsfw\tmstorage\TmStoreBackendIF.h
-2211;0x08a3;INIT_DONE;INFO;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+2211;0x08a3;INIT_DONE;INFO;;fsfw\src\fsfw\tmstorage\TmStoreBackendIF.h
-2212;0x08a4;DUMP_FINISHED;INFO;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+2212;0x08a4;DUMP_FINISHED;INFO;;fsfw\src\fsfw\tmstorage\TmStoreBackendIF.h
-2213;0x08a5;DELETION_FINISHED;INFO;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+2213;0x08a5;DELETION_FINISHED;INFO;;fsfw\src\fsfw\tmstorage\TmStoreBackendIF.h
-2214;0x08a6;DELETION_FAILED;LOW;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+2214;0x08a6;DELETION_FAILED;LOW;;fsfw\src\fsfw\tmstorage\TmStoreBackendIF.h
-2215;0x08a7;AUTO_CATALOGS_SENDING_FAILED;INFO;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+2215;0x08a7;AUTO_CATALOGS_SENDING_FAILED;INFO;;fsfw\src\fsfw\tmstorage\TmStoreBackendIF.h
-2600;0x0a28;GET_DATA_FAILED;LOW;;fsfw/src/fsfw/storagemanager/StorageManagerIF.h
+2600;0x0a28;GET_DATA_FAILED;LOW;;fsfw\src\fsfw\storagemanager\StorageManagerIF.h
-2601;0x0a29;STORE_DATA_FAILED;LOW;;fsfw/src/fsfw/storagemanager/StorageManagerIF.h
+2601;0x0a29;STORE_DATA_FAILED;LOW;;fsfw\src\fsfw\storagemanager\StorageManagerIF.h
-2800;0x0af0;DEVICE_BUILDING_COMMAND_FAILED;LOW;;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
+2800;0x0af0;DEVICE_BUILDING_COMMAND_FAILED;LOW;;fsfw\src\fsfw\devicehandlers\DeviceHandlerIF.h
-2801;0x0af1;DEVICE_SENDING_COMMAND_FAILED;LOW;;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
+2801;0x0af1;DEVICE_SENDING_COMMAND_FAILED;LOW;;fsfw\src\fsfw\devicehandlers\DeviceHandlerIF.h
-2802;0x0af2;DEVICE_REQUESTING_REPLY_FAILED;LOW;;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
+2802;0x0af2;DEVICE_REQUESTING_REPLY_FAILED;LOW;;fsfw\src\fsfw\devicehandlers\DeviceHandlerIF.h
-2803;0x0af3;DEVICE_READING_REPLY_FAILED;LOW;;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
+2803;0x0af3;DEVICE_READING_REPLY_FAILED;LOW;;fsfw\src\fsfw\devicehandlers\DeviceHandlerIF.h
-2804;0x0af4;DEVICE_INTERPRETING_REPLY_FAILED;LOW;;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
+2804;0x0af4;DEVICE_INTERPRETING_REPLY_FAILED;LOW;;fsfw\src\fsfw\devicehandlers\DeviceHandlerIF.h
-2805;0x0af5;DEVICE_MISSED_REPLY;LOW;;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
+2805;0x0af5;DEVICE_MISSED_REPLY;LOW;;fsfw\src\fsfw\devicehandlers\DeviceHandlerIF.h
-2806;0x0af6;DEVICE_UNKNOWN_REPLY;LOW;;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
+2806;0x0af6;DEVICE_UNKNOWN_REPLY;LOW;;fsfw\src\fsfw\devicehandlers\DeviceHandlerIF.h
-2807;0x0af7;DEVICE_UNREQUESTED_REPLY;LOW;;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
+2807;0x0af7;DEVICE_UNREQUESTED_REPLY;LOW;;fsfw\src\fsfw\devicehandlers\DeviceHandlerIF.h
-2808;0x0af8;INVALID_DEVICE_COMMAND;LOW;Indicates a SW bug in child class.;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
+2808;0x0af8;INVALID_DEVICE_COMMAND;LOW;Indicates a SW bug in child class.;fsfw\src\fsfw\devicehandlers\DeviceHandlerIF.h
-2809;0x0af9;MONITORING_LIMIT_EXCEEDED;LOW;;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
+2809;0x0af9;MONITORING_LIMIT_EXCEEDED;LOW;;fsfw\src\fsfw\devicehandlers\DeviceHandlerIF.h
-2810;0x0afa;MONITORING_AMBIGUOUS;HIGH;;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
+2810;0x0afa;MONITORING_AMBIGUOUS;HIGH;;fsfw\src\fsfw\devicehandlers\DeviceHandlerIF.h
-2811;0x0afb;DEVICE_WANTS_HARD_REBOOT;HIGH;;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
+2811;0x0afb;DEVICE_WANTS_HARD_REBOOT;HIGH;;fsfw\src\fsfw\devicehandlers\DeviceHandlerIF.h
-4201;0x1069;FUSE_CURRENT_HIGH;LOW;;fsfw/src/fsfw/power/Fuse.h
+4201;0x1069;FUSE_CURRENT_HIGH;LOW;;fsfw\src\fsfw\power\Fuse.h
-4202;0x106a;FUSE_WENT_OFF;LOW;;fsfw/src/fsfw/power/Fuse.h
+4202;0x106a;FUSE_WENT_OFF;LOW;;fsfw\src\fsfw\power\Fuse.h
-4204;0x106c;POWER_ABOVE_HIGH_LIMIT;LOW;;fsfw/src/fsfw/power/Fuse.h
+4204;0x106c;POWER_ABOVE_HIGH_LIMIT;LOW;;fsfw\src\fsfw\power\Fuse.h
-4205;0x106d;POWER_BELOW_LOW_LIMIT;LOW;;fsfw/src/fsfw/power/Fuse.h
+4205;0x106d;POWER_BELOW_LOW_LIMIT;LOW;;fsfw\src\fsfw\power\Fuse.h
-4300;0x10cc;SWITCH_WENT_OFF;LOW;;fsfw/src/fsfw/power/PowerSwitchIF.h
+4300;0x10cc;SWITCH_WENT_OFF;LOW;;fsfw\src\fsfw\power\PowerSwitchIF.h
-5000;0x1388;HEATER_ON;INFO;;fsfw/src/fsfw/thermal/Heater.h
+5000;0x1388;HEATER_ON;INFO;;fsfw\src\fsfw\thermal\Heater.h
-5001;0x1389;HEATER_OFF;INFO;;fsfw/src/fsfw/thermal/Heater.h
+5001;0x1389;HEATER_OFF;INFO;;fsfw\src\fsfw\thermal\Heater.h
-5002;0x138a;HEATER_TIMEOUT;LOW;;fsfw/src/fsfw/thermal/Heater.h
+5002;0x138a;HEATER_TIMEOUT;LOW;;fsfw\src\fsfw\thermal\Heater.h
-5003;0x138b;HEATER_STAYED_ON;LOW;;fsfw/src/fsfw/thermal/Heater.h
+5003;0x138b;HEATER_STAYED_ON;LOW;;fsfw\src\fsfw\thermal\Heater.h
-5004;0x138c;HEATER_STAYED_OFF;LOW;;fsfw/src/fsfw/thermal/Heater.h
+5004;0x138c;HEATER_STAYED_OFF;LOW;;fsfw\src\fsfw\thermal\Heater.h
-5200;0x1450;TEMP_SENSOR_HIGH;LOW;;fsfw/src/fsfw/thermal/AbstractTemperatureSensor.h
+5200;0x1450;TEMP_SENSOR_HIGH;LOW;;fsfw\src\fsfw\thermal\AbstractTemperatureSensor.h
-5201;0x1451;TEMP_SENSOR_LOW;LOW;;fsfw/src/fsfw/thermal/AbstractTemperatureSensor.h
+5201;0x1451;TEMP_SENSOR_LOW;LOW;;fsfw\src\fsfw\thermal\AbstractTemperatureSensor.h
-5202;0x1452;TEMP_SENSOR_GRADIENT;LOW;;fsfw/src/fsfw/thermal/AbstractTemperatureSensor.h
+5202;0x1452;TEMP_SENSOR_GRADIENT;LOW;;fsfw\src\fsfw\thermal\AbstractTemperatureSensor.h
-5901;0x170d;COMPONENT_TEMP_LOW;LOW;;fsfw/src/fsfw/thermal/ThermalComponentIF.h
+5901;0x170d;COMPONENT_TEMP_LOW;LOW;;fsfw\src\fsfw\thermal\ThermalComponentIF.h
-5902;0x170e;COMPONENT_TEMP_HIGH;LOW;;fsfw/src/fsfw/thermal/ThermalComponentIF.h
+5902;0x170e;COMPONENT_TEMP_HIGH;LOW;;fsfw\src\fsfw\thermal\ThermalComponentIF.h
-5903;0x170f;COMPONENT_TEMP_OOL_LOW;LOW;;fsfw/src/fsfw/thermal/ThermalComponentIF.h
+5903;0x170f;COMPONENT_TEMP_OOL_LOW;LOW;;fsfw\src\fsfw\thermal\ThermalComponentIF.h
-5904;0x1710;COMPONENT_TEMP_OOL_HIGH;LOW;;fsfw/src/fsfw/thermal/ThermalComponentIF.h
+5904;0x1710;COMPONENT_TEMP_OOL_HIGH;LOW;;fsfw\src\fsfw\thermal\ThermalComponentIF.h
-5905;0x1711;TEMP_NOT_IN_OP_RANGE;LOW;;fsfw/src/fsfw/thermal/ThermalComponentIF.h
+5905;0x1711;TEMP_NOT_IN_OP_RANGE;LOW;;fsfw\src\fsfw\thermal\ThermalComponentIF.h
-7101;0x1bbd;FDIR_CHANGED_STATE;INFO;;fsfw/src/fsfw/fdir/FailureIsolationBase.h
+7101;0x1bbd;FDIR_CHANGED_STATE;INFO;;fsfw\src\fsfw\fdir\FailureIsolationBase.h
-7102;0x1bbe;FDIR_STARTS_RECOVERY;MEDIUM;;fsfw/src/fsfw/fdir/FailureIsolationBase.h
+7102;0x1bbe;FDIR_STARTS_RECOVERY;MEDIUM;;fsfw\src\fsfw\fdir\FailureIsolationBase.h
-7103;0x1bbf;FDIR_TURNS_OFF_DEVICE;MEDIUM;;fsfw/src/fsfw/fdir/FailureIsolationBase.h
+7103;0x1bbf;FDIR_TURNS_OFF_DEVICE;MEDIUM;;fsfw\src\fsfw\fdir\FailureIsolationBase.h
-7201;0x1c21;MONITOR_CHANGED_STATE;LOW;;fsfw/src/fsfw/monitoring/MonitoringIF.h
+7201;0x1c21;MONITOR_CHANGED_STATE;LOW;;fsfw\src\fsfw\monitoring\MonitoringIF.h
-7202;0x1c22;VALUE_BELOW_LOW_LIMIT;LOW;;fsfw/src/fsfw/monitoring/MonitoringIF.h
+7202;0x1c22;VALUE_BELOW_LOW_LIMIT;LOW;;fsfw\src\fsfw\monitoring\MonitoringIF.h
-7203;0x1c23;VALUE_ABOVE_HIGH_LIMIT;LOW;;fsfw/src/fsfw/monitoring/MonitoringIF.h
+7203;0x1c23;VALUE_ABOVE_HIGH_LIMIT;LOW;;fsfw\src\fsfw\monitoring\MonitoringIF.h
-7204;0x1c24;VALUE_OUT_OF_RANGE;LOW;;fsfw/src/fsfw/monitoring/MonitoringIF.h
+7204;0x1c24;VALUE_OUT_OF_RANGE;LOW;;fsfw\src\fsfw\monitoring\MonitoringIF.h
-7400;0x1ce8;CHANGING_MODE;INFO;;fsfw/src/fsfw/modes/HasModesIF.h
+7400;0x1ce8;CHANGING_MODE;INFO;;fsfw\src\fsfw\modes\HasModesIF.h
-7401;0x1ce9;MODE_INFO;INFO;;fsfw/src/fsfw/modes/HasModesIF.h
+7401;0x1ce9;MODE_INFO;INFO;;fsfw\src\fsfw\modes\HasModesIF.h
-7402;0x1cea;FALLBACK_FAILED;HIGH;;fsfw/src/fsfw/modes/HasModesIF.h
+7402;0x1cea;FALLBACK_FAILED;HIGH;;fsfw\src\fsfw\modes\HasModesIF.h
-7403;0x1ceb;MODE_TRANSITION_FAILED;LOW;;fsfw/src/fsfw/modes/HasModesIF.h
+7403;0x1ceb;MODE_TRANSITION_FAILED;LOW;;fsfw\src\fsfw\modes\HasModesIF.h
-7404;0x1cec;CANT_KEEP_MODE;HIGH;;fsfw/src/fsfw/modes/HasModesIF.h
+7404;0x1cec;CANT_KEEP_MODE;HIGH;;fsfw\src\fsfw\modes\HasModesIF.h
-7405;0x1ced;OBJECT_IN_INVALID_MODE;LOW;;fsfw/src/fsfw/modes/HasModesIF.h
+7405;0x1ced;OBJECT_IN_INVALID_MODE;LOW;;fsfw\src\fsfw\modes\HasModesIF.h
-7406;0x1cee;FORCING_MODE;MEDIUM;;fsfw/src/fsfw/modes/HasModesIF.h
+7406;0x1cee;FORCING_MODE;MEDIUM;;fsfw\src\fsfw\modes\HasModesIF.h
-7407;0x1cef;MODE_CMD_REJECTED;LOW;;fsfw/src/fsfw/modes/HasModesIF.h
+7407;0x1cef;MODE_CMD_REJECTED;LOW;;fsfw\src\fsfw\modes\HasModesIF.h
-7506;0x1d52;HEALTH_INFO;INFO;;fsfw/src/fsfw/health/HasHealthIF.h
+7506;0x1d52;HEALTH_INFO;INFO;;fsfw\src\fsfw\health\HasHealthIF.h
-7507;0x1d53;CHILD_CHANGED_HEALTH;INFO;;fsfw/src/fsfw/health/HasHealthIF.h
+7507;0x1d53;CHILD_CHANGED_HEALTH;INFO;;fsfw\src\fsfw\health\HasHealthIF.h
-7508;0x1d54;CHILD_PROBLEMS;LOW;;fsfw/src/fsfw/health/HasHealthIF.h
+7508;0x1d54;CHILD_PROBLEMS;LOW;;fsfw\src\fsfw\health\HasHealthIF.h
-7509;0x1d55;OVERWRITING_HEALTH;LOW;;fsfw/src/fsfw/health/HasHealthIF.h
+7509;0x1d55;OVERWRITING_HEALTH;LOW;;fsfw\src\fsfw\health\HasHealthIF.h
-7510;0x1d56;TRYING_RECOVERY;MEDIUM;;fsfw/src/fsfw/health/HasHealthIF.h
+7510;0x1d56;TRYING_RECOVERY;MEDIUM;;fsfw\src\fsfw\health\HasHealthIF.h
-7511;0x1d57;RECOVERY_STEP;MEDIUM;;fsfw/src/fsfw/health/HasHealthIF.h
+7511;0x1d57;RECOVERY_STEP;MEDIUM;;fsfw\src\fsfw\health\HasHealthIF.h
-7512;0x1d58;RECOVERY_DONE;MEDIUM;;fsfw/src/fsfw/health/HasHealthIF.h
+7512;0x1d58;RECOVERY_DONE;MEDIUM;;fsfw\src\fsfw\health\HasHealthIF.h
-7900;0x1edc;RF_AVAILABLE;INFO;A RF available signal was detected. P1: raw RFA state, P2: 0;fsfw/src/fsfw/datalinklayer/DataLinkLayer.h
+7900;0x1edc;RF_AVAILABLE;INFO;A RF available signal was detected. P1: raw RFA state, P2: 0;fsfw\src\fsfw\datalinklayer\DataLinkLayer.h
-7901;0x1edd;RF_LOST;INFO;A previously found RF available signal was lost. P1: raw RFA state, P2: 0;fsfw/src/fsfw/datalinklayer/DataLinkLayer.h
+7901;0x1edd;RF_LOST;INFO;A previously found RF available signal was lost. P1: raw RFA state, P2: 0;fsfw\src\fsfw\datalinklayer\DataLinkLayer.h
-7902;0x1ede;BIT_LOCK;INFO;A Bit Lock signal. Was detected. P1: raw BLO state, P2: 0;fsfw/src/fsfw/datalinklayer/DataLinkLayer.h
+7902;0x1ede;BIT_LOCK;INFO;A Bit Lock signal. Was detected. P1: raw BLO state, P2: 0;fsfw\src\fsfw\datalinklayer\DataLinkLayer.h
-7903;0x1edf;BIT_LOCK_LOST;INFO;A previously found Bit Lock signal was lost. P1: raw BLO state, P2: 0;fsfw/src/fsfw/datalinklayer/DataLinkLayer.h
+7903;0x1edf;BIT_LOCK_LOST;INFO;A previously found Bit Lock signal was lost. P1: raw BLO state, P2: 0;fsfw\src\fsfw\datalinklayer\DataLinkLayer.h
-7905;0x1ee1;FRAME_PROCESSING_FAILED;LOW;The CCSDS Board could not interpret a TC;fsfw/src/fsfw/datalinklayer/DataLinkLayer.h
+7905;0x1ee1;FRAME_PROCESSING_FAILED;LOW;The CCSDS Board could not interpret a TC;fsfw\src\fsfw\datalinklayer\DataLinkLayer.h
-8900;0x22c4;CLOCK_SET;INFO;;fsfw/src/fsfw/pus/Service9TimeManagement.h
+8900;0x22c4;CLOCK_SET;INFO;;fsfw\src\fsfw\pus\Service9TimeManagement.h
-8901;0x22c5;CLOCK_SET_FAILURE;LOW;;fsfw/src/fsfw/pus/Service9TimeManagement.h
+8901;0x22c5;CLOCK_SET_FAILURE;LOW;;fsfw\src\fsfw\pus\Service9TimeManagement.h
-9700;0x25e4;TEST;INFO;;fsfw/src/fsfw/pus/Service17Test.h
+9700;0x25e4;TEST;INFO;;fsfw\src\fsfw\pus\Service17Test.h
-10600;0x2968;CHANGE_OF_SETUP_PARAMETER;LOW;;fsfw/hal/src/fsfw_hal/devicehandlers/MgmLIS3MDLHandler.h
+10600;0x2968;CHANGE_OF_SETUP_PARAMETER;LOW;;fsfw\hal\src\fsfw_hal\devicehandlers\MgmLIS3MDLHandler.h
-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
+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 switch state has changed P1: New switch state, 1 for on, 0 for off | P2: Switch Index;mission/devices/devicedefinitions/powerDefinitions.h
+11301;0x2c25;SWITCH_HAS_CHANGED;INFO;Indicated that a switch 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
+11302;0x2c26;SWITCHING_Q7S_DENIED;MEDIUM;;mission\devices\devicedefinitions\powerDefinitions.h
-11303;0x2c27;FDIR_REACTION_IGNORED;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
+11400;0x2c88;GPIO_PULL_HIGH_FAILED;LOW;;mission\devices\HeaterHandler.h
-11401;0x2c89;GPIO_PULL_LOW_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
+11402;0x2c8a;HEATER_WENT_ON;INFO;;mission\devices\HeaterHandler.h
-11403;0x2c8b;SWITCH_ALREADY_OFF;LOW;;mission/devices/HeaterHandler.h
+11403;0x2c8b;HEATER_WENT_OFF;INFO;;mission\devices\HeaterHandler.h
-11404;0x2c8c;MAIN_SWITCH_TIMEOUT;LOW;;mission/devices/HeaterHandler.h
+11404;0x2c8c;SWITCH_ALREADY_ON;LOW;;mission\devices\HeaterHandler.h
-11500;0x2cec;MAIN_SWITCH_ON_TIMEOUT;LOW;;mission/devices/SolarArrayDeploymentHandler.h
+11405;0x2c8d;SWITCH_ALREADY_OFF;LOW;;mission\devices\HeaterHandler.h
-11501;0x2ced;MAIN_SWITCH_OFF_TIMEOUT;LOW;;mission/devices/SolarArrayDeploymentHandler.h
+11406;0x2c8e;MAIN_SWITCH_TIMEOUT;MEDIUM;;mission\devices\HeaterHandler.h
-11502;0x2cee;DEPLOYMENT_FAILED;HIGH;;mission/devices/SolarArrayDeploymentHandler.h
+11407;0x2c8f;FAULTY_HEATER_WAS_ON;LOW;;mission\devices\HeaterHandler.h
-11503;0x2cef;DEPL_SA1_GPIO_SWTICH_ON_FAILED;HIGH;;mission/devices/SolarArrayDeploymentHandler.h
+11500;0x2cec;MAIN_SWITCH_ON_TIMEOUT;LOW;;mission\devices\SolarArrayDeploymentHandler.h
-11504;0x2cf0;DEPL_SA2_GPIO_SWTICH_ON_FAILED;HIGH;;mission/devices/SolarArrayDeploymentHandler.h
+11501;0x2ced;MAIN_SWITCH_OFF_TIMEOUT;LOW;;mission\devices\SolarArrayDeploymentHandler.h
-11601;0x2d51;MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC crc failure in telemetry packet;linux/devices/ploc/PlocMPSoCHandler.h
+11502;0x2cee;DEPLOYMENT_FAILED;HIGH;;mission\devices\SolarArrayDeploymentHandler.h
-11602;0x2d52;ACK_FAILURE;LOW;PLOC receive acknowledgment failure report P1: Command Id which leads the acknowledgment failure report P2: The status field inserted by the MPSoC into the data field;linux/devices/ploc/PlocMPSoCHandler.h
+11503;0x2cef;DEPL_SA1_GPIO_SWTICH_ON_FAILED;HIGH;;mission\devices\SolarArrayDeploymentHandler.h
-11603;0x2d53;EXE_FAILURE;LOW;PLOC receive execution failure report P1: Command Id which leads the execution failure report P2: The status field inserted by the MPSoC into the data field;linux/devices/ploc/PlocMPSoCHandler.h
+11504;0x2cf0;DEPL_SA2_GPIO_SWTICH_ON_FAILED;HIGH;;mission\devices\SolarArrayDeploymentHandler.h
-11604;0x2d54;MPSOC_HANDLER_CRC_FAILURE;LOW;PLOC reply has invalid crc;linux/devices/ploc/PlocMPSoCHandler.h
+11601;0x2d51;MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC crc failure in telemetry packet;linux\devices\ploc\PlocMPSoCHandler.h
-11605;0x2d55;MPSOC_HANDLER_SEQUENCE_COUNT_MISMATCH;LOW;Packet sequence count in received space packet does not match expected count P1: Expected sequence count P2: Received sequence count;linux/devices/ploc/PlocMPSoCHandler.h
+11602;0x2d52;ACK_FAILURE;LOW;PLOC receive acknowledgment failure report P1: Command Id which leads the acknowledgment failure report P2: The status field inserted by the MPSoC into the data field;linux\devices\ploc\PlocMPSoCHandler.h
-11606;0x2d56;MPSOC_SHUTDOWN_FAILED;HIGH;Supervisor fails to shutdown MPSoC. Requires to power off the PLOC and thus also to shutdown the supervisor.;linux/devices/ploc/PlocMPSoCHandler.h
+11603;0x2d53;EXE_FAILURE;LOW;PLOC receive execution failure report P1: Command Id which leads the execution failure report P2: The status field inserted by the MPSoC into the data field;linux\devices\ploc\PlocMPSoCHandler.h
-11701;0x2db5;SELF_TEST_I2C_FAILURE;LOW;Get self test result returns I2C failure P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
+11604;0x2d54;MPSOC_HANDLER_CRC_FAILURE;LOW;PLOC reply has invalid crc;linux\devices\ploc\PlocMPSoCHandler.h
-11702;0x2db6;SELF_TEST_SPI_FAILURE;LOW;Get self test result returns SPI failure. This concerns the MTM connectivity. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
+11605;0x2d55;MPSOC_HANDLER_SEQUENCE_COUNT_MISMATCH;LOW;Packet sequence count in received space packet does not match expected count P1: Expected sequence count P2: Received sequence count;linux\devices\ploc\PlocMPSoCHandler.h
-11703;0x2db7;SELF_TEST_ADC_FAILURE;LOW;Get self test result returns failure in measurement of current and temperature. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
+11606;0x2d56;MPSOC_SHUTDOWN_FAILED;HIGH;Supervisor fails to shutdown MPSoC. Requires to power off the PLOC and thus also to shutdown the supervisor.;linux\devices\ploc\PlocMPSoCHandler.h
-11704;0x2db8;SELF_TEST_PWM_FAILURE;LOW;Get self test result returns PWM failure which concerns the coil actuation. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
+11701;0x2db5;SELF_TEST_I2C_FAILURE;LOW;Get self test result returns I2C failure P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission\devices\IMTQHandler.h
-11705;0x2db9;SELF_TEST_TC_FAILURE;LOW;Get self test result returns TC failure (system failure) P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
+11702;0x2db6;SELF_TEST_SPI_FAILURE;LOW;Get self test result returns SPI failure. This concerns the MTM connectivity. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission\devices\IMTQHandler.h
-11706;0x2dba;SELF_TEST_MTM_RANGE_FAILURE;LOW;Get self test result returns failure that MTM values were outside of the expected range. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
+11703;0x2db7;SELF_TEST_ADC_FAILURE;LOW;Get self test result returns failure in measurement of current and temperature. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission\devices\IMTQHandler.h
-11707;0x2dbb;SELF_TEST_COIL_CURRENT_FAILURE;LOW;Get self test result returns failure indicating that the coil current was outside of the expected range P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
+11704;0x2db8;SELF_TEST_PWM_FAILURE;LOW;Get self test result returns PWM failure which concerns the coil actuation. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission\devices\IMTQHandler.h
-11708;0x2dbc;INVALID_ERROR_BYTE;LOW;Received invalid error byte. This indicates an error of the communication link between IMTQ and OBC.;mission/devices/IMTQHandler.h
+11705;0x2db9;SELF_TEST_TC_FAILURE;LOW;Get self test result returns TC failure (system failure) P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission\devices\IMTQHandler.h
-11801;0x2e19;ERROR_STATE;HIGH;Reaction wheel signals an error state;mission/devices/devicedefinitions/RwDefinitions.h
+11706;0x2dba;SELF_TEST_MTM_RANGE_FAILURE;LOW;Get self test result returns failure that MTM values were outside of the expected range. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission\devices\IMTQHandler.h
-11802;0x2e1a;RESET_OCCURED;LOW;;mission/devices/devicedefinitions/RwDefinitions.h
+11707;0x2dbb;SELF_TEST_COIL_CURRENT_FAILURE;LOW;Get self test result returns failure indicating that the coil current was outside of the expected range P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission\devices\IMTQHandler.h
-11901;0x2e7d;BOOTING_FIRMWARE_FAILED;LOW;Failed to boot firmware;linux/devices/startracker/StarTrackerHandler.h
+11708;0x2dbc;INVALID_ERROR_BYTE;LOW;Received invalid error byte. This indicates an error of the communication link between IMTQ and OBC.;mission\devices\IMTQHandler.h
-11902;0x2e7e;BOOTING_BOOTLOADER_FAILED;LOW;Failed to boot star tracker into bootloader mode;linux/devices/startracker/StarTrackerHandler.h
+11801;0x2e19;ERROR_STATE;HIGH;Reaction wheel signals an error state;mission\devices\devicedefinitions\RwDefinitions.h
-12001;0x2ee1;SUPV_MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC supervisor crc failure in telemetry packet;linux/devices/ploc/PlocSupervisorHandler.h
+11802;0x2e1a;RESET_OCCURED;LOW;;mission\devices\devicedefinitions\RwDefinitions.h
-12002;0x2ee2;SUPV_ACK_FAILURE;LOW;PLOC supervisor received acknowledgment failure report;linux/devices/ploc/PlocSupervisorHandler.h
+11901;0x2e7d;BOOTING_FIRMWARE_FAILED;LOW;Failed to boot firmware;linux\devices\startracker\StarTrackerHandler.h
-12003;0x2ee3;SUPV_EXE_FAILURE;LOW;PLOC received execution failure report P1: ID of command for which the execution failed P2: Status code sent by the supervisor handler;linux/devices/ploc/PlocSupervisorHandler.h
+11902;0x2e7e;BOOTING_BOOTLOADER_FAILED;LOW;Failed to boot star tracker into bootloader mode;linux\devices\startracker\StarTrackerHandler.h
-12004;0x2ee4;SUPV_CRC_FAILURE_EVENT;LOW;PLOC supervisor reply has invalid crc;linux/devices/ploc/PlocSupervisorHandler.h
+12001;0x2ee1;SUPV_MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC supervisor crc failure in telemetry packet;linux\devices\ploc\PlocSupervisorHandler.h
-12005;0x2ee5;SUPV_MPSOC_SHUWDOWN_BUILD_FAILED;LOW;Failed to build the command to shutdown the MPSoC;linux/devices/ploc/PlocSupervisorHandler.h
+12002;0x2ee2;SUPV_ACK_FAILURE;LOW;PLOC supervisor received acknowledgment failure report;linux\devices\ploc\PlocSupervisorHandler.h
-12100;0x2f44;SANITIZATION_FAILED;LOW;;bsp_q7s/memory/SdCardManager.h
+12003;0x2ee3;SUPV_EXE_FAILURE;LOW;PLOC received execution failure report P1: ID of command for which the execution failed P2: Status code sent by the supervisor handler;linux\devices\ploc\PlocSupervisorHandler.h
-12101;0x2f45;MOUNTED_SD_CARD;INFO;;bsp_q7s/memory/SdCardManager.h
+12004;0x2ee4;SUPV_CRC_FAILURE_EVENT;LOW;PLOC supervisor reply has invalid crc;linux\devices\ploc\PlocSupervisorHandler.h
-12300;0x300c;SEND_MRAM_DUMP_FAILED;LOW;Failed to send mram dump command to supervisor handler P1: Return value of commandAction function P2: Start address of MRAM to dump with this command;linux/devices/ploc/PlocMemoryDumper.h
+12005;0x2ee5;SUPV_MPSOC_SHUWDOWN_BUILD_FAILED;LOW;Failed to build the command to shutdown the MPSoC;linux\devices\ploc\PlocSupervisorHandler.h
-12301;0x300d;MRAM_DUMP_FAILED;LOW;Received completion failure report form PLOC supervisor handler P1: MRAM start address of failing dump command;linux/devices/ploc/PlocMemoryDumper.h
+12100;0x2f44;SANITIZATION_FAILED;LOW;;bsp_q7s\memory\SdCardManager.h
-12302;0x300e;MRAM_DUMP_FINISHED;LOW;MRAM dump finished successfully;linux/devices/ploc/PlocMemoryDumper.h
+12101;0x2f45;MOUNTED_SD_CARD;INFO;;bsp_q7s\memory\SdCardManager.h
-12401;0x3071;INVALID_TC_FRAME;HIGH;;linux/obc/PdecHandler.h
+12300;0x300c;SEND_MRAM_DUMP_FAILED;LOW;Failed to send mram dump command to supervisor handler P1: Return value of commandAction function P2: Start address of MRAM to dump with this command;linux\devices\ploc\PlocMemoryDumper.h
-12402;0x3072;INVALID_FAR;HIGH;Read invalid FAR from PDEC after startup;linux/obc/PdecHandler.h
+12301;0x300d;MRAM_DUMP_FAILED;LOW;Received completion failure report form PLOC supervisor handler P1: MRAM start address of failing dump command;linux\devices\ploc\PlocMemoryDumper.h
-12403;0x3073;CARRIER_LOCK;INFO;Carrier lock detected;linux/obc/PdecHandler.h
+12302;0x300e;MRAM_DUMP_FINISHED;LOW;MRAM dump finished successfully;linux\devices\ploc\PlocMemoryDumper.h
-12404;0x3074;BIT_LOCK_PDEC;INFO;Bit lock detected (data valid);linux/obc/PdecHandler.h
+12401;0x3071;INVALID_TC_FRAME;HIGH;;linux\obc\PdecHandler.h
-12500;0x30d4;IMAGE_UPLOAD_FAILED;LOW;Image upload failed;linux/devices/startracker/StrHelper.h
+12402;0x3072;INVALID_FAR;HIGH;Read invalid FAR from PDEC after startup;linux\obc\PdecHandler.h
-12501;0x30d5;IMAGE_DOWNLOAD_FAILED;LOW;Image download failed;linux/devices/startracker/StrHelper.h
+12403;0x3073;CARRIER_LOCK;INFO;Carrier lock detected;linux\obc\PdecHandler.h
-12502;0x30d6;IMAGE_UPLOAD_SUCCESSFUL;LOW;Uploading image to star tracker was successfulop;linux/devices/startracker/StrHelper.h
+12404;0x3074;BIT_LOCK_PDEC;INFO;Bit lock detected (data valid);linux\obc\PdecHandler.h
-12503;0x30d7;IMAGE_DOWNLOAD_SUCCESSFUL;LOW;Image download was successful;linux/devices/startracker/StrHelper.h
+12500;0x30d4;IMAGE_UPLOAD_FAILED;LOW;Image upload failed;linux\devices\startracker\StrHelper.h
-12504;0x30d8;FLASH_WRITE_SUCCESSFUL;LOW;Finished flash write procedure successfully;linux/devices/startracker/StrHelper.h
+12501;0x30d5;IMAGE_DOWNLOAD_FAILED;LOW;Image download failed;linux\devices\startracker\StrHelper.h
-12505;0x30d9;FLASH_READ_SUCCESSFUL;LOW;Finished flash read procedure successfully;linux/devices/startracker/StrHelper.h
+12502;0x30d6;IMAGE_UPLOAD_SUCCESSFUL;LOW;Uploading image to star tracker was successfulop;linux\devices\startracker\StrHelper.h
-12506;0x30da;FLASH_READ_FAILED;LOW;Flash read procedure failed;linux/devices/startracker/StrHelper.h
+12503;0x30d7;IMAGE_DOWNLOAD_SUCCESSFUL;LOW;Image download was successful;linux\devices\startracker\StrHelper.h
-12507;0x30db;FIRMWARE_UPDATE_SUCCESSFUL;LOW;Firmware update was successful;linux/devices/startracker/StrHelper.h
+12504;0x30d8;FLASH_WRITE_SUCCESSFUL;LOW;Finished flash write procedure successfully;linux\devices\startracker\StrHelper.h
-12508;0x30dc;FIRMWARE_UPDATE_FAILED;LOW;Firmware update failed;linux/devices/startracker/StrHelper.h
+12505;0x30d9;FLASH_READ_SUCCESSFUL;LOW;Finished flash read procedure successfully;linux\devices\startracker\StrHelper.h
-12509;0x30dd;STR_HELPER_READING_REPLY_FAILED;LOW;Failed to read communication interface reply data P1: Return code of failed communication interface read call P1: Upload/download position for which the read call failed;linux/devices/startracker/StrHelper.h
+12506;0x30da;FLASH_READ_FAILED;LOW;Flash read procedure failed;linux\devices\startracker\StrHelper.h
-12510;0x30de;STR_HELPER_COM_ERROR;LOW;Unexpected stop of decoding sequence P1: Return code of failed communication interface read call P1: Upload/download position for which the read call failed;linux/devices/startracker/StrHelper.h
+12507;0x30db;FIRMWARE_UPDATE_SUCCESSFUL;LOW;Firmware update was successful;linux\devices\startracker\StrHelper.h
-12511;0x30df;STR_HELPER_NO_REPLY;LOW;Star tracker did not send replies (maybe device is powered off) P1: Position of upload or download packet for which no reply was sent;linux/devices/startracker/StrHelper.h
+12508;0x30dc;FIRMWARE_UPDATE_FAILED;LOW;Firmware update failed;linux\devices\startracker\StrHelper.h
-12512;0x30e0;STR_HELPER_DEC_ERROR;LOW;Error during decoding of received reply occurred P1: Return value of decoding function P2: Position of upload/download packet, or address of flash write/read request;linux/devices/startracker/StrHelper.h
+12509;0x30dd;STR_HELPER_READING_REPLY_FAILED;LOW;Failed to read communication interface reply data P1: Return code of failed communication interface read call P1: Upload/download position for which the read call failed;linux\devices\startracker\StrHelper.h
-12513;0x30e1;POSITION_MISMATCH;LOW;Position mismatch P1: The expected position and thus the position for which the image upload/download failed;linux/devices/startracker/StrHelper.h
+12510;0x30de;STR_HELPER_COM_ERROR;LOW;Unexpected stop of decoding sequence P1: Return code of failed communication interface read call P1: Upload/download position for which the read call failed;linux\devices\startracker\StrHelper.h
-12514;0x30e2;STR_HELPER_FILE_NOT_EXISTS;LOW;Specified file does not exist P1: Internal state of str helper;linux/devices/startracker/StrHelper.h
+12511;0x30df;STR_HELPER_NO_REPLY;LOW;Star tracker did not send replies (maybe device is powered off) P1: Position of upload or download packet for which no reply was sent;linux\devices\startracker\StrHelper.h
-12515;0x30e3;STR_HELPER_SENDING_PACKET_FAILED;LOW;;linux/devices/startracker/StrHelper.h
+12512;0x30e0;STR_HELPER_DEC_ERROR;LOW;Error during decoding of received reply occurred P1: Return value of decoding function P2: Position of upload/download packet, or address of flash write/read request;linux\devices\startracker\StrHelper.h
-12516;0x30e4;STR_HELPER_REQUESTING_MSG_FAILED;LOW;;linux/devices/startracker/StrHelper.h
+12513;0x30e1;POSITION_MISMATCH;LOW;Position mismatch P1: The expected position and thus the position for which the image upload/download failed;linux\devices\startracker\StrHelper.h
-12600;0x3138;MPSOC_FLASH_WRITE_FAILED;LOW;Flash write fails;linux/devices/ploc/PlocMPSoCHelper.h
+12514;0x30e2;STR_HELPER_FILE_NOT_EXISTS;LOW;Specified file does not exist P1: Internal state of str helper;linux\devices\startracker\StrHelper.h
-12601;0x3139;MPSOC_FLASH_WRITE_SUCCESSFUL;LOW;Flash write successful;linux/devices/ploc/PlocMPSoCHelper.h
+12515;0x30e3;STR_HELPER_SENDING_PACKET_FAILED;LOW;;linux\devices\startracker\StrHelper.h
-12602;0x313a;MPSOC_SENDING_COMMAND_FAILED;LOW;;linux/devices/ploc/PlocMPSoCHelper.h
+12516;0x30e4;STR_HELPER_REQUESTING_MSG_FAILED;LOW;;linux\devices\startracker\StrHelper.h
-12603;0x313b;MPSOC_HELPER_REQUESTING_REPLY_FAILED;LOW;Request receive message of communication interface failed P1: Return value returned by the communication interface requestReceiveMessage function P2: Internal state of MPSoC helper;linux/devices/ploc/PlocMPSoCHelper.h
+12600;0x3138;MPSOC_FLASH_WRITE_FAILED;LOW;Flash write fails;linux\devices\ploc\PlocMPSoCHelper.h
-12604;0x313c;MPSOC_HELPER_READING_REPLY_FAILED;LOW;Reading receive message of communication interface failed P1: Return value returned by the communication interface readingReceivedMessage function P2: Internal state of MPSoC helper;linux/devices/ploc/PlocMPSoCHelper.h
+12601;0x3139;MPSOC_FLASH_WRITE_SUCCESSFUL;LOW;Flash write successful;linux\devices\ploc\PlocMPSoCHelper.h
-12605;0x313d;MPSOC_MISSING_ACK;LOW;Did not receive acknowledgment report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/devices/ploc/PlocMPSoCHelper.h
+12602;0x313a;MPSOC_SENDING_COMMAND_FAILED;LOW;;linux\devices\ploc\PlocMPSoCHelper.h
-12606;0x313e;MPSOC_MISSING_EXE;LOW;Did not receive execution report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/devices/ploc/PlocMPSoCHelper.h
+12603;0x313b;MPSOC_HELPER_REQUESTING_REPLY_FAILED;LOW;Request receive message of communication interface failed P1: Return value returned by the communication interface requestReceiveMessage function P2: Internal state of MPSoC helper;linux\devices\ploc\PlocMPSoCHelper.h
-12607;0x313f;MPSOC_ACK_FAILURE_REPORT;LOW;Received acknowledgment failure report P1: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h
+12604;0x313c;MPSOC_HELPER_READING_REPLY_FAILED;LOW;Reading receive message of communication interface failed P1: Return value returned by the communication interface readingReceivedMessage function P2: Internal state of MPSoC helper;linux\devices\ploc\PlocMPSoCHelper.h
-12608;0x3140;MPSOC_EXE_FAILURE_REPORT;LOW;Received execution failure report P1: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h
+12605;0x313d;MPSOC_MISSING_ACK;LOW;Did not receive acknowledgment report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux\devices\ploc\PlocMPSoCHelper.h
-12609;0x3141;MPSOC_ACK_INVALID_APID;LOW;Expected acknowledgment report but received space packet with other apid P1: Apid of received space packet P2: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h
+12606;0x313e;MPSOC_MISSING_EXE;LOW;Did not receive execution report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux\devices\ploc\PlocMPSoCHelper.h
-12610;0x3142;MPSOC_EXE_INVALID_APID;LOW;Expected execution report but received space packet with other apid P1: Apid of received space packet P2: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h
+12607;0x313f;MPSOC_ACK_FAILURE_REPORT;LOW;Received acknowledgment failure report P1: Internal state of MPSoC;linux\devices\ploc\PlocMPSoCHelper.h
-12611;0x3143;MPSOC_HELPER_SEQ_CNT_MISMATCH;LOW;Received sequence count does not match expected sequence count P1: Expected sequence count P2: Received sequence count;linux/devices/ploc/PlocMPSoCHelper.h
+12608;0x3140;MPSOC_EXE_FAILURE_REPORT;LOW;Received execution failure report P1: Internal state of MPSoC;linux\devices\ploc\PlocMPSoCHelper.h
-12700;0x319c;TRANSITION_BACK_TO_OFF;MEDIUM;Could not transition properly and went back to ALL OFF;mission/devices/PayloadPcduHandler.h
+12609;0x3141;MPSOC_ACK_INVALID_APID;LOW;Expected acknowledgment report but received space packet with other apid P1: Apid of received space packet P2: Internal state of MPSoC;linux\devices\ploc\PlocMPSoCHelper.h
-12701;0x319d;NEG_V_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
+12610;0x3142;MPSOC_EXE_INVALID_APID;LOW;Expected execution report but received space packet with other apid P1: Apid of received space packet P2: Internal state of MPSoC;linux\devices\ploc\PlocMPSoCHelper.h
-12702;0x319e;U_DRO_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
+12611;0x3143;MPSOC_HELPER_SEQ_CNT_MISMATCH;LOW;Received sequence count does not match expected sequence count P1: Expected sequence count P2: Received sequence count;linux\devices\ploc\PlocMPSoCHelper.h
-12703;0x319f;I_DRO_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
+12700;0x319c;TRANSITION_BACK_TO_OFF;MEDIUM;Could not transition properly and went back to ALL OFF;mission\devices\PayloadPcduHandler.h
-12704;0x31a0;U_X8_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
+12701;0x319d;NEG_V_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission\devices\PayloadPcduHandler.h
-12705;0x31a1;I_X8_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
+12702;0x319e;U_DRO_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission\devices\PayloadPcduHandler.h
-12706;0x31a2;U_TX_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
+12703;0x319f;I_DRO_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission\devices\PayloadPcduHandler.h
-12707;0x31a3;I_TX_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
+12704;0x31a0;U_X8_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission\devices\PayloadPcduHandler.h
-12708;0x31a4;U_MPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
+12705;0x31a1;I_X8_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission\devices\PayloadPcduHandler.h
-12709;0x31a5;I_MPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
+12706;0x31a2;U_TX_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission\devices\PayloadPcduHandler.h
-12710;0x31a6;U_HPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
+12707;0x31a3;I_TX_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission\devices\PayloadPcduHandler.h
-12711;0x31a7;I_HPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
+12708;0x31a4;U_MPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission\devices\PayloadPcduHandler.h
-12800;0x3200;TRANSITION_OTHER_SIDE_FAILED;HIGH;;mission/system/AcsBoardAssembly.h
+12709;0x31a5;I_MPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission\devices\PayloadPcduHandler.h
-12801;0x3201;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;;mission/system/AcsBoardAssembly.h
+12710;0x31a6;U_HPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission\devices\PayloadPcduHandler.h
-12802;0x3202;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;;mission/system/AcsBoardAssembly.h
+12711;0x31a7;I_HPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission\devices\PayloadPcduHandler.h
-12803;0x3203;SIDE_SWITCH_TRANSITION_NOT_ALLOWED;LOW;Not implemented, would increase already high complexity. Operator should instead command the assembly off first and then command the assembly on into the desired mode/submode combination;mission/system/AcsBoardAssembly.h
+12800;0x3200;TRANSITION_OTHER_SIDE_FAILED;HIGH;;mission\system\AcsBoardAssembly.h
-12900;0x3264;TRANSITION_OTHER_SIDE_FAILED;HIGH;;mission/system/SusAssembly.h
+12801;0x3201;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;;mission\system\AcsBoardAssembly.h
-12901;0x3265;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;;mission/system/SusAssembly.h
+12802;0x3202;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;;mission\system\AcsBoardAssembly.h
-12902;0x3266;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;;mission/system/SusAssembly.h
+12803;0x3203;SIDE_SWITCH_TRANSITION_NOT_ALLOWED;LOW;Not implemented, would increase already high complexity. Operator should instead command the assembly off first and then command the assembly on into the desired mode/submode combination;mission\system\AcsBoardAssembly.h
-12903;0x3267;SIDE_SWITCH_TRANSITION_NOT_ALLOWED;LOW;Not implemented, would increase already high complexity. Operator should instead command the assembly off first and then command the assembly on into the desired mode/submode combination;mission/system/SusAssembly.h
+12900;0x3264;TRANSITION_OTHER_SIDE_FAILED;HIGH;;mission\system\SusAssembly.h
-13000;0x32c8;CHILDREN_LOST_MODE;MEDIUM;;mission/system/TcsBoardAssembly.h
+12901;0x3265;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;;mission\system\SusAssembly.h
-13100;0x332c;GPS_FIX_CHANGE;INFO;Fix has changed. P1: Old fix. P2: New fix 0: Not seen, 1: No Fix, 2: 2D-Fix, 3: 3D-Fix;mission/devices/devicedefinitions/GPSDefinitions.h
+12902;0x3266;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;;mission\system\SusAssembly.h
-13200;0x3390;P60_BOOT_COUNT;INFO;P60 boot count is broadcasted once at SW startup. P1: Boot count;mission/devices/P60DockHandler.h
+12903;0x3267;SIDE_SWITCH_TRANSITION_NOT_ALLOWED;LOW;Not implemented, would increase already high complexity. Operator should instead command the assembly off first and then command the assembly on into the desired mode/submode combination;mission\system\SusAssembly.h
-13201;0x3391;BATT_MODE;INFO;Battery mode is broadcasted at startup. P1: Mode;mission/devices/P60DockHandler.h
+13000;0x32c8;CHILDREN_LOST_MODE;MEDIUM;;mission\system\TcsBoardAssembly.h
-13202;0x3392;BATT_MODE_CHANGED;MEDIUM;Battery mode has changed. P1: Old mode. P2: New mode;mission/devices/P60DockHandler.h
+13100;0x332c;GPS_FIX_CHANGE;INFO;Fix has changed. P1: Old fix. P2: New fix 0: Not seen, 1: No Fix, 2: 2D-Fix, 3: 3D-Fix;mission\devices\devicedefinitions\GPSDefinitions.h
-13600;0x3520;SUPV_UPDATE_FAILED;LOW;update failed;linux/devices/ploc/PlocSupvHelper.h
+13200;0x3390;P60_BOOT_COUNT;INFO;P60 boot count is broadcasted once at SW startup. P1: Boot count;mission\devices\P60DockHandler.h
-13601;0x3521;SUPV_UPDATE_SUCCESSFUL;LOW;update successful;linux/devices/ploc/PlocSupvHelper.h
+13201;0x3391;BATT_MODE;INFO;Battery mode is broadcasted at startup. P1: Mode;mission\devices\P60DockHandler.h
-13602;0x3522;TERMINATED_UPDATE_PROCEDURE;LOW;Terminated update procedure by command;linux/devices/ploc/PlocSupvHelper.h
+13202;0x3392;BATT_MODE_CHANGED;MEDIUM;Battery mode has changed. P1: Old mode. P2: New mode;mission\devices\P60DockHandler.h
-13603;0x3523;SUPV_EVENT_BUFFER_REQUEST_SUCCESSFUL;LOW;Requesting event buffer was successful;linux/devices/ploc/PlocSupvHelper.h
+13600;0x3520;SUPV_UPDATE_FAILED;LOW;update failed;linux\devices\ploc\PlocSupvHelper.h
-13604;0x3524;SUPV_EVENT_BUFFER_REQUEST_FAILED;LOW;Requesting event buffer failed;linux/devices/ploc/PlocSupvHelper.h
+13601;0x3521;SUPV_UPDATE_SUCCESSFUL;LOW;update successful;linux\devices\ploc\PlocSupvHelper.h
-13605;0x3525;SUPV_EVENT_BUFFER_REQUEST_TERMINATED;LOW;Terminated event buffer request by command P1: Number of packets read before process was terminated;linux/devices/ploc/PlocSupvHelper.h
+13602;0x3522;SUPV_CONTINUE_UPDATE_FAILED;LOW;Continue update command failed;linux\devices\ploc\PlocSupvHelper.h
-13606;0x3526;SUPV_SENDING_COMMAND_FAILED;LOW;;linux/devices/ploc/PlocSupvHelper.h
+13603;0x3523;SUPV_CONTINUE_UPDATE_SUCCESSFUL;LOW;Continue update command successful;linux\devices\ploc\PlocSupvHelper.h
-13607;0x3527;SUPV_HELPER_REQUESTING_REPLY_FAILED;LOW;Request receive message of communication interface failed P1: Return value returned by the communication interface requestReceiveMessage function P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvHelper.h
+13604;0x3524;TERMINATED_UPDATE_PROCEDURE;LOW;Terminated update procedure by command;linux\devices\ploc\PlocSupvHelper.h
-13608;0x3528;SUPV_HELPER_READING_REPLY_FAILED;LOW;Reading receive message of communication interface failed P1: Return value returned by the communication interface readingReceivedMessage function P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvHelper.h
+13605;0x3525;SUPV_EVENT_BUFFER_REQUEST_SUCCESSFUL;LOW;Requesting event buffer was successful;linux\devices\ploc\PlocSupvHelper.h
-13609;0x3529;SUPV_MISSING_ACK;LOW;Did not receive acknowledgement report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/devices/ploc/PlocSupvHelper.h
+13606;0x3526;SUPV_EVENT_BUFFER_REQUEST_FAILED;LOW;Requesting event buffer failed;linux\devices\ploc\PlocSupvHelper.h
-13610;0x352a;SUPV_MISSING_EXE;LOW;Supervisor did not receive execution report P1: Number of bytes missing P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvHelper.h
+13607;0x3527;SUPV_EVENT_BUFFER_REQUEST_TERMINATED;LOW;Terminated event buffer request by command P1: Number of packets read before process was terminated;linux\devices\ploc\PlocSupvHelper.h
-13611;0x352b;SUPV_ACK_FAILURE_REPORT;LOW;Supervisor received acknowledgment failure report P1: Internal state of supervisor helper;linux/devices/ploc/PlocSupvHelper.h
+13608;0x3528;SUPV_SENDING_COMMAND_FAILED;LOW;;linux\devices\ploc\PlocSupvHelper.h
-13612;0x352c;SUPV_EXE_FAILURE_REPORT;LOW;Execution report failure P1:;linux/devices/ploc/PlocSupvHelper.h
+13609;0x3529;SUPV_HELPER_REQUESTING_REPLY_FAILED;LOW;Request receive message of communication interface failed P1: Return value returned by the communication interface requestReceiveMessage function P2: Internal state of supervisor helper;linux\devices\ploc\PlocSupvHelper.h
-13613;0x352d;SUPV_ACK_INVALID_APID;LOW;Supervisor expected acknowledgment report but received space packet with other apid P1: Apid of received space packet P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvHelper.h
+13610;0x352a;SUPV_HELPER_READING_REPLY_FAILED;LOW;Reading receive message of communication interface failed P1: Return value returned by the communication interface readingReceivedMessage function P2: Internal state of supervisor helper;linux\devices\ploc\PlocSupvHelper.h
-13614;0x352e;SUPV_EXE_INVALID_APID;LOW;Supervisor helper expected execution report but received space packet with other apid P1: Apid of received space packet P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvHelper.h
+13611;0x352b;SUPV_MISSING_ACK;LOW;Did not receive acknowledgement report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux\devices\ploc\PlocSupvHelper.h
-13615;0x352f;ACK_RECEPTION_FAILURE;LOW;Failed to receive acknowledgment report P1: Return value P2: Apid of command for which the reception of the acknowledgment report failed;linux/devices/ploc/PlocSupvHelper.h
+13612;0x352c;SUPV_MISSING_EXE;LOW;Supervisor did not receive execution report P1: Number of bytes missing P2: Internal state of supervisor helper;linux\devices\ploc\PlocSupvHelper.h
-13616;0x3530;EXE_RECEPTION_FAILURE;LOW;Failed to receive execution report P1: Return value P2: Apid of command for which the reception of the execution report failed;linux/devices/ploc/PlocSupvHelper.h
+13613;0x352d;SUPV_ACK_FAILURE_REPORT;LOW;Supervisor received acknowledgment failure report P1: Internal state of supervisor helper;linux\devices\ploc\PlocSupvHelper.h
-13700;0x3584;ALLOC_FAILURE;MEDIUM;;bsp_q7s/core/CoreController.h
+13614;0x352e;SUPV_EXE_FAILURE_REPORT;LOW;Execution report failure P1:;linux\devices\ploc\PlocSupvHelper.h
-13701;0x3585;REBOOT_SW;MEDIUM; Software reboot occurred. Can also be a systemd reboot. P1: Current Chip, P2: Current Copy;bsp_q7s/core/CoreController.h
+13615;0x352f;SUPV_ACK_INVALID_APID;LOW;Supervisor expected acknowledgment report but received space packet with other apid P1: Apid of received space packet P2: Internal state of supervisor helper;linux\devices\ploc\PlocSupvHelper.h
-13702;0x3586;REBOOT_MECHANISM_TRIGGERED;MEDIUM;The reboot mechanism was triggered. P1: First 16 bits: Last Chip, Last 16 bits: Last Copy, P2: Each byte is the respective reboot count for the slots;bsp_q7s/core/CoreController.h
+13616;0x3530;SUPV_EXE_INVALID_APID;LOW;Supervisor helper expected execution report but received space packet with other apid P1: Apid of received space packet P2: Internal state of supervisor helper;linux\devices\ploc\PlocSupvHelper.h
-13703;0x3587;REBOOT_HW;MEDIUM;;bsp_q7s/core/CoreController.h
+13617;0x3531;ACK_RECEPTION_FAILURE;LOW;Failed to receive acknowledgment report P1: Return value P2: Apid of command for which the reception of the acknowledgment report failed;linux\devices\ploc\PlocSupvHelper.h
+13618;0x3532;EXE_RECEPTION_FAILURE;LOW;Failed to receive execution report P1: Return value P2: Apid of command for which the reception of the execution report failed;linux\devices\ploc\PlocSupvHelper.h
+13619;0x3533;WRITE_MEMORY_FAILED;LOW;Update procedure failed when sending packet with number P1 P1: Packet number for which the memory write command fails;linux\devices\ploc\PlocSupvHelper.h
+13700;0x3584;ALLOC_FAILURE;MEDIUM;;bsp_q7s\core\CoreController.h
+13701;0x3585;REBOOT_SW;MEDIUM; Software reboot occurred. Can also be a systemd reboot. P1: Current Chip, P2: Current Copy;bsp_q7s\core\CoreController.h
+13702;0x3586;REBOOT_MECHANISM_TRIGGERED;MEDIUM;The reboot mechanism was triggered. P1: First 16 bits: Last Chip, Last 16 bits: Last Copy, P2: Each byte is the respective reboot count for the slots;bsp_q7s\core\CoreController.h
+13703;0x3587;REBOOT_HW;MEDIUM;;bsp_q7s\core\CoreController.h

generators/bsp_q7s_objects.csv

@@ -37,9 +37,12 @@
 0x44260000;BPX_BATT_HANDLER
 0x44300000;PLPCDU_HANDLER
 0x443200A5;RAD_SENSOR
+0x44330000;PLOC_UPDATER
 0x44330001;PLOC_MEMORY_DUMPER
 0x44330002;STR_HELPER
 0x44330003;PLOC_MPSOC_HELPER
+0x44330004;AXI_PTME_CONFIG
+0x44330005;PTME_CONFIG
 0x44330015;PLOC_MPSOC_HANDLER
 0x44330016;PLOC_SUPERVISOR_HANDLER
 0x44330017;PLOC_SUPERVISOR_HELPER
@@ -68,6 +71,7 @@
 0x49010005;GPIO_IF
 0x49020004;SPI_MAIN_COM_IF
 0x49020005;SPI_RW_COM_IF
+0x49020006;SPI_RTD_COM_IF
 0x49030003;UART_COM_IF
 0x49040002;I2C_COM_IF
 0x49050001;CSP_COM_IF
@@ -88,6 +92,7 @@
 0x53000005;PUS_SERVICE_5_EVENT_REPORTING
 0x53000008;PUS_SERVICE_8_FUNCTION_MGMT
 0x53000009;PUS_SERVICE_9_TIME_MGMT
+0x53000011;PUS_SERVICE_11_TC_SCHEDULER
 0x53000017;PUS_SERVICE_17_TEST
 0x53000020;PUS_SERVICE_20_PARAMETERS
 0x53000200;PUS_SERVICE_200_MODE_MGMT
@@ -109,6 +114,14 @@
 0x5400CAFE;DUMMY_INTERFACE
 0x54123456;LIBGPIOD_TEST
 0x54694269;TEST_TASK
+0x60000000;HEATER_0_PLOC_PROC_BRD
+0x60000001;HEATER_1_PCDU_BRD
+0x60000002;HEATER_2_ACS_BRD
+0x60000003;HEATER_3_OBC_BRD
+0x60000004;HEATER_4_CAMERA
+0x60000005;HEATER_5_STR
+0x60000006;HEATER_6_DRO
+0x60000007;HEATER_7_HPA
 0x73000001;ACS_BOARD_ASS
 0x73000002;SUS_BOARD_ASS
 0x73000003;TCS_BOARD_ASS

generators/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
- * @brief    Auto-generated event translation file. Contains 200 translations.
+ * @brief    Auto-generated event translation file. Contains 206 translations.
  * @details
- * Generated on: 2022-05-11 17:58:22
+ * Generated on: 2022-05-23 16:46:55
  */
 #include "translateEvents.h"
 
@@ -90,9 +90,12 @@ 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 *HEATER_WENT_ON_STRING = "HEATER_WENT_ON";
+const char *HEATER_WENT_OFF_STRING = "HEATER_WENT_OFF";
 const char *SWITCH_ALREADY_ON_STRING = "SWITCH_ALREADY_ON";
 const char *SWITCH_ALREADY_OFF_STRING = "SWITCH_ALREADY_OFF";
 const char *MAIN_SWITCH_TIMEOUT_STRING = "MAIN_SWITCH_TIMEOUT";
+const char *FAULTY_HEATER_WAS_ON_STRING = "FAULTY_HEATER_WAS_ON";
 const char *MAIN_SWITCH_ON_TIMEOUT_STRING = "MAIN_SWITCH_ON_TIMEOUT";
 const char *MAIN_SWITCH_OFF_TIMEOUT_STRING = "MAIN_SWITCH_OFF_TIMEOUT";
 const char *DEPLOYMENT_FAILED_STRING = "DEPLOYMENT_FAILED";
@@ -182,6 +185,8 @@ const char *BATT_MODE_STRING = "BATT_MODE";
 const char *BATT_MODE_CHANGED_STRING = "BATT_MODE_CHANGED";
 const char *SUPV_UPDATE_FAILED_STRING = "SUPV_UPDATE_FAILED";
 const char *SUPV_UPDATE_SUCCESSFUL_STRING = "SUPV_UPDATE_SUCCESSFUL";
+const char *SUPV_CONTINUE_UPDATE_FAILED_STRING = "SUPV_CONTINUE_UPDATE_FAILED";
+const char *SUPV_CONTINUE_UPDATE_SUCCESSFUL_STRING = "SUPV_CONTINUE_UPDATE_SUCCESSFUL";
 const char *TERMINATED_UPDATE_PROCEDURE_STRING = "TERMINATED_UPDATE_PROCEDURE";
 const char *SUPV_EVENT_BUFFER_REQUEST_SUCCESSFUL_STRING = "SUPV_EVENT_BUFFER_REQUEST_SUCCESSFUL";
 const char *SUPV_EVENT_BUFFER_REQUEST_FAILED_STRING = "SUPV_EVENT_BUFFER_REQUEST_FAILED";
@@ -197,6 +202,7 @@ const char *SUPV_ACK_INVALID_APID_STRING = "SUPV_ACK_INVALID_APID";
 const char *SUPV_EXE_INVALID_APID_STRING = "SUPV_EXE_INVALID_APID";
 const char *ACK_RECEPTION_FAILURE_STRING = "ACK_RECEPTION_FAILURE";
 const char *EXE_RECEPTION_FAILURE_STRING = "EXE_RECEPTION_FAILURE";
+const char *WRITE_MEMORY_FAILED_STRING = "WRITE_MEMORY_FAILED";
 const char *ALLOC_FAILURE_STRING = "ALLOC_FAILURE";
 const char *REBOOT_SW_STRING = "REBOOT_SW";
 const char *REBOOT_MECHANISM_TRIGGERED_STRING = "REBOOT_MECHANISM_TRIGGERED";
@@ -375,11 +381,17 @@ const char *translateEvents(Event event) {
     case (11401):
       return GPIO_PULL_LOW_FAILED_STRING;
     case (11402):
-      return SWITCH_ALREADY_ON_STRING;
+      return HEATER_WENT_ON_STRING;
     case (11403):
-      return SWITCH_ALREADY_OFF_STRING;
+      return HEATER_WENT_OFF_STRING;
     case (11404):
+      return SWITCH_ALREADY_ON_STRING;
+    case (11405):
+      return SWITCH_ALREADY_OFF_STRING;
+    case (11406):
       return MAIN_SWITCH_TIMEOUT_STRING;
+    case (11407):
+      return FAULTY_HEATER_WAS_ON_STRING;
     case (11500):
       return MAIN_SWITCH_ON_TIMEOUT_STRING;
     case (11501):
@@ -559,35 +571,41 @@ const char *translateEvents(Event event) {
     case (13601):
       return SUPV_UPDATE_SUCCESSFUL_STRING;
     case (13602):
-      return TERMINATED_UPDATE_PROCEDURE_STRING;
+      return SUPV_CONTINUE_UPDATE_FAILED_STRING;
     case (13603):
-      return SUPV_EVENT_BUFFER_REQUEST_SUCCESSFUL_STRING;
+      return SUPV_CONTINUE_UPDATE_SUCCESSFUL_STRING;
     case (13604):
-      return SUPV_EVENT_BUFFER_REQUEST_FAILED_STRING;
+      return TERMINATED_UPDATE_PROCEDURE_STRING;
     case (13605):
-      return SUPV_EVENT_BUFFER_REQUEST_TERMINATED_STRING;
+      return SUPV_EVENT_BUFFER_REQUEST_SUCCESSFUL_STRING;
     case (13606):
-      return SUPV_SENDING_COMMAND_FAILED_STRING;
+      return SUPV_EVENT_BUFFER_REQUEST_FAILED_STRING;
     case (13607):
-      return SUPV_HELPER_REQUESTING_REPLY_FAILED_STRING;
+      return SUPV_EVENT_BUFFER_REQUEST_TERMINATED_STRING;
     case (13608):
-      return SUPV_HELPER_READING_REPLY_FAILED_STRING;
+      return SUPV_SENDING_COMMAND_FAILED_STRING;
     case (13609):
-      return SUPV_MISSING_ACK_STRING;
+      return SUPV_HELPER_REQUESTING_REPLY_FAILED_STRING;
     case (13610):
-      return SUPV_MISSING_EXE_STRING;
+      return SUPV_HELPER_READING_REPLY_FAILED_STRING;
     case (13611):
-      return SUPV_ACK_FAILURE_REPORT_STRING;
+      return SUPV_MISSING_ACK_STRING;
     case (13612):
-      return SUPV_EXE_FAILURE_REPORT_STRING;
+      return SUPV_MISSING_EXE_STRING;
     case (13613):
-      return SUPV_ACK_INVALID_APID_STRING;
+      return SUPV_ACK_FAILURE_REPORT_STRING;
     case (13614):
-      return SUPV_EXE_INVALID_APID_STRING;
+      return SUPV_EXE_FAILURE_REPORT_STRING;
     case (13615):
-      return ACK_RECEPTION_FAILURE_STRING;
+      return SUPV_ACK_INVALID_APID_STRING;
     case (13616):
+      return SUPV_EXE_INVALID_APID_STRING;
+    case (13617):
+      return ACK_RECEPTION_FAILURE_STRING;
+    case (13618):
       return EXE_RECEPTION_FAILURE_STRING;
+    case (13619):
+      return WRITE_MEMORY_FAILED_STRING;
     case (13700):
       return ALLOC_FAILURE_STRING;
     case (13701):

generators/objects/translateObjects.cpp

@@ -1,8 +1,8 @@
 /**
  * @brief  Auto-generated object translation file.
  * @details
- * Contains 118 translations.
+ * Contains 131 translations.
- * Generated on: 2022-05-11 17:58:22
+ * Generated on: 2022-05-23 16:46:58
  */
 #include "translateObjects.h"
 
@@ -45,9 +45,12 @@ const char *ACU_HANDLER_STRING = "ACU_HANDLER";
 const char *BPX_BATT_HANDLER_STRING = "BPX_BATT_HANDLER";
 const char *PLPCDU_HANDLER_STRING = "PLPCDU_HANDLER";
 const char *RAD_SENSOR_STRING = "RAD_SENSOR";
+const char *PLOC_UPDATER_STRING = "PLOC_UPDATER";
 const char *PLOC_MEMORY_DUMPER_STRING = "PLOC_MEMORY_DUMPER";
 const char *STR_HELPER_STRING = "STR_HELPER";
 const char *PLOC_MPSOC_HELPER_STRING = "PLOC_MPSOC_HELPER";
+const char *AXI_PTME_CONFIG_STRING = "AXI_PTME_CONFIG";
+const char *PTME_CONFIG_STRING = "PTME_CONFIG";
 const char *PLOC_MPSOC_HANDLER_STRING = "PLOC_MPSOC_HANDLER";
 const char *PLOC_SUPERVISOR_HANDLER_STRING = "PLOC_SUPERVISOR_HANDLER";
 const char *PLOC_SUPERVISOR_HELPER_STRING = "PLOC_SUPERVISOR_HELPER";
@@ -76,6 +79,7 @@ const char *ARDUINO_COM_IF_STRING = "ARDUINO_COM_IF";
 const char *GPIO_IF_STRING = "GPIO_IF";
 const char *SPI_MAIN_COM_IF_STRING = "SPI_MAIN_COM_IF";
 const char *SPI_RW_COM_IF_STRING = "SPI_RW_COM_IF";
+const char *SPI_RTD_COM_IF_STRING = "SPI_RTD_COM_IF";
 const char *UART_COM_IF_STRING = "UART_COM_IF";
 const char *I2C_COM_IF_STRING = "I2C_COM_IF";
 const char *CSP_COM_IF_STRING = "CSP_COM_IF";
@@ -96,6 +100,7 @@ const char *PUS_SERVICE_3_HOUSEKEEPING_STRING = "PUS_SERVICE_3_HOUSEKEEPING";
 const char *PUS_SERVICE_5_EVENT_REPORTING_STRING = "PUS_SERVICE_5_EVENT_REPORTING";
 const char *PUS_SERVICE_8_FUNCTION_MGMT_STRING = "PUS_SERVICE_8_FUNCTION_MGMT";
 const char *PUS_SERVICE_9_TIME_MGMT_STRING = "PUS_SERVICE_9_TIME_MGMT";
+const char *PUS_SERVICE_11_TC_SCHEDULER_STRING = "PUS_SERVICE_11_TC_SCHEDULER";
 const char *PUS_SERVICE_17_TEST_STRING = "PUS_SERVICE_17_TEST";
 const char *PUS_SERVICE_20_PARAMETERS_STRING = "PUS_SERVICE_20_PARAMETERS";
 const char *PUS_SERVICE_200_MODE_MGMT_STRING = "PUS_SERVICE_200_MODE_MGMT";
@@ -117,6 +122,14 @@ const char *DUMMY_HANDLER_STRING = "DUMMY_HANDLER";
 const char *DUMMY_INTERFACE_STRING = "DUMMY_INTERFACE";
 const char *LIBGPIOD_TEST_STRING = "LIBGPIOD_TEST";
 const char *TEST_TASK_STRING = "TEST_TASK";
+const char *HEATER_0_PLOC_PROC_BRD_STRING = "HEATER_0_PLOC_PROC_BRD";
+const char *HEATER_1_PCDU_BRD_STRING = "HEATER_1_PCDU_BRD";
+const char *HEATER_2_ACS_BRD_STRING = "HEATER_2_ACS_BRD";
+const char *HEATER_3_OBC_BRD_STRING = "HEATER_3_OBC_BRD";
+const char *HEATER_4_CAMERA_STRING = "HEATER_4_CAMERA";
+const char *HEATER_5_STR_STRING = "HEATER_5_STR";
+const char *HEATER_6_DRO_STRING = "HEATER_6_DRO";
+const char *HEATER_7_HPA_STRING = "HEATER_7_HPA";
 const char *ACS_BOARD_ASS_STRING = "ACS_BOARD_ASS";
 const char *SUS_BOARD_ASS_STRING = "SUS_BOARD_ASS";
 const char *TCS_BOARD_ASS_STRING = "TCS_BOARD_ASS";
@@ -205,12 +218,18 @@ const char *translateObject(object_id_t object) {
       return PLPCDU_HANDLER_STRING;
     case 0x443200A5:
       return RAD_SENSOR_STRING;
+    case 0x44330000:
+      return PLOC_UPDATER_STRING;
     case 0x44330001:
       return PLOC_MEMORY_DUMPER_STRING;
     case 0x44330002:
       return STR_HELPER_STRING;
     case 0x44330003:
       return PLOC_MPSOC_HELPER_STRING;
+    case 0x44330004:
+      return AXI_PTME_CONFIG_STRING;
+    case 0x44330005:
+      return PTME_CONFIG_STRING;
     case 0x44330015:
       return PLOC_MPSOC_HANDLER_STRING;
     case 0x44330016:
@@ -267,6 +286,8 @@ const char *translateObject(object_id_t object) {
       return SPI_MAIN_COM_IF_STRING;
     case 0x49020005:
       return SPI_RW_COM_IF_STRING;
+    case 0x49020006:
+      return SPI_RTD_COM_IF_STRING;
     case 0x49030003:
       return UART_COM_IF_STRING;
     case 0x49040002:
@@ -307,6 +328,8 @@ const char *translateObject(object_id_t object) {
       return PUS_SERVICE_8_FUNCTION_MGMT_STRING;
     case 0x53000009:
       return PUS_SERVICE_9_TIME_MGMT_STRING;
+    case 0x53000011:
+      return PUS_SERVICE_11_TC_SCHEDULER_STRING;
     case 0x53000017:
       return PUS_SERVICE_17_TEST_STRING;
     case 0x53000020:
@@ -349,6 +372,22 @@ const char *translateObject(object_id_t object) {
       return LIBGPIOD_TEST_STRING;
     case 0x54694269:
       return TEST_TASK_STRING;
+    case 0x60000000:
+      return HEATER_0_PLOC_PROC_BRD_STRING;
+    case 0x60000001:
+      return HEATER_1_PCDU_BRD_STRING;
+    case 0x60000002:
+      return HEATER_2_ACS_BRD_STRING;
+    case 0x60000003:
+      return HEATER_3_OBC_BRD_STRING;
+    case 0x60000004:
+      return HEATER_4_CAMERA_STRING;
+    case 0x60000005:
+      return HEATER_5_STR_STRING;
+    case 0x60000006:
+      return HEATER_6_DRO_STRING;
+    case 0x60000007:
+      return HEATER_7_HPA_STRING;
     case 0x73000001:
       return ACS_BOARD_ASS_STRING;
     case 0x73000002:

linux/CMakeLists.txt

@@ -6,6 +6,4 @@ add_subdirectory(devices)
 add_subdirectory(fsfwconfig)
 add_subdirectory(obc)
 
-target_sources(${OBSW_NAME} PUBLIC
+target_sources(${OBSW_NAME} PUBLIC ObjectFactory.cpp)
-    ObjectFactory.cpp
-)

linux/ObjectFactory.cpp

@@ -7,6 +7,8 @@
 #include <fsfw_hal/linux/spi/SpiComIF.h>
 #include <fsfw_hal/linux/spi/SpiCookie.h>
 #include <linux/callbacks/gpioCallbacks.h>
+#include <linux/devices/Max31865RtdLowlevelHandler.h>
+#include <mission/devices/Max31865EiveHandler.h>
 #include <mission/devices/Max31865PT1000Handler.h>
 #include <mission/devices/SusHandler.h>
 #include <mission/system/SusAssembly.h>
@@ -189,7 +191,7 @@ void ObjectFactory::createSunSensorComponents(GpioIF* gpioComIF, SpiComIF* spiCo
 }
 
 void ObjectFactory::createRtdComponents(std::string spiDev, GpioIF* gpioComIF,
-                                        PowerSwitchIF* pwrSwitcher) {
+                                        PowerSwitchIF* pwrSwitcher, SpiComIF* comIF) {
   using namespace gpio;
   GpioCookie* rtdGpioCookie = new GpioCookie;
 
@@ -245,8 +247,8 @@ void ObjectFactory::createRtdComponents(std::string spiDev, GpioIF* gpioComIF,
   gpioChecker(gpioComIF->addGpios(rtdGpioCookie), "RTDs");
 
 #if OBSW_ADD_RTD_DEVICES == 1
-  static constexpr uint8_t NUMBER_RTDS = 16;
+  using namespace EiveMax31855;
-  std::array<std::pair<address_t, gpioId_t>, NUMBER_RTDS> cookieArgs = {{
+  std::array<std::pair<address_t, gpioId_t>, NUM_RTDS> cookieArgs = {{
       {addresses::RTD_IC_3, gpioIds::RTD_IC_3},
       {addresses::RTD_IC_4, gpioIds::RTD_IC_4},
       {addresses::RTD_IC_5, gpioIds::RTD_IC_5},
@@ -264,48 +266,52 @@ void ObjectFactory::createRtdComponents(std::string spiDev, GpioIF* gpioComIF,
       {addresses::RTD_IC_17, gpioIds::RTD_IC_17},
       {addresses::RTD_IC_18, gpioIds::RTD_IC_18},
   }};
-  std::array<object_id_t, NUMBER_RTDS> rtdIds = {objects::RTD_0_IC3_PLOC_HEATSPREADER,
+  // HSPD: Heatspreader
-                                                 objects::RTD_1_IC4_PLOC_MISSIONBOARD,
+  std::array<std::pair<object_id_t, std::string>, NUM_RTDS> rtdInfos = {{
-                                                 objects::RTD_2_IC5_4K_CAMERA,
+      {objects::RTD_0_IC3_PLOC_HEATSPREADER, "RTD_0_PLOC_HSPD"},
-                                                 objects::RTD_3_IC6_DAC_HEATSPREADER,
+      {objects::RTD_1_IC4_PLOC_MISSIONBOARD, "RTD_1_PLOC_MISSIONBRD"},
-                                                 objects::RTD_4_IC7_STARTRACKER,
+      {objects::RTD_2_IC5_4K_CAMERA, "RTD_2_4K_CAMERA"},
-                                                 objects::RTD_5_IC8_RW1_MX_MY,
+      {objects::RTD_3_IC6_DAC_HEATSPREADER, "RTD_3_DAC_HSPD"},
-                                                 objects::RTD_6_IC9_DRO,
+      {objects::RTD_4_IC7_STARTRACKER, "RTD_4_STARTRACKER"},
-                                                 objects::RTD_7_IC10_SCEX,
+      {objects::RTD_5_IC8_RW1_MX_MY, "RTD_5_RW1_MX_MY"},
-                                                 objects::RTD_8_IC11_X8,
+      {objects::RTD_6_IC9_DRO, "RTD_6_DRO"},
-                                                 objects::RTD_9_IC12_HPA,
+      {objects::RTD_7_IC10_SCEX, "RTD_7_SCEX"},
-                                                 objects::RTD_10_IC13_PL_TX,
+      {objects::RTD_8_IC11_X8, "RTD_8_X8"},
-                                                 objects::RTD_11_IC14_MPA,
+      {objects::RTD_9_IC12_HPA, "RTD_9_HPA"},
-                                                 objects::RTD_12_IC15_ACU,
+      {objects::RTD_10_IC13_PL_TX, "RTD_10_PL_TX,"},
-                                                 objects::RTD_13_IC16_PLPCDU_HEATSPREADER,
+      {objects::RTD_11_IC14_MPA, "RTD_11_MPA"},
-                                                 objects::RTD_14_IC17_TCS_BOARD,
+      {objects::RTD_12_IC15_ACU, "RTD_12_ACU"},
-                                                 objects::RTD_15_IC18_IMTQ};
+      {objects::RTD_13_IC16_PLPCDU_HEATSPREADER, "RTD_13_PLPCDU_HSPD"},
-  std::array<SpiCookie*, NUMBER_RTDS> rtdCookies = {};
+      {objects::RTD_14_IC17_TCS_BOARD, "RTD_14_TCS_BOARD"},
-  std::array<Max31865PT1000Handler*, NUMBER_RTDS> rtds = {};
+      {objects::RTD_15_IC18_IMTQ, "RTD_15_IMTQ"},
+  }};
+  std::array<SpiCookie*, NUM_RTDS> rtdCookies = {};
+  std::array<Max31865EiveHandler*, NUM_RTDS> rtds = {};
   RtdFdir* rtdFdir = nullptr;
-  for (uint8_t idx = 0; idx < NUMBER_RTDS; idx++) {
+  // Create special low level reader communication interface
-    rtdCookies[idx] =
+  new Max31865RtdReader(objects::SPI_RTD_COM_IF, comIF, gpioComIF);
-        new SpiCookie(cookieArgs[idx].first, cookieArgs[idx].second,
+  for (uint8_t idx = 0; idx < NUM_RTDS; idx++) {
-                      Max31865Definitions::MAX_REPLY_SIZE, spi::RTD_MODE, spi::RTD_SPEED);
+    rtdCookies[idx] = new SpiCookie(cookieArgs[idx].first, cookieArgs[idx].second,
-    rtds[idx] = new Max31865PT1000Handler(rtdIds[idx], objects::SPI_MAIN_COM_IF, rtdCookies[idx]);
+                                    MAX31865::MAX_REPLY_SIZE, spi::RTD_MODE, spi::RTD_SPEED);
+    rtdCookies[idx]->setMutexParams(MutexIF::TimeoutType::WAITING, spi::RTD_CS_TIMEOUT);
+    Max31865ReaderCookie* rtdLowLevelCookie =
+        new Max31865ReaderCookie(rtdInfos[idx].first, idx, rtdInfos[idx].second, rtdCookies[idx]);
+    rtds[idx] =
+        new Max31865EiveHandler(rtdInfos[idx].first, objects::SPI_RTD_COM_IF, rtdLowLevelCookie);
+    rtds[idx]->setDeviceInfo(idx, rtdInfos[idx].second);
     rtds[idx]->setParent(objects::TCS_BOARD_ASS);
-    rtdFdir = new RtdFdir(rtdIds[idx]);
+    rtdFdir = new RtdFdir(rtdInfos[idx].first);
     rtds[idx]->setCustomFdir(rtdFdir);
-    rtds[idx]->setDeviceIdx(idx + 3);
 #if OBSW_DEBUG_RTD == 1
-    rtds[idx]->setDebugMode(true);
+    rtds[idx]->setDebugMode(true, 5);
+#endif
+#if OBSW_TEST_RTD == 1
+    rtds[idx]->setInstantNormal(true);
+    rtds[idx]->setStartUpImmediately();
 #endif
   }
 
-#if OBSW_TEST_RTD == 1
+  TcsBoardHelper helper(rtdInfos);
-  for (auto& rtd : rtds) {
-    if (rtd != nullptr) {
-      rtd->setStartUpImmediately();
-      rtd->setInstantNormal(true);
-    }
-  }
-#endif  // OBSW_TEST_RTD == 1
-  TcsBoardHelper helper(rtdIds);
   TcsBoardAssembly* tcsBoardAss =
       new TcsBoardAssembly(objects::TCS_BOARD_ASS, objects::NO_OBJECT, pwrSwitcher,
                            pcdu::Switches::PDU1_CH0_TCS_BOARD_3V3, helper);

linux/ObjectFactory.h

@@ -12,7 +12,8 @@ namespace ObjectFactory {
 
 void createSunSensorComponents(GpioIF* gpioComIF, SpiComIF* spiComIF, PowerSwitchIF* pwrSwitcher,
                                std::string spiDev);
-void createRtdComponents(std::string spiDev, GpioIF* gpioComIF, PowerSwitchIF* pwrSwitcher);
+void createRtdComponents(std::string spiDev, GpioIF* gpioComIF, PowerSwitchIF* pwrSwitcher,
+                         SpiComIF* comIF);
 
 void gpioChecker(ReturnValue_t result, std::string output);
 

linux/boardtest/CMakeLists.txt

@@ -1,10 +1,2 @@
-target_sources(${OBSW_NAME} PRIVATE
+target_sources(${OBSW_NAME} PRIVATE LibgpiodTest.cpp I2cTestClass.cpp
-	LibgpiodTest.cpp
+                                    SpiTestClass.cpp UartTestClass.cpp)
-	I2cTestClass.cpp
-	SpiTestClass.cpp
-	UartTestClass.cpp
-)
-
-
-
-

linux/callbacks/CMakeLists.txt

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

linux/csp/CMakeLists.txt

@@ -1,8 +1 @@
-target_sources(${OBSW_NAME} PUBLIC
+target_sources(${OBSW_NAME} PUBLIC CspComIF.cpp CspCookie.cpp)
-	CspComIF.cpp
-	CspCookie.cpp
-)
-
-
-
-

linux/devices/CMakeLists.txt

@@ -1,8 +1,8 @@
 if(EIVE_BUILD_GPSD_GPS_HANDLER)
-    target_sources(${OBSW_NAME} PRIVATE
+  target_sources(${OBSW_NAME} PRIVATE GPSHyperionLinuxController.cpp)
-        GPSHyperionLinuxController.cpp
-    )
 endif()
 
+target_sources(${OBSW_NAME} PRIVATE Max31865RtdLowlevelHandler.cpp)
+
 add_subdirectory(ploc)
 add_subdirectory(startracker)

linux/devices/Max31865RtdLowlevelHandler.cpp

@@ -0,0 +1,465 @@
+#include "Max31865RtdLowlevelHandler.h"
+
+#include <fsfw/tasks/TaskFactory.h>
+#include <fsfw/timemanager/Stopwatch.h>
+#include <fsfw_hal/linux/spi/ManualCsLockGuard.h>
+
+#define OBSW_RTD_AUTO_MODE 1
+
+#if OBSW_RTD_AUTO_MODE == 1
+static constexpr uint8_t BASE_CFG = (MAX31865::Bias::ON << MAX31865::CfgBitPos::BIAS_SEL) |
+                                    (MAX31865::Wires::FOUR_WIRE << MAX31865::CfgBitPos::WIRE_SEL) |
+                                    (MAX31865::ConvMode::AUTO << MAX31865::CfgBitPos::CONV_MODE);
+#else
+static constexpr uint8_t BASE_CFG =
+    (MAX31865::Bias::OFF << MAX31865::CfgBitPos::BIAS_SEL) |
+    (MAX31865::Wires::FOUR_WIRE << MAX31865::CfgBitPos::WIRE_SEL) |
+    (MAX31865::ConvMode::NORM_OFF << MAX31865::CfgBitPos::CONV_MODE);
+#endif
+
+Max31865RtdReader::Max31865RtdReader(object_id_t objectId, SpiComIF* lowLevelComIF, GpioIF* gpioIF)
+    : SystemObject(objectId), rtds(EiveMax31855::NUM_RTDS), comIF(lowLevelComIF), gpioIF(gpioIF) {
+  readerMutex = MutexFactory::instance()->createMutex();
+}
+
+ReturnValue_t Max31865RtdReader::performOperation(uint8_t operationCode) {
+  using namespace MAX31865;
+  ReturnValue_t result = RETURN_OK;
+  static_cast<void>(result);
+  // Stopwatch watch;
+  if (periodicInitHandling()) {
+#if OBSW_RTD_AUTO_MODE == 0
+    // 10 ms delay for VBIAS startup
+    TaskFactory::delayTask(10);
+#endif
+  } else {
+    // No devices usable (e.g. TCS board off)
+    return RETURN_OK;
+  }
+
+#if OBSW_RTD_AUTO_MODE == 0
+  result = periodicReadReqHandling();
+  if (result != RETURN_OK) {
+    return result;
+  }
+  // After requesting, 65 milliseconds delay required
+  TaskFactory::delayTask(65);
+#endif
+
+  return periodicReadHandling();
+}
+
+bool Max31865RtdReader::rtdIsActive(uint8_t idx) {
+  if (rtds[idx]->on and rtds[idx]->active and rtds[idx]->configured) {
+    return true;
+  }
+  return false;
+}
+
+bool Max31865RtdReader::periodicInitHandling() {
+  using namespace MAX31865;
+  MutexGuard mg(readerMutex);
+  ReturnValue_t result = RETURN_OK;
+  if (mg.getLockResult() != RETURN_OK) {
+    sif::warning << "Max31865RtdReader::periodicInitHandling: Mutex lock failed" << std::endl;
+    return false;
+  }
+
+  for (auto& rtd : rtds) {
+    if (rtd == nullptr) {
+      continue;
+    }
+    if ((rtd->on or rtd->active) and not rtd->configured and rtd->cd.hasTimedOut()) {
+      ManualCsLockWrapper mg(csLock, gpioIF, rtd->spiCookie, csTimeoutType, csTimeoutMs);
+      if (mg.lockResult != RETURN_OK or mg.gpioResult != RETURN_OK) {
+        sif::error << "Max31865RtdReader::periodicInitHandling: Manual CS lock failed" << std::endl;
+        break;
+      }
+      result = writeCfgReg(rtd->spiCookie, BASE_CFG);
+      if (result != HasReturnvaluesIF::RETURN_OK) {
+        handleSpiError(rtd, result, "writeCfgReg");
+      }
+      if (rtd->writeLowThreshold) {
+        result = writeLowThreshold(rtd->spiCookie, rtd->lowThreshold);
+        if (result != HasReturnvaluesIF::RETURN_OK) {
+          handleSpiError(rtd, result, "writeLowThreshold");
+        }
+      }
+      if (rtd->writeHighThreshold) {
+        result = writeHighThreshold(rtd->spiCookie, rtd->highThreshold);
+        if (result != HasReturnvaluesIF::RETURN_OK) {
+          handleSpiError(rtd, result, "writeHighThreshold");
+        }
+      }
+      result = clearFaultStatus(rtd->spiCookie);
+      if (result != HasReturnvaluesIF::RETURN_OK) {
+        handleSpiError(rtd, result, "clearFaultStatus");
+      }
+      rtd->configured = true;
+      rtd->db.configured = true;
+      if (rtd->active) {
+        rtd->db.active = true;
+      }
+    }
+    if (rtd->active and rtd->configured and not rtd->db.active) {
+      rtd->db.active = true;
+    }
+  }
+  bool someRtdUsable = false;
+  for (auto& rtd : rtds) {
+    if (rtd == nullptr) {
+      continue;
+    }
+    if (rtdIsActive(rtd->idx)) {
+#if OBSW_RTD_AUTO_MODE == 0
+      result = writeBiasSel(Bias::ON, rtd->spiCookie, BASE_CFG);
+#endif
+      someRtdUsable =  true;
+    }
+  }
+  return someRtdUsable;
+}
+
+ReturnValue_t Max31865RtdReader::periodicReadReqHandling() {
+  using namespace MAX31865;
+  MutexGuard mg(readerMutex);
+  if (mg.getLockResult() != RETURN_OK) {
+    sif::warning << "Max31865RtdReader::periodicReadReqHandling: Mutex lock failed" << std::endl;
+    return RETURN_FAILED;
+  }
+  // Now request one shot config for all active RTDs
+  for (auto& rtd : rtds) {
+    if (rtd == nullptr) {
+      continue;
+    }
+    if (rtdIsActive(rtd->idx)) {
+      ReturnValue_t result = writeCfgReg(rtd->spiCookie, BASE_CFG | (1 << CfgBitPos::ONE_SHOT));
+      if (result != RETURN_OK) {
+        handleSpiError(rtd, result, "writeCfgReg");
+        // Release mutex ASAP
+        return RETURN_FAILED;
+      }
+    }
+  }
+  return RETURN_OK;
+}
+
+ReturnValue_t Max31865RtdReader::periodicReadHandling() {
+  using namespace MAX31865;
+  auto result = RETURN_OK;
+  MutexGuard mg(readerMutex);
+  if (mg.getLockResult() != RETURN_OK) {
+    sif::warning << "Max31865RtdReader::periodicReadReqHandling: Mutex lock failed" << std::endl;
+    return RETURN_FAILED;
+  }
+  // Now read the RTD values
+  for (auto& rtd : rtds) {
+    if (rtd == nullptr) {
+      continue;
+    }
+    if (rtdIsActive(rtd->idx)) {
+      uint16_t rtdVal = 0;
+      bool faultBitSet = false;
+      result = readRtdVal(rtd->spiCookie, rtdVal, faultBitSet);
+      if (result != RETURN_OK) {
+        handleSpiError(rtd, result, "readRtdVal");
+        return RETURN_FAILED;
+      }
+      if (faultBitSet) {
+        rtd->db.faultBitSet = faultBitSet;
+      }
+      rtd->db.adcCode = rtdVal;
+    }
+  }
+#if OBSW_RTD_AUTO_MODE == 0
+  for (auto& rtd : rtds) {
+    if (rtd == nullptr) {
+      continue;
+    }
+    // Even if a device was made inactive, turn off the bias here. If it was turned off, not
+    // necessary anymore..
+    if (rtd->on) {
+      result = writeBiasSel(Bias::OFF, rtd->spiCookie, BASE_CFG);
+    }
+  }
+#endif
+  return RETURN_OK;
+}
+
+ReturnValue_t Max31865RtdReader::initializeInterface(CookieIF* cookie) {
+  if (cookie == nullptr) {
+    throw std::invalid_argument("Invalid MAX31865 Reader Cookie");
+  }
+  auto* rtdCookie = dynamic_cast<Max31865ReaderCookie*>(cookie);
+  ReturnValue_t result = comIF->initializeInterface(rtdCookie->spiCookie);
+  if (result != HasReturnvaluesIF::RETURN_OK) {
+    return result;
+  }
+  if (rtdCookie->idx > EiveMax31855::NUM_RTDS) {
+    throw std::invalid_argument("Invalid RTD index");
+  }
+  rtds[rtdCookie->idx] = rtdCookie;
+  MutexGuard mg(readerMutex);
+  if (dbLen == 0) {
+    dbLen = rtdCookie->db.getSerializedSize();
+  }
+  return RETURN_OK;
+}
+
+ReturnValue_t Max31865RtdReader::sendMessage(CookieIF* cookie, const uint8_t* sendData,
+                                             size_t sendLen) {
+  if (cookie == nullptr) {
+    return RETURN_FAILED;
+  }
+  // Empty command.. don't fail for now
+  if (sendLen < 1) {
+    return RETURN_OK;
+  }
+  MutexGuard mg(readerMutex);
+  if (mg.getLockResult() != RETURN_OK) {
+    sif::warning << "Max31865RtdReader::sendMessage: Mutex lock failed" << std::endl;
+    return RETURN_FAILED;
+  }
+  auto* rtdCookie = dynamic_cast<Max31865ReaderCookie*>(cookie);
+  uint8_t cmdRaw = sendData[0];
+  if (cmdRaw > EiveMax31855::RtdCommands::NUM_CMDS) {
+    sif::warning << "Max31865RtdReader::sendMessage: Invalid command" << std::endl;
+    return RETURN_FAILED;
+  }
+
+  auto thresholdHandler = [](Max31865ReaderCookie* rtdCookie, const uint8_t* sendData) {
+    rtdCookie->lowThreshold = (sendData[1] << 8) | sendData[2];
+    rtdCookie->highThreshold = (sendData[3] << 8) | sendData[4];
+    rtdCookie->writeLowThreshold = true;
+    rtdCookie->writeHighThreshold = true;
+  };
+
+  auto cmd = static_cast<EiveMax31855::RtdCommands>(sendData[0]);
+  switch (cmd) {
+    case (EiveMax31855::RtdCommands::ON): {
+      if (not rtdCookie->on) {
+        rtdCookie->cd.setTimeout(MAX31865::WARMUP_MS);
+        rtdCookie->cd.resetTimer();
+        rtdCookie->on = true;
+        rtdCookie->active = false;
+        rtdCookie->configured = false;
+        if (sendLen == 5) {
+          thresholdHandler(rtdCookie, sendData);
+        }
+      }
+      break;
+    }
+    case (EiveMax31855::RtdCommands::ACTIVE): {
+      if (not rtdCookie->on) {
+        rtdCookie->cd.setTimeout(MAX31865::WARMUP_MS);
+        rtdCookie->cd.resetTimer();
+        rtdCookie->on = true;
+        rtdCookie->active = true;
+        rtdCookie->configured = false;
+      } else {
+        rtdCookie->active = true;
+      }
+      if (sendLen == 5) {
+        thresholdHandler(rtdCookie, sendData);
+      }
+      break;
+    }
+    case (EiveMax31855::RtdCommands::OFF): {
+      rtdCookie->on = false;
+      rtdCookie->active = false;
+      rtdCookie->configured = false;
+      break;
+    }
+    case (EiveMax31855::RtdCommands::HIGH_TRESHOLD): {
+      if (sendLen == 3) {
+        rtdCookie->highThreshold = (sendData[1] << 8) | sendData[2];
+        rtdCookie->writeHighThreshold = true;
+      } else {
+        return RETURN_FAILED;
+      }
+      break;
+    }
+    case (EiveMax31855::RtdCommands::LOW_THRESHOLD): {
+      if (sendLen == 3) {
+        rtdCookie->lowThreshold = (sendData[1] << 8) | sendData[2];
+        rtdCookie->writeLowThreshold = true;
+      } else {
+        return RETURN_FAILED;
+      }
+      break;
+    }
+    case (EiveMax31855::RtdCommands::CFG):
+    default: {
+      // TODO: Only implement if needed
+      break;
+    }
+  }
+  return RETURN_OK;
+}
+
+ReturnValue_t Max31865RtdReader::getSendSuccess(CookieIF* cookie) { return RETURN_OK; }
+
+ReturnValue_t Max31865RtdReader::requestReceiveMessage(CookieIF* cookie, size_t requestLen) {
+  return RETURN_OK;
+}
+
+ReturnValue_t Max31865RtdReader::readReceivedMessage(CookieIF* cookie, uint8_t** buffer,
+                                                     size_t* size) {
+  MutexGuard mg(readerMutex);
+  if (mg.getLockResult() != RETURN_OK) {
+    // TODO: Emit warning
+    return RETURN_FAILED;
+  }
+  auto* rtdCookie = dynamic_cast<Max31865ReaderCookie*>(cookie);
+  uint8_t* exchangePtr = rtdCookie->exchangeBuf.data();
+  size_t serLen = 0;
+  auto result = rtdCookie->db.serialize(&exchangePtr, &serLen, rtdCookie->exchangeBuf.size(),
+                                        SerializeIF::Endianness::MACHINE);
+  if (result != RETURN_OK) {
+    // TODO: Emit warning
+    return RETURN_FAILED;
+  }
+  *buffer = reinterpret_cast<uint8_t*>(rtdCookie->exchangeBuf.data());
+  *size = serLen;
+  return RETURN_OK;
+}
+
+ReturnValue_t Max31865RtdReader::writeCfgReg(SpiCookie* cookie, uint8_t cfg) {
+  using namespace MAX31865;
+  return writeNToReg(cookie, CONFIG, 1, &cfg, nullptr);
+}
+
+ReturnValue_t Max31865RtdReader::writeBiasSel(MAX31865::Bias bias, SpiCookie* cookie,
+                                              uint8_t baseCfg) {
+  using namespace MAX31865;
+  if (bias == MAX31865::Bias::OFF) {
+    baseCfg &= ~(1 << CfgBitPos::BIAS_SEL);
+  } else {
+    baseCfg |= (1 << CfgBitPos::BIAS_SEL);
+  }
+  return writeCfgReg(cookie, baseCfg);
+}
+
+ReturnValue_t Max31865RtdReader::clearFaultStatus(SpiCookie* cookie) {
+  using namespace MAX31865;
+  // Read back the current configuration to avoid overwriting it when clearing te fault status
+  uint8_t currentCfg = 0;
+  auto result = readCfgReg(cookie, currentCfg);
+  if (result != RETURN_OK) {
+    return result;
+  }
+  // Clear bytes 5, 3 and 2 which need to be 0
+  currentCfg &= ~0x2C;
+  currentCfg |= (1 << CfgBitPos::FAULT_STATUS_CLEAR);
+  return writeCfgReg(cookie, currentCfg);
+}
+
+ReturnValue_t Max31865RtdReader::readCfgReg(SpiCookie* cookie, uint8_t& cfg) {
+  using namespace MAX31865;
+  uint8_t* replyPtr = nullptr;
+  auto result = readNFromReg(cookie, CONFIG, 1, &replyPtr);
+  if (result == RETURN_OK) {
+    cfg = replyPtr[0];
+  }
+  return result;
+}
+
+ReturnValue_t Max31865RtdReader::writeLowThreshold(SpiCookie* cookie, uint16_t val) {
+  using namespace MAX31865;
+  uint8_t cmd[2] = {static_cast<uint8_t>((val >> 8) & 0xff), static_cast<uint8_t>(val & 0xff)};
+  return writeNToReg(cookie, LOW_THRESHOLD, 2, cmd, nullptr);
+}
+
+ReturnValue_t Max31865RtdReader::writeHighThreshold(SpiCookie* cookie, uint16_t val) {
+  using namespace MAX31865;
+  uint8_t cmd[2] = {static_cast<uint8_t>((val >> 8) & 0xff), static_cast<uint8_t>(val & 0xff)};
+  return writeNToReg(cookie, HIGH_THRESHOLD, 2, cmd, nullptr);
+}
+
+ReturnValue_t Max31865RtdReader::readLowThreshold(SpiCookie* cookie, uint16_t& lowThreshold) {
+  using namespace MAX31865;
+  uint8_t* replyPtr = nullptr;
+  auto result = readNFromReg(cookie, LOW_THRESHOLD, 2, &replyPtr);
+  if (result == RETURN_OK) {
+    lowThreshold = (replyPtr[0] << 8) | replyPtr[1];
+  }
+  return result;
+}
+
+ReturnValue_t Max31865RtdReader::readHighThreshold(SpiCookie* cookie, uint16_t& highThreshold) {
+  using namespace MAX31865;
+  uint8_t* replyPtr = nullptr;
+  auto result = readNFromReg(cookie, HIGH_THRESHOLD, 2, &replyPtr);
+  if (result == RETURN_OK) {
+    highThreshold = (replyPtr[0] << 8) | replyPtr[1];
+  }
+  return result;
+}
+
+ReturnValue_t Max31865RtdReader::writeNToReg(SpiCookie* cookie, uint8_t reg, size_t n, uint8_t* cmd,
+                                             uint8_t** reply) {
+  using namespace MAX31865;
+  if (n > cmdBuf.size() - 1) {
+    return HasReturnvaluesIF::RETURN_FAILED;
+  }
+  cmdBuf[0] = reg | WRITE_BIT;
+  for (size_t idx = 0; idx < n; idx++) {
+    cmdBuf[idx + 1] = cmd[idx];
+  }
+  return comIF->sendMessage(cookie, cmdBuf.data(), n + 1);
+}
+
+ReturnValue_t Max31865RtdReader::readRtdVal(SpiCookie* cookie, uint16_t& val, bool& faultBitSet) {
+  using namespace MAX31865;
+  uint8_t* replyPtr = nullptr;
+  auto result = readNFromReg(cookie, RTD, 2, &replyPtr);
+  if (result != RETURN_OK) {
+    return result;
+  }
+  if (replyPtr[1] & 0b0000'0001) {
+    faultBitSet = true;
+  }
+  // Shift 1 to the right to remove fault bit
+  val = ((replyPtr[0] << 8) | replyPtr[1]) >> 1;
+  return result;
+}
+
+ReturnValue_t Max31865RtdReader::readNFromReg(SpiCookie* cookie, uint8_t reg, size_t n,
+                                              uint8_t** reply) {
+  using namespace MAX31865;
+  if (n > 4) {
+    return HasReturnvaluesIF::RETURN_FAILED;
+  }
+  // Clear write bit in any case
+  reg &= ~WRITE_BIT;
+  cmdBuf[0] = reg;
+  std::memset(cmdBuf.data() + 1, 0, n);
+  ReturnValue_t result = comIF->sendMessage(cookie, cmdBuf.data(), n + 1);
+  if (result != RETURN_OK) {
+    return RETURN_FAILED;
+  }
+
+  size_t dummyLen = 0;
+  uint8_t* replyPtr = nullptr;
+  result = comIF->readReceivedMessage(cookie, &replyPtr, &dummyLen);
+  if (result != RETURN_OK) {
+    return result;
+  }
+  if (reply != nullptr) {
+    *reply = replyPtr + 1;
+  }
+  return RETURN_OK;
+}
+
+ReturnValue_t Max31865RtdReader::handleSpiError(Max31865ReaderCookie* cookie, ReturnValue_t result,
+                                                const char* ctx) {
+  cookie->db.spiErrorCount.value += 1;
+  sif::warning << "Max31865RtdReader::handleSpiError: " << ctx << " | Failed with result " << result
+               << std::endl;
+  return result;
+}
+
+ReturnValue_t Max31865RtdReader::initialize() {
+  csLock = comIF->getCsMutex();
+  return SystemObject::initialize();
+}

linux/devices/Max31865RtdLowlevelHandler.h

@@ -0,0 +1,87 @@
+#ifndef LINUX_DEVICES_MAX31865RTDREADER_H_
+#define LINUX_DEVICES_MAX31865RTDREADER_H_
+
+#include <fsfw/ipc/MutexIF.h>
+#include <fsfw/tasks/ExecutableObjectIF.h>
+#include <fsfw_hal/linux/spi/SpiComIF.h>
+#include <fsfw_hal/linux/spi/SpiCookie.h>
+
+#include "fsfw/devicehandlers/DeviceCommunicationIF.h"
+#include "mission/devices/devicedefinitions/Max31865Definitions.h"
+
+struct Max31865ReaderCookie : public CookieIF {
+  Max31865ReaderCookie(){};
+  Max31865ReaderCookie(object_id_t handlerId_, uint8_t idx_, const std::string& locString_,
+                       SpiCookie* spiCookie_)
+      : idx(idx_), handlerId(handlerId_), locString(locString_), spiCookie(spiCookie_) {}
+
+  uint8_t idx = 0;
+  object_id_t handlerId = objects::NO_OBJECT;
+
+  std::string locString = "";
+  std::array<uint8_t, 12> exchangeBuf{};
+  Countdown cd = Countdown(MAX31865::WARMUP_MS);
+
+  bool on = false;
+  bool configured = false;
+  bool active = false;
+  bool writeLowThreshold = false;
+  bool writeHighThreshold = false;
+  uint16_t lowThreshold = 0;
+  uint16_t highThreshold = 0;
+  SpiCookie* spiCookie = nullptr;
+
+  // Exchange data buffer struct
+  EiveMax31855::ReadOutStruct db;
+};
+
+class Max31865RtdReader : public SystemObject,
+                          public ExecutableObjectIF,
+                          public DeviceCommunicationIF {
+ public:
+  Max31865RtdReader(object_id_t objectId, SpiComIF* lowLevelComIF, GpioIF* gpioIF);
+
+  ReturnValue_t performOperation(uint8_t operationCode) override;
+  ReturnValue_t initialize() override;
+
+ private:
+  std::vector<Max31865ReaderCookie*> rtds;
+  std::array<uint8_t, 4> cmdBuf = {};
+  size_t dbLen = 0;
+  MutexIF* readerMutex;
+
+  SpiComIF* comIF;
+  GpioIF* gpioIF;
+  MutexIF::TimeoutType csTimeoutType = MutexIF::TimeoutType::BLOCKING;
+  uint32_t csTimeoutMs = 0;
+  MutexIF* csLock = nullptr;
+
+  bool periodicInitHandling();
+  ReturnValue_t periodicReadReqHandling();
+  ReturnValue_t periodicReadHandling();
+
+  bool rtdIsActive(uint8_t idx);
+  ReturnValue_t writeCfgReg(SpiCookie* cookie, uint8_t cfg);
+  ReturnValue_t writeBiasSel(MAX31865::Bias bias, SpiCookie* cookie, uint8_t baseCfg);
+  ReturnValue_t readCfgReg(SpiCookie* cookie, uint8_t& cfg);
+  ReturnValue_t readRtdVal(SpiCookie* cookie, uint16_t& val, bool& faultBitSet);
+  ReturnValue_t writeLowThreshold(SpiCookie* cookie, uint16_t val);
+  ReturnValue_t writeHighThreshold(SpiCookie* cookie, uint16_t val);
+  ReturnValue_t readLowThreshold(SpiCookie* cookie, uint16_t& val);
+  ReturnValue_t readHighThreshold(SpiCookie* cookie, uint16_t& val);
+  ReturnValue_t clearFaultStatus(SpiCookie* cookie);
+
+  ReturnValue_t readNFromReg(SpiCookie* cookie, uint8_t reg, size_t n, uint8_t** reply);
+  ReturnValue_t writeNToReg(SpiCookie* cookie, uint8_t reg, size_t n, uint8_t* cmd,
+                            uint8_t** reply);
+
+  ReturnValue_t initializeInterface(CookieIF* cookie) override;
+  ReturnValue_t sendMessage(CookieIF* cookie, const uint8_t* sendData, size_t sendLen) override;
+  ReturnValue_t getSendSuccess(CookieIF* cookie) override;
+  ReturnValue_t requestReceiveMessage(CookieIF* cookie, size_t requestLen) override;
+  ReturnValue_t readReceivedMessage(CookieIF* cookie, uint8_t** buffer, size_t* size) override;
+
+  ReturnValue_t handleSpiError(Max31865ReaderCookie* cookie, ReturnValue_t result, const char* ctx);
+};
+
+#endif /* LINUX_DEVICES_MAX31865RTDREADER_H_ */

linux/devices/devicedefinitions/PlocSupervisorDefinitions.h

@@ -56,6 +56,7 @@ static const DeviceCommandId_t LOGGING_SET_TOPIC = 56;
 static const DeviceCommandId_t REQUEST_ADC_REPORT = 57;
 static const DeviceCommandId_t RESET_PL = 58;
 static const DeviceCommandId_t ENABLE_NVMS = 59;
+static const DeviceCommandId_t CONTINUE_UPDATE = 60;
 
 /** Reply IDs */
 static const DeviceCommandId_t ACK_REPORT = 100;
@@ -309,6 +310,9 @@ class ApidOnlyPacket : public SpacePacket {
  */
 class MPSoCBootSelect : public SpacePacket {
  public:
+  static const uint8_t NVM0 = 0;
+  static const uint8_t NVM1 = 1;
+
   /**
    * @brief   Constructor
    *
@@ -316,8 +320,10 @@ class MPSoCBootSelect : public SpacePacket {
    * @param bp0   Partition pin 0
    * @param bp1   Partition pin 1
    * @param bp2   Partition pin 2
+   *
+   * @note  Selection of partitions is currently not supported.
    */
-  MPSoCBootSelect(uint8_t mem, uint8_t bp0, uint8_t bp1, uint8_t bp2)
+  MPSoCBootSelect(uint8_t mem = 0, uint8_t bp0 = 0, uint8_t bp1 = 0, uint8_t bp2 = 0)
       : SpacePacket(DATA_FIELD_LENGTH - 1, true, APID_SEL_MPSOC_BOOT_IMAGE, DEFAULT_SEQUENCE_COUNT),
         mem(mem),
         bp0(bp0),
@@ -1460,7 +1466,9 @@ class ExecutionReport : public VerificationReport {
     OUT_OF_RANGE = 0x103,
     OUT_OF_HEAP_MEMORY = 0x104,
     INVALID_STATE_TRANSITION = 0x105,
-    MPSOC_BOOT_FAILED = 0x106,
+    MPSOC_ALREADY_BOOTING = 0x106,
+    MPSOC_ALREADY_OPERATIONAL = 0x107,
+    MPSOC_BOOT_FAILED = 0x108,
     SP_NOT_AVAILABLE = 0x200,
     SP_DATA_INSUFFICIENT = 0x201,
     SP_MEMORY_ID_INVALID = 0x202,
@@ -1594,6 +1602,14 @@ class ExecutionReport : public VerificationReport {
         sif::warning << STATUS_PRINTOUT_PREFIX << "Invalid state transition" << std::endl;
         break;
       }
+      case StatusCode::MPSOC_ALREADY_BOOTING: {
+        sif::warning << STATUS_PRINTOUT_PREFIX << "MPSoC already booting" << std::endl;
+        break;
+      }
+      case StatusCode::MPSOC_ALREADY_OPERATIONAL: {
+        sif::warning << STATUS_PRINTOUT_PREFIX << "MPSoC already operational" << std::endl;
+        break;
+      }
       case StatusCode::MPSOC_BOOT_FAILED: {
         sif::warning << STATUS_PRINTOUT_PREFIX << "MPSoC boot failed" << std::endl;
         break;

linux/devices/ploc/CMakeLists.txt

@@ -1,7 +1,4 @@
-target_sources(${OBSW_NAME} PRIVATE
+target_sources(
-    PlocSupervisorHandler.cpp
+  ${OBSW_NAME}
-    PlocMemoryDumper.cpp
+  PRIVATE PlocSupervisorHandler.cpp PlocMemoryDumper.cpp PlocMPSoCHandler.cpp
-    PlocMPSoCHandler.cpp
+          PlocMPSoCHelper.cpp PlocSupvHelper.cpp)
-    PlocMPSoCHelper.cpp
-    PlocSupvHelper.cpp
-)

linux/devices/ploc/PlocMPSoCHandler.h

@@ -108,7 +108,11 @@ class PlocMPSoCHandler : public DeviceHandlerBase, public CommandsActionsIF {
   MessageQueueIF* eventQueue = nullptr;
   MessageQueueIF* commandActionHelperQueue = nullptr;
 
-  SourceSequenceCounter sequenceCount;
+  // Initiate the sequence count with the maximum value. It is incremented before
+  // a packet is sent, so the first value will be 0 accordingly using
+  // the wrap around of the counter.
+  SourceSequenceCounter sequenceCount =
+      SourceSequenceCounter(SpacePacketBase::LIMIT_SEQUENCE_COUNT - 1);
 
   uint8_t commandBuffer[mpsoc::MAX_COMMAND_SIZE];
 

linux/devices/ploc/PlocSupervisorHandler.cpp

@@ -118,6 +118,11 @@ ReturnValue_t PlocSupervisorHandler::executeAction(ActionId_t actionId,
       plocSupvHelperExecuting = true;
       return EXECUTION_FINISHED;
     }
+    case CONTINUE_UPDATE: {
+      supvHelper->initiateUpdateContinuation();
+      plocSupvHelperExecuting = true;
+      return EXECUTION_FINISHED;
+    }
     case LOGGING_REQUEST_EVENT_BUFFERS: {
       if (size > config::MAX_PATH_SIZE) {
         return SupvReturnValuesIF::FILENAME_TOO_LONG;
@@ -436,8 +441,9 @@ void PlocSupervisorHandler::fillCommandAndReplyMap() {
                                    &mramDumpTimeout);
   this->insertInCommandAndReplyMap(CONSECUTIVE_MRAM_DUMP, 0, nullptr, 0, false, false,
                                    CONSECUTIVE_MRAM_DUMP, &mramDumpTimeout);
-  this->insertInReplyMap(ACK_REPORT, 3, nullptr, SIZE_ACK_REPORT);
+  this->insertInReplyMap(ACK_REPORT, 3, nullptr, SIZE_ACK_REPORT, false,
-  this->insertInReplyMap(EXE_REPORT, 0, nullptr, SIZE_EXE_REPORT, false, &executionTimeout);
+                         &acknowledgementReportTimeout);
+  this->insertInReplyMap(EXE_REPORT, 0, nullptr, SIZE_EXE_REPORT, false, &executionReportTimeout);
   this->insertInReplyMap(HK_REPORT, 3, &hkset, SIZE_HK_REPORT);
   this->insertInReplyMap(BOOT_STATUS_REPORT, 3, &bootStatusReport, SIZE_BOOT_STATUS_REPORT);
   this->insertInReplyMap(LATCHUP_REPORT, 3, &latchupStatusReport, SIZE_LATCHUP_STATUS_REPORT);
@@ -572,14 +578,14 @@ ReturnValue_t PlocSupervisorHandler::enableReplyInReplyMap(DeviceCommandMap::ite
                << " not in replyMap" << std::endl;
   }
 
+  setExecutionTimeout(command->first);
+
   result = DeviceHandlerBase::enableReplyInReplyMap(command, enabledReplies, true, EXE_REPORT);
   if (result != RETURN_OK) {
     sif::debug << "PlocSupervisorHandler::enableReplyInReplyMap: Reply with id " << EXE_REPORT
                << " not in replyMap" << std::endl;
   }
 
-  setExecutionTimeout(command->first);
-
   return RETURN_OK;
 }
 
@@ -814,7 +820,9 @@ void PlocSupervisorHandler::handleEvent(EventMessage* eventMessage) {
       // After execution of update procedure, PLOC is in a state where it draws approx. 700 mA of
       // current. To leave this state the shutdown MPSoC command must be sent here.
       if (event == PlocSupvHelper::SUPV_UPDATE_FAILED ||
-          event == PlocSupvHelper::SUPV_UPDATE_SUCCESSFUL) {
+          event == PlocSupvHelper::SUPV_UPDATE_SUCCESSFUL ||
+          event == PlocSupvHelper::SUPV_CONTINUE_UPDATE_FAILED ||
+          event == PlocSupvHelper::SUPV_CONTINUE_UPDATE_SUCCESSFUL) {
         result = this->executeAction(supv::SHUTDOWN_MPSOC, NO_COMMANDER, nullptr, 0);
         if (result != RETURN_OK) {
           triggerEvent(SUPV_MPSOC_SHUWDOWN_BUILD_FAILED);
@@ -837,13 +845,13 @@ void PlocSupervisorHandler::setExecutionTimeout(DeviceCommandId_t command) {
   switch (command) {
     case FIRST_MRAM_DUMP:
     case CONSECUTIVE_MRAM_DUMP:
-      executionTimeout.setTimeout(MRAM_DUMP_EXECUTION_TIMEOUT);
+      executionReportTimeout.setTimeout(MRAM_DUMP_EXECUTION_TIMEOUT);
       break;
     case COPY_ADC_DATA_TO_MRAM:
-      executionTimeout.setTimeout(COPY_ADC_TO_MRAM_TIMEOUT);
+      executionReportTimeout.setTimeout(COPY_ADC_TO_MRAM_TIMEOUT);
       break;
     default:
-      executionTimeout.setTimeout(EXECUTION_DEFAULT_TIMEOUT);
+      executionReportTimeout.setTimeout(EXECUTION_DEFAULT_TIMEOUT);
       break;
   }
 }
@@ -957,6 +965,7 @@ ReturnValue_t PlocSupervisorHandler::handleHkReport(const uint8_t* data) {
 
   if (result == SupvReturnValuesIF::CRC_FAILURE) {
     sif::error << "PlocSupervisorHandler::handleHkReport: Hk report has invalid crc" << std::endl;
+    return result;
   }
 
   uint16_t offset = supv::DATA_FIELD_OFFSET;
@@ -1062,8 +1071,9 @@ ReturnValue_t PlocSupervisorHandler::handleBootStatusReport(const uint8_t* data)
   nextReplyId = supv::EXE_REPORT;
 
 #if OBSW_VERBOSE_LEVEL >= 1 && OBSW_DEBUG_PLOC_SUPERVISOR == 1
-  sif::info << "PlocSupervisorHandler::handleBootStatusReport: SoC State (0 - off, 1 - booting, 3 "
+  sif::info << "PlocSupervisorHandler::handleBootStatusReport: SoC State (0 - off, 1 - booting, 2 "
-               "- operating, 4 - Shutdown): "
+               "- Update, 3 "
+               "- operating, 4 - Shutdown, 5 - Reset): "
             << static_cast<unsigned int>(bootStatusReport.socState.value) << std::endl;
   sif::info << "PlocSupervisorHandler::handleBootStatusReport: Power Cycles: "
             << static_cast<unsigned int>(bootStatusReport.powerCycles.value) << std::endl;

linux/devices/ploc/PlocSupervisorHandler.h

@@ -83,6 +83,8 @@ class PlocSupervisorHandler : public DeviceHandlerBase {
   static const uint8_t SIZE_NULL_TERMINATOR = 1;
   // 5 s
   static const uint32_t EXECUTION_DEFAULT_TIMEOUT = 5000;
+  // 70 S
+  static const uint32_t ACKNOWLEDGE_DEFAULT_TIMEOUT = 70000;
   // 60 s
   static const uint32_t MRAM_DUMP_EXECUTION_TIMEOUT = 60000;
   // 70 s
@@ -141,7 +143,8 @@ class PlocSupervisorHandler : public DeviceHandlerBase {
   // Supervisor helper class currently executing a command
   bool plocSupvHelperExecuting = false;
 
-  Countdown executionTimeout = Countdown(EXECUTION_DEFAULT_TIMEOUT, false);
+  Countdown executionReportTimeout = Countdown(EXECUTION_DEFAULT_TIMEOUT, false);
+  Countdown acknowledgementReportTimeout = Countdown(ACKNOWLEDGE_DEFAULT_TIMEOUT, false);
   // Vorago nees some time to boot properly
   Countdown bootTimeout = Countdown(BOOT_TIMEOUT);
   Countdown mramDumpTimeout = Countdown(MRAM_DUMP_TIMEOUT);

linux/devices/ploc/PlocSupvHelper.cpp

@@ -10,6 +10,7 @@
 #endif
 
 #include "fsfw/globalfunctions/CRC.h"
+#include "fsfw/tasks/TaskFactory.h"
 #include "fsfw/timemanager/Countdown.h"
 #include "mission/utility/Filenaming.h"
 #include "mission/utility/ProgressPrinter.h"
@@ -51,6 +52,18 @@ ReturnValue_t PlocSupvHelper::performOperation(uint8_t operationCode) {
         internalState = InternalState::IDLE;
         break;
       }
+      case InternalState::CONTINUE_UPDATE: {
+        result = continueUpdate();
+        if (result == RETURN_OK) {
+          triggerEvent(SUPV_CONTINUE_UPDATE_SUCCESSFUL, result);
+        } else if (result == PROCESS_TERMINATED) {
+          // Event already triggered
+        } else {
+          triggerEvent(SUPV_CONTINUE_UPDATE_FAILED, result);
+        }
+        internalState = InternalState::IDLE;
+        break;
+      }
       case InternalState::REQUEST_EVENT_BUFFER: {
         result = performEventBufferRequest();
         if (result == RETURN_OK) {
@@ -109,12 +122,21 @@ ReturnValue_t PlocSupvHelper::startUpdate(std::string file, uint8_t memoryId,
   update.length = getFileSize(update.file);
   update.memoryId = memoryId;
   update.startAddress = startAddress;
+  update.remainingSize = update.length;
+  update.bytesWritten = 0;
+  update.packetNum = 1;
+  update.sequenceCount = 1;
   internalState = InternalState::UPDATE;
   uartComIF->flushUartTxAndRxBuf(comCookie);
   semaphore.release();
   return result;
 }
 
+void PlocSupvHelper::initiateUpdateContinuation() {
+  internalState = InternalState::CONTINUE_UPDATE;
+  semaphore.release();
+}
+
 ReturnValue_t PlocSupvHelper::startEventbBufferRequest(std::string path) {
 #ifdef XIPHOS_Q7S
   ReturnValue_t result = FilesystemHelper::checkPath(path);
@@ -140,6 +162,10 @@ ReturnValue_t PlocSupvHelper::performUpdate() {
   if (result != RETURN_OK) {
     return result;
   }
+  result = selectMemory();
+  if (result != RETURN_OK) {
+    return result;
+  }
   result = prepareUpdate();
   if (result != RETURN_OK) {
     return result;
@@ -148,62 +174,88 @@ ReturnValue_t PlocSupvHelper::performUpdate() {
   if (result != RETURN_OK) {
     return result;
   }
+  result = writeUpdatePackets();
+  if (result != RETURN_OK) {
+    return result;
+  }
+  result = handleCheckMemoryCommand();
+  if (result != RETURN_OK) {
+    return result;
+  }
+  return result;
+}
+
+ReturnValue_t PlocSupvHelper::continueUpdate() {
+  ReturnValue_t result = prepareUpdate();
+  if (result != RETURN_OK) {
+    return result;
+  }
+  result = writeUpdatePackets();
+  if (result != RETURN_OK) {
+    return result;
+  }
+  result = handleCheckMemoryCommand();
+  if (result != RETURN_OK) {
+    return result;
+  }
+  return result;
+}
+
+ReturnValue_t PlocSupvHelper::writeUpdatePackets() {
+  ReturnValue_t result = RETURN_OK;
 #if OBSW_DEBUG_PLOC_SUPERVISOR == 1
   ProgressPrinter progressPrinter("Supervisor update", update.length,
                                   ProgressPrinter::HALF_PERCENT);
 #endif /* OBSW_DEBUG_PLOC_SUPERVISOR == 1 */
   uint8_t tempData[supv::WriteMemory::CHUNK_MAX];
   std::ifstream file(update.file, std::ifstream::binary);
-  size_t remainingSize = update.length;
   uint16_t dataLength = 0;
-  size_t bytesWritten = 0;
+  supv::SequenceFlags seqFlags;
-  uint16_t sequenceCount = 1;
+  while (update.remainingSize > 0) {
-  supv::SequenceFlags seqFlags = supv::SequenceFlags::FIRST_PKT;
-  while (remainingSize > 0) {
     if (terminate) {
       terminate = false;
+      triggerEvent(TERMINATED_UPDATE_PROCEDURE);
       return PROCESS_TERMINATED;
     }
-    if (remainingSize > supv::WriteMemory::CHUNK_MAX) {
+    if (update.remainingSize > supv::WriteMemory::CHUNK_MAX) {
       dataLength = supv::WriteMemory::CHUNK_MAX;
     } else {
-      dataLength = static_cast<uint16_t>(remainingSize);
+      dataLength = static_cast<uint16_t>(update.remainingSize);
     }
     if (file.is_open()) {
-      file.seekg(bytesWritten, file.beg);
+      file.seekg(update.bytesWritten, file.beg);
       file.read(reinterpret_cast<char*>(tempData), dataLength);
       if (!file) {
         sif::warning << "PlocSupvHelper::performUpdate: Read only " << file.gcount() << " of "
                      << dataLength << " bytes" << std::endl;
         sif::info << "PlocSupvHelper::performUpdate: Failed when trying to read byte "
-                  << bytesWritten << std::endl;
+                  << update.bytesWritten << std::endl;
       }
-      remainingSize -= dataLength;
     } else {
       return FILE_CLOSED_ACCIDENTALLY;
     }
-    if (bytesWritten == 0) {
+    if (update.bytesWritten == 0) {
       seqFlags = supv::SequenceFlags::FIRST_PKT;
-    } else if (remainingSize == 0) {
+    } else if (update.remainingSize == 0) {
       seqFlags = supv::SequenceFlags::LAST_PKT;
     } else {
       seqFlags = supv::SequenceFlags::CONTINUED_PKT;
     }
-    supv::WriteMemory packet(seqFlags, sequenceCount++, update.memoryId,
+    supv::WriteMemory packet(seqFlags, update.sequenceCount++, update.memoryId,
-                             update.startAddress + bytesWritten, dataLength, tempData);
+                             update.startAddress + update.bytesWritten, dataLength, tempData);
     result = handlePacketTransmission(packet);
     if (result != RETURN_OK) {
+      update.sequenceCount--;
+      triggerEvent(WRITE_MEMORY_FAILED, update.packetNum);
       return result;
     }
-    bytesWritten += dataLength;
+    update.remainingSize -= dataLength;
+    update.packetNum += 1;
+    update.bytesWritten += dataLength;
 #if OBSW_DEBUG_PLOC_SUPERVISOR == 1
-    progressPrinter.print(bytesWritten);
+    progressPrinter.print(update.bytesWritten);
 #endif /* OBSW_DEBUG_PLOC_SUPERVISOR == 1 */
   }
-  result = handleCheckMemoryCommand();
-  if (result != RETURN_OK) {
-    return result;
-  }
   return result;
 }
 
@@ -230,10 +282,20 @@ ReturnValue_t PlocSupvHelper::performEventBufferRequest() {
   return result;
 }
 
+ReturnValue_t PlocSupvHelper::selectMemory() {
+  ReturnValue_t result = RETURN_OK;
+  supv::MPSoCBootSelect packet(update.memoryId);
+  result = handlePacketTransmission(packet);
+  if (result != RETURN_OK) {
+    return result;
+  }
+  return RETURN_OK;
+}
+
 ReturnValue_t PlocSupvHelper::prepareUpdate() {
   ReturnValue_t result = RETURN_OK;
   supv::ApidOnlyPacket packet(supv::APID_PREPARE_UPDATE);
-  result = handlePacketTransmission(packet);
+  result = handlePacketTransmission(packet, PREPARE_UPDATE_EXECUTION_REPORT);
   if (result != RETURN_OK) {
     return result;
   }
@@ -342,8 +404,8 @@ ReturnValue_t PlocSupvHelper::handleTmReception(supv::TmPacket* tmPacket, size_t
     }
   }
   if (remainingBytes != 0) {
-    sif::warning << "PlocSupvHelper::handleTmReception: Failed to read " << remainingBytes
+    sif::warning << "PlocSupvHelper::handleTmReception: Failed to read " << std::dec
-                 << " bytes" << std::endl;
+                 << remainingBytes << " bytes" << std::endl;
     return RETURN_FAILED;
   }
   result = tmPacket->checkCrc();
@@ -372,6 +434,8 @@ ReturnValue_t PlocSupvHelper::receive(uint8_t* data, size_t* readBytes, size_t r
   }
   if (*readBytes > 0) {
     std::memcpy(data, buffer, *readBytes);
+  } else {
+    TaskFactory::delayTask(40);
   }
   return result;
 }

linux/devices/ploc/PlocSupvHelper.h

@@ -28,56 +28,63 @@ class PlocSupvHelper : public SystemObject, public ExecutableObjectIF, public Ha
   static const Event SUPV_UPDATE_FAILED = MAKE_EVENT(0, severity::LOW);
   //! [EXPORT] : [COMMENT] update successful
   static const Event SUPV_UPDATE_SUCCESSFUL = MAKE_EVENT(1, severity::LOW);
+  //! [EXPORT] : [COMMENT] Continue update command failed
+  static const Event SUPV_CONTINUE_UPDATE_FAILED = MAKE_EVENT(2, severity::LOW);
+  //! [EXPORT] : [COMMENT] Continue update command successful
+  static const Event SUPV_CONTINUE_UPDATE_SUCCESSFUL = MAKE_EVENT(3, severity::LOW);
   //! [EXPORT] : [COMMENT] Terminated update procedure by command
-  static const Event TERMINATED_UPDATE_PROCEDURE = MAKE_EVENT(2, severity::LOW);
+  static const Event TERMINATED_UPDATE_PROCEDURE = MAKE_EVENT(4, severity::LOW);
   //! [EXPORT] : [COMMENT] Requesting event buffer was successful
-  static const Event SUPV_EVENT_BUFFER_REQUEST_SUCCESSFUL = MAKE_EVENT(3, severity::LOW);
+  static const Event SUPV_EVENT_BUFFER_REQUEST_SUCCESSFUL = MAKE_EVENT(5, severity::LOW);
   //! [EXPORT] : [COMMENT] Requesting event buffer failed
-  static const Event SUPV_EVENT_BUFFER_REQUEST_FAILED = MAKE_EVENT(4, severity::LOW);
+  static const Event SUPV_EVENT_BUFFER_REQUEST_FAILED = MAKE_EVENT(6, severity::LOW);
   //! [EXPORT] : [COMMENT] Terminated event buffer request by command
   //! P1: Number of packets read before process was terminated
-  static const Event SUPV_EVENT_BUFFER_REQUEST_TERMINATED = MAKE_EVENT(5, severity::LOW);
+  static const Event SUPV_EVENT_BUFFER_REQUEST_TERMINATED = MAKE_EVENT(7, severity::LOW);
   //! [EXPORT] : [COMMENT] Communication interface returned failure when trying to send the command
   //! to the supervisor
   //! P1: Return value returned by the communication interface sendMessage function
   //! P2: Internal state of supervisor helper
-  static const Event SUPV_SENDING_COMMAND_FAILED = MAKE_EVENT(6, severity::LOW);
+  static const Event SUPV_SENDING_COMMAND_FAILED = MAKE_EVENT(8, severity::LOW);
   //! [EXPORT] : [COMMENT] Request receive message of communication interface failed
   //! P1: Return value returned by the communication interface requestReceiveMessage function
   //! P2: Internal state of supervisor helper
-  static const Event SUPV_HELPER_REQUESTING_REPLY_FAILED = MAKE_EVENT(7, severity::LOW);
+  static const Event SUPV_HELPER_REQUESTING_REPLY_FAILED = MAKE_EVENT(9, severity::LOW);
   //! [EXPORT] : [COMMENT] Reading receive message of communication interface failed
   //! P1: Return value returned by the communication interface readingReceivedMessage function
   //! P2: Internal state of supervisor helper
-  static const Event SUPV_HELPER_READING_REPLY_FAILED = MAKE_EVENT(8, severity::LOW);
+  static const Event SUPV_HELPER_READING_REPLY_FAILED = MAKE_EVENT(10, severity::LOW);
   //! [EXPORT] : [COMMENT] Did not receive acknowledgement report
   //! P1: Number of bytes missing
   //! P2: Internal state of MPSoC helper
-  static const Event SUPV_MISSING_ACK = MAKE_EVENT(9, severity::LOW);
+  static const Event SUPV_MISSING_ACK = MAKE_EVENT(11, severity::LOW);
   //! [EXPORT] : [COMMENT] Supervisor did not receive execution report
   //! P1: Number of bytes missing
   //! P2: Internal state of supervisor helper
-  static const Event SUPV_MISSING_EXE = MAKE_EVENT(10, severity::LOW);
+  static const Event SUPV_MISSING_EXE = MAKE_EVENT(12, severity::LOW);
   //! [EXPORT] : [COMMENT] Supervisor received acknowledgment failure report
   //! P1: Internal state of supervisor helper
-  static const Event SUPV_ACK_FAILURE_REPORT = MAKE_EVENT(11, severity::LOW);
+  static const Event SUPV_ACK_FAILURE_REPORT = MAKE_EVENT(13, severity::LOW);
   //! [EXPORT] : [COMMENT] Execution report failure
   //! P1:
-  static const Event SUPV_EXE_FAILURE_REPORT = MAKE_EVENT(12, severity::LOW);
+  static const Event SUPV_EXE_FAILURE_REPORT = MAKE_EVENT(14, severity::LOW);
   //! [EXPORT] : [COMMENT] Supervisor expected acknowledgment report but received space packet with
   //! other apid P1: Apid of received space packet P2: Internal state of supervisor helper
-  static const Event SUPV_ACK_INVALID_APID = MAKE_EVENT(13, severity::LOW);
+  static const Event SUPV_ACK_INVALID_APID = MAKE_EVENT(15, severity::LOW);
   //! [EXPORT] : [COMMENT] Supervisor helper expected execution report but received space packet
   //! with other apid P1: Apid of received space packet P2: Internal state of supervisor helper
-  static const Event SUPV_EXE_INVALID_APID = MAKE_EVENT(14, severity::LOW);
+  static const Event SUPV_EXE_INVALID_APID = MAKE_EVENT(16, severity::LOW);
   //! [EXPORT] : [COMMENT] Failed to receive acknowledgment report
   //! P1: Return value
   //! P2: Apid of command for which the reception of the acknowledgment report failed
-  static const Event ACK_RECEPTION_FAILURE = MAKE_EVENT(15, severity::LOW);
+  static const Event ACK_RECEPTION_FAILURE = MAKE_EVENT(17, severity::LOW);
   //! [EXPORT] : [COMMENT] Failed to receive execution report
   //! P1: Return value
   //! P2: Apid of command for which the reception of the execution report failed
-  static const Event EXE_RECEPTION_FAILURE = MAKE_EVENT(16, severity::LOW);
+  static const Event EXE_RECEPTION_FAILURE = MAKE_EVENT(18, severity::LOW);
+  //! [EXPORT] : [COMMENT] Update procedure failed when sending packet with number P1
+  //! P1: Packet number for which the memory write command fails
+  static const Event WRITE_MEMORY_FAILED = MAKE_EVENT(19, severity::LOW);
 
   PlocSupvHelper(object_id_t objectId);
   virtual ~PlocSupvHelper();
@@ -99,6 +106,11 @@ class PlocSupvHelper : public SystemObject, public ExecutableObjectIF, public Ha
    */
   ReturnValue_t startUpdate(std::string file, uint8_t memoryId, uint32_t startAddress);
 
+  /**
+   * @brief This initiate the continuation of a failed update.
+   */
+  void initiateUpdateContinuation();
+
   /**
    * @brief Calling this function will initiate the procedure to request the event buffer
    */
@@ -128,6 +140,7 @@ class PlocSupvHelper : public SystemObject, public ExecutableObjectIF, public Ha
   static const size_t SIZE_EVENT_BUFFER_FULL_PACKET = 1024;
   static const size_t SIZE_EVENT_BUFFER_LAST_PACKET = 200;
   static const uint32_t CRC_EXECUTION_TIMEOUT = 60000;
+  static const uint32_t PREPARE_UPDATE_EXECUTION_REPORT = 2000;
 
   struct Update {
     uint8_t memoryId;
@@ -137,6 +150,10 @@ class PlocSupvHelper : public SystemObject, public ExecutableObjectIF, public Ha
     // Size of update
     uint32_t length;
     uint32_t crc;
+    size_t remainingSize;
+    size_t bytesWritten;
+    uint32_t packetNum;
+    uint16_t sequenceCount;
   };
 
   struct Update update;
@@ -150,7 +167,7 @@ class PlocSupvHelper : public SystemObject, public ExecutableObjectIF, public Ha
 
   EventBufferRequest eventBufferReq;
 
-  enum class InternalState { IDLE, UPDATE, REQUEST_EVENT_BUFFER };
+  enum class InternalState { IDLE, UPDATE, CONTINUE_UPDATE, REQUEST_EVENT_BUFFER };
 
   InternalState internalState = InternalState::IDLE;
 
@@ -175,9 +192,11 @@ class PlocSupvHelper : public SystemObject, public ExecutableObjectIF, public Ha
   uint16_t rememberApid = 0;
 
   ReturnValue_t performUpdate();
+  ReturnValue_t continueUpdate();
+  ReturnValue_t writeUpdatePackets();
   ReturnValue_t performEventBufferRequest();
   ReturnValue_t handlePacketTransmission(SpacePacket& packet,
-                                         uint32_t timeoutExecutionReport = 1000);
+                                         uint32_t timeoutExecutionReport = 60000);
   ReturnValue_t sendCommand(SpacePacket& packet);
   /**
    * @brief Function which reads form the communication interface
@@ -195,9 +214,13 @@ class PlocSupvHelper : public SystemObject, public ExecutableObjectIF, public Ha
    * @param tmPacket        Pointer to space packet where received data will be written to
    * @param reaminingBytes  Number of bytes to read in the space packet
    * @param timeout         Receive timeout in milliseconds
+   *
+   * @note  It can take up to 70 seconds until the supervisor replies with an acknowledgment
+   *        failure report.
    */
   ReturnValue_t handleTmReception(supv::TmPacket* tmPacket, size_t remainingBytes,
-                                  uint32_t timeout = 1000);
+                                  uint32_t timeout = 70000);
+  ReturnValue_t selectMemory();
   ReturnValue_t prepareUpdate();
   ReturnValue_t eraseMemory();
   // Calculates CRC over image. Will be used for verification after update writing has

linux/devices/startracker/CMakeLists.txt

@@ -1,7 +1,4 @@
-target_sources(${OBSW_NAME} PRIVATE
+target_sources(
-    StarTrackerHandler.cpp
+  ${OBSW_NAME}
-    StarTrackerJsonCommands.cpp
+  PRIVATE StarTrackerHandler.cpp StarTrackerJsonCommands.cpp
-    ArcsecDatalinkLayer.cpp
+          ArcsecDatalinkLayer.cpp ArcsecJsonParamBase.cpp StrHelper.cpp)
-    ArcsecJsonParamBase.cpp
-    StrHelper.cpp
-)

linux/fsfwconfig/CMakeLists.txt

@@ -1,28 +1,16 @@
-target_sources(${OBSW_NAME} PRIVATE
+target_sources(${OBSW_NAME} PRIVATE ipc/MissionMessageTypes.cpp
-	ipc/MissionMessageTypes.cpp
+                                    pollingsequence/pollingSequenceFactory.cpp)
-	pollingsequence/pollingSequenceFactory.cpp
-)
 
-target_include_directories(${OBSW_NAME} PUBLIC
+target_include_directories(${OBSW_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-	${CMAKE_CURRENT_SOURCE_DIR}
-)
 
 # If a special translation file for object IDs exists, compile it.
 if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/objects/translateObjects.cpp")
-    target_sources(${OBSW_NAME} PRIVATE
+  target_sources(${OBSW_NAME} PRIVATE objects/translateObjects.cpp)
-        objects/translateObjects.cpp
+  target_sources(${UNITTEST_NAME} PRIVATE objects/translateObjects.cpp)
-    )
-    target_sources(${UNITTEST_NAME} PRIVATE
-        objects/translateObjects.cpp
-    )
 endif()
 
 # If a special translation file for events exists, compile it.
 if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/objects/translateObjects.cpp")
-    target_sources(${OBSW_NAME} PRIVATE
+  target_sources(${OBSW_NAME} PRIVATE events/translateEvents.cpp)
-        events/translateEvents.cpp
+  target_sources(${UNITTEST_NAME} PRIVATE events/translateEvents.cpp)
-    )
-    target_sources(${UNITTEST_NAME} PRIVATE
-        events/translateEvents.cpp
-    )
 endif()

linux/fsfwconfig/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
- * @brief    Auto-generated event translation file. Contains 200 translations.
+ * @brief    Auto-generated event translation file. Contains 206 translations.
  * @details
- * Generated on: 2022-05-11 17:58:22
+ * Generated on: 2022-05-23 16:46:55
  */
 #include "translateEvents.h"
 
@@ -90,9 +90,12 @@ 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 *HEATER_WENT_ON_STRING = "HEATER_WENT_ON";
+const char *HEATER_WENT_OFF_STRING = "HEATER_WENT_OFF";
 const char *SWITCH_ALREADY_ON_STRING = "SWITCH_ALREADY_ON";
 const char *SWITCH_ALREADY_OFF_STRING = "SWITCH_ALREADY_OFF";
 const char *MAIN_SWITCH_TIMEOUT_STRING = "MAIN_SWITCH_TIMEOUT";
+const char *FAULTY_HEATER_WAS_ON_STRING = "FAULTY_HEATER_WAS_ON";
 const char *MAIN_SWITCH_ON_TIMEOUT_STRING = "MAIN_SWITCH_ON_TIMEOUT";
 const char *MAIN_SWITCH_OFF_TIMEOUT_STRING = "MAIN_SWITCH_OFF_TIMEOUT";
 const char *DEPLOYMENT_FAILED_STRING = "DEPLOYMENT_FAILED";
@@ -182,6 +185,8 @@ const char *BATT_MODE_STRING = "BATT_MODE";
 const char *BATT_MODE_CHANGED_STRING = "BATT_MODE_CHANGED";
 const char *SUPV_UPDATE_FAILED_STRING = "SUPV_UPDATE_FAILED";
 const char *SUPV_UPDATE_SUCCESSFUL_STRING = "SUPV_UPDATE_SUCCESSFUL";
+const char *SUPV_CONTINUE_UPDATE_FAILED_STRING = "SUPV_CONTINUE_UPDATE_FAILED";
+const char *SUPV_CONTINUE_UPDATE_SUCCESSFUL_STRING = "SUPV_CONTINUE_UPDATE_SUCCESSFUL";
 const char *TERMINATED_UPDATE_PROCEDURE_STRING = "TERMINATED_UPDATE_PROCEDURE";
 const char *SUPV_EVENT_BUFFER_REQUEST_SUCCESSFUL_STRING = "SUPV_EVENT_BUFFER_REQUEST_SUCCESSFUL";
 const char *SUPV_EVENT_BUFFER_REQUEST_FAILED_STRING = "SUPV_EVENT_BUFFER_REQUEST_FAILED";
@@ -197,6 +202,7 @@ const char *SUPV_ACK_INVALID_APID_STRING = "SUPV_ACK_INVALID_APID";
 const char *SUPV_EXE_INVALID_APID_STRING = "SUPV_EXE_INVALID_APID";
 const char *ACK_RECEPTION_FAILURE_STRING = "ACK_RECEPTION_FAILURE";
 const char *EXE_RECEPTION_FAILURE_STRING = "EXE_RECEPTION_FAILURE";
+const char *WRITE_MEMORY_FAILED_STRING = "WRITE_MEMORY_FAILED";
 const char *ALLOC_FAILURE_STRING = "ALLOC_FAILURE";
 const char *REBOOT_SW_STRING = "REBOOT_SW";
 const char *REBOOT_MECHANISM_TRIGGERED_STRING = "REBOOT_MECHANISM_TRIGGERED";
@@ -375,11 +381,17 @@ const char *translateEvents(Event event) {
     case (11401):
       return GPIO_PULL_LOW_FAILED_STRING;
     case (11402):
-      return SWITCH_ALREADY_ON_STRING;
+      return HEATER_WENT_ON_STRING;
     case (11403):
-      return SWITCH_ALREADY_OFF_STRING;
+      return HEATER_WENT_OFF_STRING;
     case (11404):
+      return SWITCH_ALREADY_ON_STRING;
+    case (11405):
+      return SWITCH_ALREADY_OFF_STRING;
+    case (11406):
       return MAIN_SWITCH_TIMEOUT_STRING;
+    case (11407):
+      return FAULTY_HEATER_WAS_ON_STRING;
     case (11500):
       return MAIN_SWITCH_ON_TIMEOUT_STRING;
     case (11501):
@@ -559,35 +571,41 @@ const char *translateEvents(Event event) {
     case (13601):
       return SUPV_UPDATE_SUCCESSFUL_STRING;
     case (13602):
-      return TERMINATED_UPDATE_PROCEDURE_STRING;
+      return SUPV_CONTINUE_UPDATE_FAILED_STRING;
     case (13603):
-      return SUPV_EVENT_BUFFER_REQUEST_SUCCESSFUL_STRING;
+      return SUPV_CONTINUE_UPDATE_SUCCESSFUL_STRING;
     case (13604):
-      return SUPV_EVENT_BUFFER_REQUEST_FAILED_STRING;
+      return TERMINATED_UPDATE_PROCEDURE_STRING;
     case (13605):
-      return SUPV_EVENT_BUFFER_REQUEST_TERMINATED_STRING;
+      return SUPV_EVENT_BUFFER_REQUEST_SUCCESSFUL_STRING;
     case (13606):
-      return SUPV_SENDING_COMMAND_FAILED_STRING;
+      return SUPV_EVENT_BUFFER_REQUEST_FAILED_STRING;
     case (13607):
-      return SUPV_HELPER_REQUESTING_REPLY_FAILED_STRING;
+      return SUPV_EVENT_BUFFER_REQUEST_TERMINATED_STRING;
     case (13608):
-      return SUPV_HELPER_READING_REPLY_FAILED_STRING;
+      return SUPV_SENDING_COMMAND_FAILED_STRING;
     case (13609):
-      return SUPV_MISSING_ACK_STRING;
+      return SUPV_HELPER_REQUESTING_REPLY_FAILED_STRING;
     case (13610):
-      return SUPV_MISSING_EXE_STRING;
+      return SUPV_HELPER_READING_REPLY_FAILED_STRING;
     case (13611):
-      return SUPV_ACK_FAILURE_REPORT_STRING;
+      return SUPV_MISSING_ACK_STRING;
     case (13612):
-      return SUPV_EXE_FAILURE_REPORT_STRING;
+      return SUPV_MISSING_EXE_STRING;
     case (13613):
-      return SUPV_ACK_INVALID_APID_STRING;
+      return SUPV_ACK_FAILURE_REPORT_STRING;
     case (13614):
-      return SUPV_EXE_INVALID_APID_STRING;
+      return SUPV_EXE_FAILURE_REPORT_STRING;
     case (13615):
-      return ACK_RECEPTION_FAILURE_STRING;
+      return SUPV_ACK_INVALID_APID_STRING;
     case (13616):
+      return SUPV_EXE_INVALID_APID_STRING;
+    case (13617):
+      return ACK_RECEPTION_FAILURE_STRING;
+    case (13618):
       return EXE_RECEPTION_FAILURE_STRING;
+    case (13619):
+      return WRITE_MEMORY_FAILED_STRING;
     case (13700):
       return ALLOC_FAILURE_STRING;
     case (13701):

linux/fsfwconfig/objects/systemObjectList.h

@@ -50,13 +50,7 @@ enum sourceObjects : uint32_t {
   SPI_MAIN_COM_IF = 0x49020004,
   GPIO_IF = 0x49010005,
   SPI_RW_COM_IF = 0x49020005,
-
+  SPI_RTD_COM_IF = 0x49020006,
-  /* Custom device handler */
-  PCDU_HANDLER = 0x442000A1,
-  SOLAR_ARRAY_DEPL_HANDLER = 0x444100A2,
-  SYRLINKS_HK_HANDLER = 0x445300A3,
-  HEATER_HANDLER = 0x444100A4,
-  RAD_SENSOR = 0x443200A5,
 
   /* 0x54 ('T') for test handlers */
   TEST_TASK = 0x54694269,

linux/fsfwconfig/objects/translateObjects.cpp

@@ -1,8 +1,8 @@
 /**
  * @brief  Auto-generated object translation file.
  * @details
- * Contains 118 translations.
+ * Contains 131 translations.
- * Generated on: 2022-05-11 17:58:22
+ * Generated on: 2022-05-23 16:46:58
  */
 #include "translateObjects.h"
 
@@ -45,9 +45,12 @@ const char *ACU_HANDLER_STRING = "ACU_HANDLER";
 const char *BPX_BATT_HANDLER_STRING = "BPX_BATT_HANDLER";
 const char *PLPCDU_HANDLER_STRING = "PLPCDU_HANDLER";
 const char *RAD_SENSOR_STRING = "RAD_SENSOR";
+const char *PLOC_UPDATER_STRING = "PLOC_UPDATER";
 const char *PLOC_MEMORY_DUMPER_STRING = "PLOC_MEMORY_DUMPER";
 const char *STR_HELPER_STRING = "STR_HELPER";
 const char *PLOC_MPSOC_HELPER_STRING = "PLOC_MPSOC_HELPER";
+const char *AXI_PTME_CONFIG_STRING = "AXI_PTME_CONFIG";
+const char *PTME_CONFIG_STRING = "PTME_CONFIG";
 const char *PLOC_MPSOC_HANDLER_STRING = "PLOC_MPSOC_HANDLER";
 const char *PLOC_SUPERVISOR_HANDLER_STRING = "PLOC_SUPERVISOR_HANDLER";
 const char *PLOC_SUPERVISOR_HELPER_STRING = "PLOC_SUPERVISOR_HELPER";
@@ -76,6 +79,7 @@ const char *ARDUINO_COM_IF_STRING = "ARDUINO_COM_IF";
 const char *GPIO_IF_STRING = "GPIO_IF";
 const char *SPI_MAIN_COM_IF_STRING = "SPI_MAIN_COM_IF";
 const char *SPI_RW_COM_IF_STRING = "SPI_RW_COM_IF";
+const char *SPI_RTD_COM_IF_STRING = "SPI_RTD_COM_IF";
 const char *UART_COM_IF_STRING = "UART_COM_IF";
 const char *I2C_COM_IF_STRING = "I2C_COM_IF";
 const char *CSP_COM_IF_STRING = "CSP_COM_IF";
@@ -96,6 +100,7 @@ const char *PUS_SERVICE_3_HOUSEKEEPING_STRING = "PUS_SERVICE_3_HOUSEKEEPING";
 const char *PUS_SERVICE_5_EVENT_REPORTING_STRING = "PUS_SERVICE_5_EVENT_REPORTING";
 const char *PUS_SERVICE_8_FUNCTION_MGMT_STRING = "PUS_SERVICE_8_FUNCTION_MGMT";
 const char *PUS_SERVICE_9_TIME_MGMT_STRING = "PUS_SERVICE_9_TIME_MGMT";
+const char *PUS_SERVICE_11_TC_SCHEDULER_STRING = "PUS_SERVICE_11_TC_SCHEDULER";
 const char *PUS_SERVICE_17_TEST_STRING = "PUS_SERVICE_17_TEST";
 const char *PUS_SERVICE_20_PARAMETERS_STRING = "PUS_SERVICE_20_PARAMETERS";
 const char *PUS_SERVICE_200_MODE_MGMT_STRING = "PUS_SERVICE_200_MODE_MGMT";
@@ -117,6 +122,14 @@ const char *DUMMY_HANDLER_STRING = "DUMMY_HANDLER";
 const char *DUMMY_INTERFACE_STRING = "DUMMY_INTERFACE";
 const char *LIBGPIOD_TEST_STRING = "LIBGPIOD_TEST";
 const char *TEST_TASK_STRING = "TEST_TASK";
+const char *HEATER_0_PLOC_PROC_BRD_STRING = "HEATER_0_PLOC_PROC_BRD";
+const char *HEATER_1_PCDU_BRD_STRING = "HEATER_1_PCDU_BRD";
+const char *HEATER_2_ACS_BRD_STRING = "HEATER_2_ACS_BRD";
+const char *HEATER_3_OBC_BRD_STRING = "HEATER_3_OBC_BRD";
+const char *HEATER_4_CAMERA_STRING = "HEATER_4_CAMERA";
+const char *HEATER_5_STR_STRING = "HEATER_5_STR";
+const char *HEATER_6_DRO_STRING = "HEATER_6_DRO";
+const char *HEATER_7_HPA_STRING = "HEATER_7_HPA";
 const char *ACS_BOARD_ASS_STRING = "ACS_BOARD_ASS";
 const char *SUS_BOARD_ASS_STRING = "SUS_BOARD_ASS";
 const char *TCS_BOARD_ASS_STRING = "TCS_BOARD_ASS";
@@ -205,12 +218,18 @@ const char *translateObject(object_id_t object) {
       return PLPCDU_HANDLER_STRING;
     case 0x443200A5:
       return RAD_SENSOR_STRING;
+    case 0x44330000:
+      return PLOC_UPDATER_STRING;
     case 0x44330001:
       return PLOC_MEMORY_DUMPER_STRING;
     case 0x44330002:
       return STR_HELPER_STRING;
     case 0x44330003:
       return PLOC_MPSOC_HELPER_STRING;
+    case 0x44330004:
+      return AXI_PTME_CONFIG_STRING;
+    case 0x44330005:
+      return PTME_CONFIG_STRING;
     case 0x44330015:
       return PLOC_MPSOC_HANDLER_STRING;
     case 0x44330016:
@@ -267,6 +286,8 @@ const char *translateObject(object_id_t object) {
       return SPI_MAIN_COM_IF_STRING;
     case 0x49020005:
       return SPI_RW_COM_IF_STRING;
+    case 0x49020006:
+      return SPI_RTD_COM_IF_STRING;
     case 0x49030003:
       return UART_COM_IF_STRING;
     case 0x49040002:
@@ -307,6 +328,8 @@ const char *translateObject(object_id_t object) {
       return PUS_SERVICE_8_FUNCTION_MGMT_STRING;
     case 0x53000009:
       return PUS_SERVICE_9_TIME_MGMT_STRING;
+    case 0x53000011:
+      return PUS_SERVICE_11_TC_SCHEDULER_STRING;
     case 0x53000017:
       return PUS_SERVICE_17_TEST_STRING;
     case 0x53000020:
@@ -349,6 +372,22 @@ const char *translateObject(object_id_t object) {
       return LIBGPIOD_TEST_STRING;
     case 0x54694269:
       return TEST_TASK_STRING;
+    case 0x60000000:
+      return HEATER_0_PLOC_PROC_BRD_STRING;
+    case 0x60000001:
+      return HEATER_1_PCDU_BRD_STRING;
+    case 0x60000002:
+      return HEATER_2_ACS_BRD_STRING;
+    case 0x60000003:
+      return HEATER_3_OBC_BRD_STRING;
+    case 0x60000004:
+      return HEATER_4_CAMERA_STRING;
+    case 0x60000005:
+      return HEATER_5_STR_STRING;
+    case 0x60000006:
+      return HEATER_6_DRO_STRING;
+    case 0x60000007:
+      return HEATER_7_HPA_STRING;
     case 0x73000001:
       return ACS_BOARD_ASS_STRING;
     case 0x73000002:

linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp

@@ -5,6 +5,8 @@
 #include <fsfw/serviceinterface/ServiceInterfaceStream.h>
 #include <fsfw/tasks/FixedTimeslotTaskIF.h>
 
+#include "mission/devices/devicedefinitions/Max31865Definitions.h"
+
 #ifndef RPI_TEST_ADIS16507
 #define RPI_TEST_ADIS16507 0
 #endif
@@ -64,157 +66,34 @@ ReturnValue_t pst::pstSpi(FixedTimeslotTaskIF *thisSequence) {
   static_cast<void>(length);
 #if OBSW_ADD_PL_PCDU == 1
   thisSequence->addSlot(objects::PLPCDU_HANDLER, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::PLPCDU_HANDLER, length * 0.2, DeviceHandlerIF::SEND_WRITE);
+  thisSequence->addSlot(objects::PLPCDU_HANDLER, length * 0, DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::PLPCDU_HANDLER, length * 0.4, DeviceHandlerIF::GET_WRITE);
+  thisSequence->addSlot(objects::PLPCDU_HANDLER, length * 0, DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::PLPCDU_HANDLER, length * 0.6, DeviceHandlerIF::SEND_READ);
+  thisSequence->addSlot(objects::PLPCDU_HANDLER, length * 0, DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::PLPCDU_HANDLER, length * 0.8, DeviceHandlerIF::GET_READ);
+  thisSequence->addSlot(objects::PLPCDU_HANDLER, length * 0, DeviceHandlerIF::GET_READ);
 #endif
 #if OBSW_ADD_TMP_DEVICES == 1
   thisSequence->addSlot(objects::TMP1075_HANDLER_1, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
   thisSequence->addSlot(objects::TMP1075_HANDLER_2, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
 #endif
-#if OBSW_ADD_RTD_DEVICES == 1
-  thisSequence->addSlot(objects::RTD_0_IC3_PLOC_HEATSPREADER, length * 0,
-                        DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::RTD_1_IC4_PLOC_MISSIONBOARD, length * 0,
-                        DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::RTD_2_IC5_4K_CAMERA, length * 0,
-                        DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::RTD_3_IC6_DAC_HEATSPREADER, length * 0,
-                        DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::RTD_4_IC7_STARTRACKER, length * 0,
-                        DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::RTD_5_IC8_RW1_MX_MY, length * 0,
-                        DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::RTD_6_IC9_DRO, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::RTD_7_IC10_SCEX, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::RTD_8_IC11_X8, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::RTD_9_IC12_HPA, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::RTD_10_IC13_PL_TX, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::RTD_11_IC14_MPA, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::RTD_12_IC15_ACU, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::RTD_13_IC16_PLPCDU_HEATSPREADER, length * 0,
-                        DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::RTD_14_IC17_TCS_BOARD, length * 0,
-                        DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::RTD_15_IC18_IMTQ, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
-#endif /* OBSW_ADD_RTD_DEVICES */
 
 #if OBSW_ADD_TMP_DEVICES == 1
   thisSequence->addSlot(objects::TMP1075_HANDLER_1, length * 0.2, DeviceHandlerIF::SEND_WRITE);
   thisSequence->addSlot(objects::TMP1075_HANDLER_2, length * 0.2, DeviceHandlerIF::SEND_WRITE);
 #endif
-#if OBSW_ADD_RTD_DEVICES == 1
-  thisSequence->addSlot(objects::RTD_0_IC3_PLOC_HEATSPREADER, length * 0.2,
-                        DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::RTD_1_IC4_PLOC_MISSIONBOARD, length * 0.2,
-                        DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::RTD_2_IC5_4K_CAMERA, length * 0.2, DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::RTD_3_IC6_DAC_HEATSPREADER, length * 0.2,
-                        DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::RTD_4_IC7_STARTRACKER, length * 0.2, DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::RTD_5_IC8_RW1_MX_MY, length * 0.2, DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::RTD_6_IC9_DRO, length * 0.2, DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::RTD_7_IC10_SCEX, length * 0.2, DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::RTD_8_IC11_X8, length * 0.2, DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::RTD_9_IC12_HPA, length * 0.2, DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::RTD_10_IC13_PL_TX, length * 0.2, DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::RTD_11_IC14_MPA, length * 0.2, DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::RTD_12_IC15_ACU, length * 0.2, DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::RTD_13_IC16_PLPCDU_HEATSPREADER, length * 0.2,
-                        DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::RTD_14_IC17_TCS_BOARD, length * 0.2, DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::RTD_15_IC18_IMTQ, length * 0.2, DeviceHandlerIF::SEND_WRITE);
-#endif /* OBSW_ADD_RTD_DEVICES */
 
 #if OBSW_ADD_TMP_DEVICES == 1
-  thisSequence->addSlot(objects::TMP1075_HANDLER_1, length * 0.4, DeviceHandlerIF::GET_WRITE);
+  thisSequence->addSlot(objects::TMP1075_HANDLER_1, length * 0.2, DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::TMP1075_HANDLER_2, length * 0.4, DeviceHandlerIF::GET_WRITE);
+  thisSequence->addSlot(objects::TMP1075_HANDLER_2, length * 0.2, DeviceHandlerIF::GET_WRITE);
 #endif
-#if OBSW_ADD_RTD_DEVICES == 1
-  thisSequence->addSlot(objects::RTD_0_IC3_PLOC_HEATSPREADER, length * 0.4,
-                        DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::RTD_1_IC4_PLOC_MISSIONBOARD, length * 0.4,
-                        DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::RTD_2_IC5_4K_CAMERA, length * 0.4, DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::RTD_3_IC6_DAC_HEATSPREADER, length * 0.4,
-                        DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::RTD_4_IC7_STARTRACKER, length * 0.4, DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::RTD_5_IC8_RW1_MX_MY, length * 0.4, DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::RTD_6_IC9_DRO, length * 0.4, DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::RTD_7_IC10_SCEX, length * 0.4, DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::RTD_8_IC11_X8, length * 0.4, DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::RTD_9_IC12_HPA, length * 0.4, DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::RTD_10_IC13_PL_TX, length * 0.4, DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::RTD_11_IC14_MPA, length * 0.4, DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::RTD_12_IC15_ACU, length * 0.4, DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::RTD_13_IC16_PLPCDU_HEATSPREADER, length * 0.4,
-                        DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::RTD_14_IC17_TCS_BOARD, length * 0.4, DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::RTD_15_IC18_IMTQ, length * 0.4, DeviceHandlerIF::GET_WRITE);
-#endif /* OBSW_ADD_RTD_DEVICES */
 
 #if OBSW_ADD_TMP_DEVICES == 1
-  thisSequence->addSlot(objects::TMP1075_HANDLER_1, length * 0.6, DeviceHandlerIF::SEND_READ);
+  thisSequence->addSlot(objects::TMP1075_HANDLER_1, length * 0.2, DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::TMP1075_HANDLER_2, length * 0.6, DeviceHandlerIF::SEND_READ);
+  thisSequence->addSlot(objects::TMP1075_HANDLER_2, length * 0.2, DeviceHandlerIF::SEND_READ);
 #endif
-#if OBSW_ADD_RTD_DEVICES == 1
-  thisSequence->addSlot(objects::RTD_0_IC3_PLOC_HEATSPREADER, length * 0.6,
-                        DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::RTD_1_IC4_PLOC_MISSIONBOARD, length * 0.6,
-                        DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::RTD_2_IC5_4K_CAMERA, length * 0.6, DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::RTD_3_IC6_DAC_HEATSPREADER, length * 0.6,
-                        DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::RTD_4_IC7_STARTRACKER, length * 0.6, DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::RTD_5_IC8_RW1_MX_MY, length * 0.6, DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::RTD_6_IC9_DRO, length * 0.6, DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::RTD_7_IC10_SCEX, length * 0.6, DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::RTD_8_IC11_X8, length * 0.6, DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::RTD_9_IC12_HPA, length * 0.6, DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::RTD_10_IC13_PL_TX, length * 0.6, DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::RTD_11_IC14_MPA, length * 0.6, DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::RTD_12_IC15_ACU, length * 0.6, DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::RTD_13_IC16_PLPCDU_HEATSPREADER, length * 0.6,
-                        DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::RTD_14_IC17_TCS_BOARD, length * 0.6, DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::RTD_15_IC18_IMTQ, length * 0.6, DeviceHandlerIF::SEND_READ);
-#endif /* OBSW_ADD_RTD_DEVICES */
 
 #if OBSW_ADD_TMP_DEVICES == 1
-  thisSequence->addSlot(objects::TMP1075_HANDLER_1, length * 0.8, DeviceHandlerIF::GET_READ);
+  thisSequence->addSlot(objects::TMP1075_HANDLER_1, length * 0.2, DeviceHandlerIF::GET_READ);
-  thisSequence->addSlot(objects::TMP1075_HANDLER_2, length * 0.8, DeviceHandlerIF::GET_READ);
+  thisSequence->addSlot(objects::TMP1075_HANDLER_2, length * 0.2, DeviceHandlerIF::GET_READ);
-#endif
-#if OBSW_ADD_RTD_DEVICES == 1
-  thisSequence->addSlot(objects::RTD_0_IC3_PLOC_HEATSPREADER, length * 0.8,
-                        DeviceHandlerIF::GET_READ);
-  thisSequence->addSlot(objects::RTD_1_IC4_PLOC_MISSIONBOARD, length * 0.8,
-                        DeviceHandlerIF::GET_READ);
-  thisSequence->addSlot(objects::RTD_2_IC5_4K_CAMERA, length * 0.8, DeviceHandlerIF::GET_READ);
-  thisSequence->addSlot(objects::RTD_3_IC6_DAC_HEATSPREADER, length * 0.8,
-                        DeviceHandlerIF::GET_READ);
-  thisSequence->addSlot(objects::RTD_4_IC7_STARTRACKER, length * 0.8, DeviceHandlerIF::GET_READ);
-  thisSequence->addSlot(objects::RTD_5_IC8_RW1_MX_MY, length * 0.8, DeviceHandlerIF::GET_READ);
-  thisSequence->addSlot(objects::RTD_6_IC9_DRO, length * 0.8, DeviceHandlerIF::GET_READ);
-  thisSequence->addSlot(objects::RTD_7_IC10_SCEX, length * 0.8, DeviceHandlerIF::GET_READ);
-  thisSequence->addSlot(objects::RTD_8_IC11_X8, length * 0.8, DeviceHandlerIF::GET_READ);
-  thisSequence->addSlot(objects::RTD_9_IC12_HPA, length * 0.8, DeviceHandlerIF::GET_READ);
-  thisSequence->addSlot(objects::RTD_10_IC13_PL_TX, length * 0.8, DeviceHandlerIF::GET_READ);
-  thisSequence->addSlot(objects::RTD_11_IC14_MPA, length * 0.8, DeviceHandlerIF::GET_READ);
-  thisSequence->addSlot(objects::RTD_12_IC15_ACU, length * 0.8, DeviceHandlerIF::GET_READ);
-  thisSequence->addSlot(objects::RTD_13_IC16_PLPCDU_HEATSPREADER, length * 0.8,
-                        DeviceHandlerIF::GET_READ);
-  thisSequence->addSlot(objects::RTD_14_IC17_TCS_BOARD, length * 0.8, DeviceHandlerIF::GET_READ);
-  thisSequence->addSlot(objects::RTD_15_IC18_IMTQ, length * 0.8, DeviceHandlerIF::GET_READ);
-#endif /* OBSW_ADD_RTD_DEVICES */
-
-#if OBSW_ADD_RAD_SENSORS == 1
-  /* Radiation sensor */
-  thisSequence->addSlot(objects::RAD_SENSOR, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::RAD_SENSOR, length * 0.2, DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::RAD_SENSOR, length * 0.4, DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::RAD_SENSOR, length * 0.6, DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::RAD_SENSOR, length * 0.8, DeviceHandlerIF::GET_READ);
 #endif
 
 #if OBSW_ADD_SUN_SENSORS == 1
@@ -482,6 +361,15 @@ ReturnValue_t pst::pstSpi(FixedTimeslotTaskIF *thisSequence) {
   }
 #endif /* OBSW_ADD_SUN_SENSORS == 1 */
 
+#if OBSW_ADD_RAD_SENSORS == 1
+  /* Radiation sensor */
+  thisSequence->addSlot(objects::RAD_SENSOR, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
+  thisSequence->addSlot(objects::RAD_SENSOR, length * 0.2, DeviceHandlerIF::SEND_WRITE);
+  thisSequence->addSlot(objects::RAD_SENSOR, length * 0.4, DeviceHandlerIF::GET_WRITE);
+  thisSequence->addSlot(objects::RAD_SENSOR, length * 0.6, DeviceHandlerIF::SEND_READ);
+  thisSequence->addSlot(objects::RAD_SENSOR, length * 0.8, DeviceHandlerIF::GET_READ);
+#endif
+
 #if OBSW_ADD_ACS_BOARD == 1 && OBSW_ADD_ACS_HANDLERS == 1
   bool enableAside = true;
   bool enableBside = true;

linux/obc/CMakeLists.txt

@@ -1,10 +1,3 @@
-target_sources(${OBSW_NAME} PUBLIC
+target_sources(
-	PapbVcInterface.cpp
+  ${OBSW_NAME} PUBLIC PapbVcInterface.cpp Ptme.cpp PdecHandler.cpp
-	Ptme.cpp
+                      PdecConfig.cpp PtmeConfig.cpp AxiPtmeConfig.cpp)
-	PdecHandler.cpp
-	PdecConfig.cpp
-	PtmeConfig.cpp
-	AxiPtmeConfig.cpp
-)
-
-

linux/utility/CMakeLists.txt

@@ -1,7 +1 @@
-target_sources(${OBSW_NAME} PUBLIC
+target_sources(${OBSW_NAME} PUBLIC utility.cpp)
-    utility.cpp
-)
-
-
-
-

mission/controller/CMakeLists.txt

@@ -1,3 +1 @@
-target_sources(${LIB_EIVE_MISSION} PRIVATE
+target_sources(${LIB_EIVE_MISSION} PRIVATE ThermalController.cpp)
-	ThermalController.cpp
-)

mission/core/CMakeLists.txt

@@ -1,5 +1 @@
-target_sources(${LIB_EIVE_MISSION} PRIVATE
+target_sources(${LIB_EIVE_MISSION} PRIVATE GenericFactory.cpp)
-	GenericFactory.cpp
-)
-
-

mission/core/GenericFactory.cpp

@@ -4,6 +4,7 @@
 #include <fsfw/health/HealthTable.h>
 #include <fsfw/internalerror/InternalErrorReporter.h>
 #include <fsfw/pus/CService200ModeCommanding.h>
+#include <fsfw/pus/CService201HealthCommanding.h>
 #include <fsfw/pus/Service17Test.h>
 #include <fsfw/pus/Service1TelecommandVerification.h>
 #include <fsfw/pus/Service20ParameterManagement.h>
@@ -44,10 +45,13 @@
 #define OBSW_TM_TO_PTME 0
 #endif
 
-void ObjectFactory::produceGenericObjects() {
+void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_) {
   // Framework objects
   new EventManager(objects::EVENT_MANAGER);
-  new HealthTable(objects::HEALTH_TABLE);
+  auto healthTable = new HealthTable(objects::HEALTH_TABLE);
+  if (healthTable_ != nullptr) {
+    *healthTable_ = healthTable;
+  }
   new InternalErrorReporter(objects::INTERNAL_ERROR_REPORTER);
   new TimeStamper(objects::TIME_STAMPER);
 
@@ -96,8 +100,9 @@ void ObjectFactory::produceGenericObjects() {
   new Service20ParameterManagement(objects::PUS_SERVICE_20_PARAMETERS, apid::EIVE_OBSW,
                                    pus::PUS_SERVICE_20);
   new CService200ModeCommanding(objects::PUS_SERVICE_200_MODE_MGMT, apid::EIVE_OBSW,
-                                pus::PUS_SERVICE_200, 8, config::LONGEST_MODE_TIMEOUT_SECONDS);
+                                pus::PUS_SERVICE_200, 8);
-
+  new CService201HealthCommanding(objects::PUS_SERVICE_201_HEALTH, apid::EIVE_OBSW,
+                                  pus::PUS_SERVICE_201);
 #if OBSW_ADD_TCPIP_BRIDGE == 1
 #if OBSW_USE_TMTC_TCP_BRIDGE == 0
   auto tmtcBridge = new UdpTmTcBridge(objects::TMTC_BRIDGE, objects::CCSDS_PACKET_DISTRIBUTOR);

mission/core/GenericFactory.h

@@ -1,9 +1,11 @@
 #ifndef MISSION_CORE_GENERICFACTORY_H_
 #define MISSION_CORE_GENERICFACTORY_H_
 
+class HealthTableIF;
+
 namespace ObjectFactory {
 
-void produceGenericObjects();
+void produceGenericObjects(HealthTableIF** healthTable = nullptr);
 
 }
 

mission/devices/CMakeLists.txt

@@ -1,21 +1,22 @@
-target_sources(${LIB_EIVE_MISSION} PRIVATE
+target_sources(
-    GomspaceDeviceHandler.cpp
+  ${LIB_EIVE_MISSION}
-    BpxBatteryHandler.cpp
+  PRIVATE GomspaceDeviceHandler.cpp
-    Tmp1075Handler.cpp
+          BpxBatteryHandler.cpp
-    PCDUHandler.cpp
+          Tmp1075Handler.cpp
-    P60DockHandler.cpp
+          PCDUHandler.cpp
-    PDU1Handler.cpp
+          P60DockHandler.cpp
-    PDU2Handler.cpp
+          PDU1Handler.cpp
-    ACUHandler.cpp
+          PDU2Handler.cpp
-    SyrlinksHkHandler.cpp
+          ACUHandler.cpp
-    Max31865PT1000Handler.cpp
+          SyrlinksHkHandler.cpp
-    IMTQHandler.cpp
+          Max31865PT1000Handler.cpp
-    HeaterHandler.cpp
+          Max31865EiveHandler.cpp
-    RadiationSensorHandler.cpp
+          IMTQHandler.cpp
-    GyroADIS1650XHandler.cpp
+          HeaterHandler.cpp
-    RwHandler.cpp
+          RadiationSensorHandler.cpp
-    max1227.cpp
+          GyroADIS1650XHandler.cpp
-    SusHandler.cpp
+          RwHandler.cpp
-    PayloadPcduHandler.cpp
+          max1227.cpp
-    SolarArrayDeploymentHandler.cpp
+          SusHandler.cpp
-)
+          PayloadPcduHandler.cpp
+          SolarArrayDeploymentHandler.cpp)

mission/devices/GyroADIS1650XHandler.cpp

@@ -424,7 +424,8 @@ ReturnValue_t GyroADIS1650XHandler::spiSendCallback(SpiComIF *comIf, SpiCookie *
       GpioIF *gpioIF = comIf->getGpioInterface();
       MutexIF::TimeoutType timeoutType = MutexIF::TimeoutType::WAITING;
       uint32_t timeoutMs = 0;
-      MutexIF *mutex = comIf->getMutex(&timeoutType, &timeoutMs);
+      MutexIF *mutex = comIf->getCsMutex();
+      cookie->getMutexParams(timeoutType, timeoutMs);
       if (mutex == nullptr or gpioIF == nullptr) {
 #if OBSW_VERBOSE_LEVEL >= 1
         sif::warning << "GyroADIS16507Handler::spiSendCallback: "

mission/devices/HeaterHandler.cpp

@@ -1,21 +1,38 @@
 #include "HeaterHandler.h"
 
+#include <fsfw/health/HealthTableIF.h>
 #include <fsfw/ipc/QueueFactory.h>
 #include <fsfw/objectmanager/ObjectManager.h>
 #include <fsfw_hal/common/gpio/GpioCookie.h>
 
+#include <stdexcept>
+
 #include "devices/gpioIds.h"
 #include "devices/powerSwitcherList.h"
 
-HeaterHandler::HeaterHandler(object_id_t setObjectId_, object_id_t gpioDriverId_,
+HeaterHandler::HeaterHandler(object_id_t setObjectId_, GpioIF* gpioInterface_, HeaterHelper helper,
-                             CookieIF* gpioCookie_, object_id_t mainLineSwitcherObjectId_,
+                             PowerSwitchIF* mainLineSwitcher_, power::Switch_t mainLineSwitch_)
-                             uint8_t mainLineSwitch_)
     : SystemObject(setObjectId_),
-      gpioDriverId(gpioDriverId_),
+      helper(helper),
-      gpioCookie(gpioCookie_),
+      gpioInterface(gpioInterface_),
-      mainLineSwitcherObjectId(mainLineSwitcherObjectId_),
+      mainLineSwitcher(mainLineSwitcher_),
       mainLineSwitch(mainLineSwitch_),
       actionHelper(this, nullptr) {
+  for (const auto& heater : helper.heaters) {
+    if (heater.first == nullptr) {
+      throw std::invalid_argument("HeaterHandler::HeaterHandler: Invalid Heater Object");
+    }
+  }
+  if (gpioInterface_ == nullptr) {
+    throw std::invalid_argument("HeaterHandler::HeaterHandler: Invalid Gpio IF");
+  }
+  if (mainLineSwitcher == nullptr) {
+    throw std::invalid_argument("HeaterHandler::HeaterHandler: Invalid PowerSwitchIF");
+  }
+  heaterMutex = MutexFactory::instance()->createMutex();
+  if (heaterMutex == nullptr) {
+    throw std::runtime_error("HeaterHandler::HeaterHandler: Creating Mutex failed");
+  }
   auto mqArgs = MqArgs(setObjectId_, static_cast<void*>(this));
   commandQueue = QueueFactory::instance()->createMessageQueue(
       cmdQueueSize, MessageQueueMessage::MAX_MESSAGE_SIZE, &mqArgs);
@@ -24,10 +41,16 @@ HeaterHandler::HeaterHandler(object_id_t setObjectId_, object_id_t gpioDriverId_
 HeaterHandler::~HeaterHandler() {}
 
 ReturnValue_t HeaterHandler::performOperation(uint8_t operationCode) {
-  if (operationCode == DeviceHandlerIF::PERFORM_OPERATION) {
+  try {
     readCommandQueue();
-    handleActiveCommands();
+    for (const auto& heater : helper.heaters) {
-    return RETURN_OK;
+      heater.first->performOperation(0);
+    }
+    handleSwitchHandling();
+  } catch (const std::out_of_range& e) {
+    sif::warning << "HeaterHandler::performOperation: "
+                    "Out of range error | "
+                 << e.what() << std::endl;
   }
   return RETURN_OK;
 }
@@ -43,33 +66,12 @@ ReturnValue_t HeaterHandler::initialize() {
     return ObjectManagerIF::CHILD_INIT_FAILED;
   }
 
-  gpioInterface = ObjectManager::instance()->get<GpioIF>(gpioDriverId);
+  ipcStore = ObjectManager::instance()->get<StorageManagerIF>(objects::IPC_STORE);
-  if (gpioInterface == nullptr) {
+  if (ipcStore == nullptr) {
-    sif::error << "HeaterHandler::initialize: Invalid Gpio interface." << std::endl;
-    return ObjectManagerIF::CHILD_INIT_FAILED;
-  }
-
-  result = gpioInterface->addGpios(dynamic_cast<GpioCookie*>(gpioCookie));
-  if (result != RETURN_OK) {
-    sif::error << "HeaterHandler::initialize: Failed to initialize Gpio interface" << std::endl;
-    return ObjectManagerIF::CHILD_INIT_FAILED;
-  }
-
-  IPCStore = ObjectManager::instance()->get<StorageManagerIF>(objects::IPC_STORE);
-  if (IPCStore == nullptr) {
     sif::error << "HeaterHandler::initialize: IPC store not set up in factory." << std::endl;
     return ObjectManagerIF::CHILD_INIT_FAILED;
   }
 
-  if (mainLineSwitcherObjectId != objects::NO_OBJECT) {
-    mainLineSwitcher = ObjectManager::instance()->get<PowerSwitchIF>(mainLineSwitcherObjectId);
-    if (mainLineSwitcher == nullptr) {
-      sif::error << "HeaterHandler::initialize: Failed to get main line switcher. Make sure "
-                 << "main line switcher object is initialized." << std::endl;
-      return ObjectManagerIF::CHILD_INIT_FAILED;
-    }
-  }
-
   result = actionHelper.initialize(commandQueue);
   if (result != RETURN_OK) {
     return ObjectManagerIF::CHILD_INIT_FAILED;
@@ -79,81 +81,97 @@ ReturnValue_t HeaterHandler::initialize() {
 }
 
 ReturnValue_t HeaterHandler::initializeHeaterMap() {
-  HeaterCommandInfo_t heaterCommandInfo;
+  for (power::Switch_t switchNr = 0; switchNr < heater::NUMBER_OF_SWITCHES; switchNr++) {
-  for (switchNr_t switchNr = 0; switchNr < heaterSwitches::NUMBER_OF_SWITCHES; switchNr++) {
+    heaterVec.push_back(HeaterWrapper(helper.heaters[switchNr], SwitchState::OFF));
-    std::pair status = heaterMap.emplace(switchNr, heaterCommandInfo);
-    if (status.second == false) {
-      sif::error << "HeaterHandler::initializeHeaterMap: Failed to initialize heater map"
-                 << std::endl;
-      return RETURN_FAILED;
-    }
   }
   return RETURN_OK;
 }
 
-void HeaterHandler::setInitialSwitchStates() {
-  for (switchNr_t switchNr = 0; switchNr < heaterSwitches::NUMBER_OF_SWITCHES; switchNr++) {
-    switchStates[switchNr] = OFF;
-  }
-}
-
 void HeaterHandler::readCommandQueue() {
+  ReturnValue_t result = RETURN_OK;
   CommandMessage command;
-  ReturnValue_t result = commandQueue->receiveMessage(&command);
+  do {
-  if (result != RETURN_OK) {
+    result = commandQueue->receiveMessage(&command);
-    return;
+    if (result == MessageQueueIF::EMPTY) {
-  }
+      break;
-
+    } else if (result != RETURN_OK) {
-  result = actionHelper.handleActionMessage(&command);
+      sif::warning << "HeaterHandler::readCommandQueue: Message reception error" << std::endl;
-  if (result == RETURN_OK) {
+    }
-    return;
+    result = actionHelper.handleActionMessage(&command);
-  }
+    if (result == RETURN_OK) {
+      continue;
+    }
+  } while (result == RETURN_OK);
 }
 
 ReturnValue_t HeaterHandler::executeAction(ActionId_t actionId, MessageQueueId_t commandedBy,
                                            const uint8_t* data, size_t size) {
-  ReturnValue_t result;
+  if (data == nullptr or size < 3) {
-  if (actionId != SWITCH_HEATER) {
+    return HasActionsIF::INVALID_PARAMETERS;
-    result = COMMAND_NOT_SUPPORTED;
-  } else {
-    switchNr_t switchNr = *data;
-    HeaterMapIter heaterMapIter = heaterMap.find(switchNr);
-    if (heaterMapIter != heaterMap.end()) {
-      if (heaterMapIter->second.active) {
-        return COMMAND_ALREADY_WAITING;
-      }
-      heaterMapIter->second.action = *(data + 1);
-      heaterMapIter->second.active = true;
-      heaterMapIter->second.replyQueue = commandedBy;
-    } else {
-      sif::error << "HeaterHandler::executeAction: Invalid switchNr" << std::endl;
-      return INVALID_SWITCH_NR;
-    }
-    result = RETURN_OK;
   }
-  return result;
+  if (actionId != SWITCH_HEATER) {
+    return COMMAND_NOT_SUPPORTED;
+  }
+  auto switchNr = data[0];
+  if (switchNr > 7) {
+    return HasActionsIF::INVALID_PARAMETERS;
+  }
+  auto& heater = heaterVec.at(switchNr);
+
+  auto actionRaw = data[1];
+  if (actionRaw != 0 and actionRaw != 1) {
+    return HasActionsIF::INVALID_PARAMETERS;
+  }
+  auto action = static_cast<SwitchAction>(data[1]);
+  // Always accepts OFF commands
+  if (action == SwitchAction::SET_SWITCH_ON) {
+    HasHealthIF::HealthState health = heater.healthDevice->getHealth();
+    if (health == HasHealthIF::FAULTY or health == HasHealthIF::PERMANENT_FAULTY or
+        health == HasHealthIF::NEEDS_RECOVERY) {
+      return HasHealthIF::OBJECT_NOT_HEALTHY;
+    }
+    CmdSourceParam cmdSource = CmdSourceParam::EXTERNAL;
+    uint8_t cmdSourceRaw = data[2];
+    if (cmdSourceRaw > 1) {
+      return HasActionsIF::INVALID_PARAMETERS;
+    }
+    cmdSource = static_cast<CmdSourceParam>(data[2]);
+    if (health == HasHealthIF::EXTERNAL_CONTROL and cmdSource == CmdSourceParam::INTERNAL) {
+      return HasHealthIF::IS_EXTERNALLY_CONTROLLED;
+    }
+  }
+
+  if (heater.cmdActive) {
+    return COMMAND_ALREADY_WAITING;
+  }
+  heater.action = action;
+  heater.cmdActive = true;
+  heater.replyQueue = commandedBy;
+  return RETURN_OK;
 }
 
 ReturnValue_t HeaterHandler::sendSwitchCommand(uint8_t switchNr, ReturnValue_t onOff) {
   ReturnValue_t result;
   store_address_t storeAddress;
-  uint8_t commandData[2];
+  uint8_t commandData[3] = {};
 
   switch (onOff) {
     case PowerSwitchIF::SWITCH_ON:
       commandData[0] = switchNr;
       commandData[1] = SET_SWITCH_ON;
+      commandData[2] = CmdSourceParam::INTERNAL;
       break;
     case PowerSwitchIF::SWITCH_OFF:
       commandData[0] = switchNr;
       commandData[1] = SET_SWITCH_OFF;
+      commandData[2] = CmdSourceParam::INTERNAL;
       break;
     default:
       sif::error << "HeaterHandler::sendSwitchCommand: Invalid switch request" << std::endl;
       break;
   }
 
-  result = IPCStore->addData(&storeAddress, commandData, sizeof(commandData));
+  result = ipcStore->addData(&storeAddress, commandData, sizeof(commandData));
   if (result == RETURN_OK) {
     CommandMessage message;
     ActionMessage::setCommand(&message, SWITCH_HEATER, storeAddress);
@@ -167,16 +185,27 @@ ReturnValue_t HeaterHandler::sendSwitchCommand(uint8_t switchNr, ReturnValue_t o
   return result;
 }
 
-void HeaterHandler::handleActiveCommands() {
+void HeaterHandler::handleSwitchHandling() {
-  HeaterMapIter heaterMapIter = heaterMap.begin();
+  for (uint8_t idx = 0; idx < heater::NUMBER_OF_SWITCHES; idx++) {
-  for (; heaterMapIter != heaterMap.end(); heaterMapIter++) {
+    auto health = heaterVec[idx].healthDevice->getHealth();
-    if (heaterMapIter->second.active) {
+    if (heaterVec[idx].switchState == SwitchState::ON) {
-      switch (heaterMapIter->second.action) {
+      // If a heater is still on but the device was marked faulty by the operator, the SW
+      // will shut down the heater
+      if (health == HasHealthIF::FAULTY or health == HasHealthIF::PERMANENT_FAULTY) {
+        heaterVec[idx].cmdActive = true;
+        heaterVec[idx].action = SET_SWITCH_OFF;
+        triggerEvent(FAULTY_HEATER_WAS_ON, idx, 0);
+        handleSwitchOffCommand(static_cast<heater::Switchers>(idx));
+        continue;
+      }
+    }
+    if (heaterVec[idx].cmdActive) {
+      switch (heaterVec[idx].action) {
         case SET_SWITCH_ON:
-          handleSwitchOnCommand(heaterMapIter);
+          handleSwitchOnCommand(static_cast<heater::Switchers>(idx));
           break;
         case SET_SWITCH_OFF:
-          handleSwitchOffCommand(heaterMapIter);
+          handleSwitchOffCommand(static_cast<heater::Switchers>(idx));
           break;
         default:
           sif::error << "HeaterHandler::handleActiveCommands: Invalid action commanded"
@@ -187,162 +216,139 @@ void HeaterHandler::handleActiveCommands() {
   }
 }
 
-void HeaterHandler::handleSwitchOnCommand(HeaterMapIter heaterMapIter) {
+void HeaterHandler::handleSwitchOnCommand(heater::Switchers heaterIdx) {
   ReturnValue_t result = RETURN_OK;
-  switchNr_t switchNr;
+  auto& heater = heaterVec.at(heaterIdx);
-
   /* Check if command waits for main switch being set on and whether the timeout has expired */
-  if (heaterMapIter->second.waitMainSwitchOn &&
+  if (heater.waitMainSwitchOn && heater.mainSwitchCountdown.hasTimedOut()) {
-      heaterMapIter->second.mainSwitchCountdown.hasTimedOut()) {
     // TODO - This requires the initiation of an FDIR procedure
     triggerEvent(MAIN_SWITCH_TIMEOUT);
     sif::error << "HeaterHandler::handleSwitchOnCommand: Main switch setting on timeout"
                << std::endl;
-    heaterMapIter->second.active = false;
+    heater.cmdActive = false;
-    heaterMapIter->second.waitMainSwitchOn = false;
+    heater.waitMainSwitchOn = false;
-    if (heaterMapIter->second.replyQueue != commandQueue->getId()) {
+    if (heater.replyQueue != commandQueue->getId()) {
-      actionHelper.finish(false, heaterMapIter->second.replyQueue, heaterMapIter->second.action,
+      actionHelper.finish(false, heater.replyQueue, heater.action, MAIN_SWITCH_SET_TIMEOUT);
-                          MAIN_SWITCH_SET_TIMEOUT);
     }
     return;
   }
 
-  switchNr = heaterMapIter->first;
+  // Check state of main line switch
-  /* Check state of main line switch */
   ReturnValue_t mainSwitchState = mainLineSwitcher->getSwitchState(mainLineSwitch);
   if (mainSwitchState == PowerSwitchIF::SWITCH_ON) {
-    if (!checkSwitchState(switchNr)) {
+    if (checkSwitchState(heaterIdx) == SwitchState::OFF) {
-      gpioId_t gpioId = getGpioIdFromSwitchNr(switchNr);
+      gpioId_t gpioId = heater.gpioId;
       result = gpioInterface->pullHigh(gpioId);
       if (result != RETURN_OK) {
         sif::error << "HeaterHandler::handleSwitchOnCommand: Failed to pull gpio with id " << gpioId
                    << " high" << std::endl;
         triggerEvent(GPIO_PULL_HIGH_FAILED, result);
       } else {
-        switchStates[switchNr] = ON;
+        triggerEvent(HEATER_WENT_ON, heaterIdx, 0);
+        heater.switchState = ON;
       }
     } else {
-      triggerEvent(SWITCH_ALREADY_ON, switchNr);
+      triggerEvent(SWITCH_ALREADY_ON, heaterIdx);
     }
-    /* There is no need to send action finish replies if the sender was the
+    // There is no need to send action finish replies if the sender was the
-     * HeaterHandler itself. */
+    // HeaterHandler itself
-    if (heaterMapIter->second.replyQueue != commandQueue->getId()) {
+    if (heater.replyQueue != commandQueue->getId()) {
       if (result == RETURN_OK) {
-        actionHelper.finish(true, heaterMapIter->second.replyQueue, heaterMapIter->second.action,
+        actionHelper.finish(true, heater.replyQueue, heater.action, result);
-                            result);
       } else {
-        actionHelper.finish(false, heaterMapIter->second.replyQueue, heaterMapIter->second.action,
+        actionHelper.finish(false, heater.replyQueue, heater.action, result);
-                            result);
       }
     }
-    heaterMapIter->second.active = false;
+    heater.cmdActive = false;
-    heaterMapIter->second.waitMainSwitchOn = false;
+    heater.waitMainSwitchOn = false;
-  } else if (mainSwitchState == PowerSwitchIF::SWITCH_OFF &&
+  } else if (mainSwitchState == PowerSwitchIF::SWITCH_OFF && heater.waitMainSwitchOn) {
-             heaterMapIter->second.waitMainSwitchOn) {
+    // Just waiting for the main switch being set on
-    /* Just waiting for the main switch being set on */
     return;
   } else if (mainSwitchState == PowerSwitchIF::SWITCH_OFF) {
     mainLineSwitcher->sendSwitchCommand(mainLineSwitch, PowerSwitchIF::SWITCH_ON);
-    heaterMapIter->second.mainSwitchCountdown.setTimeout(mainLineSwitcher->getSwitchDelayMs());
+    heater.mainSwitchCountdown.setTimeout(mainLineSwitcher->getSwitchDelayMs());
-    heaterMapIter->second.waitMainSwitchOn = true;
+    heater.waitMainSwitchOn = true;
   } else {
-    sif::debug << "HeaterHandler::handleActiveCommands: Failed to get state of"
+    sif::debug << "HeaterHandler::handleSwitchHandling: Failed to get state of"
                << " main line switch" << std::endl;
-    if (heaterMapIter->second.replyQueue != commandQueue->getId()) {
+    if (heater.replyQueue != commandQueue->getId()) {
-      actionHelper.finish(false, heaterMapIter->second.replyQueue, heaterMapIter->second.action,
+      actionHelper.finish(false, heater.replyQueue, heater.action, mainSwitchState);
-                          mainSwitchState);
     }
-    heaterMapIter->second.active = false;
+    heater.cmdActive = false;
   }
 }
 
-void HeaterHandler::handleSwitchOffCommand(HeaterMapIter heaterMapIter) {
+void HeaterHandler::handleSwitchOffCommand(heater::Switchers heaterIdx) {
   ReturnValue_t result = RETURN_OK;
-  switchNr_t switchNr = heaterMapIter->first;
+  auto& heater = heaterVec.at(heaterIdx);
-  /* Check whether switch is already off */
+  // Check whether switch is already off
-  if (checkSwitchState(switchNr)) {
+  if (checkSwitchState(heaterIdx)) {
-    gpioId_t gpioId = getGpioIdFromSwitchNr(switchNr);
+    gpioId_t gpioId = heater.gpioId;
     result = gpioInterface->pullLow(gpioId);
     if (result != RETURN_OK) {
       sif::error << "HeaterHandler::handleSwitchOffCommand: Failed to pull gpio with id" << gpioId
                  << " low" << std::endl;
       triggerEvent(GPIO_PULL_LOW_FAILED, result);
     } else {
-      switchStates[switchNr] = OFF;
+      auto result = heaterMutex->lockMutex();
-      /* When all switches are off, also main line switch will be turned off */
+      heater.switchState = OFF;
+      if (result == HasReturnvaluesIF::RETURN_OK) {
+        heaterMutex->unlockMutex();
+      }
+      triggerEvent(HEATER_WENT_OFF, heaterIdx, 0);
+      // When all switches are off, also main line switch will be turned off
       if (allSwitchesOff()) {
         mainLineSwitcher->sendSwitchCommand(mainLineSwitch, PowerSwitchIF::SWITCH_OFF);
       }
     }
   } else {
     sif::info << "HeaterHandler::handleSwitchOffCommand: Switch already off" << std::endl;
-    triggerEvent(SWITCH_ALREADY_OFF, switchNr);
+    triggerEvent(SWITCH_ALREADY_OFF, heaterIdx);
   }
-  if (heaterMapIter->second.replyQueue != NO_COMMANDER) {
+  if (heater.replyQueue != NO_COMMANDER) {
-    /* Report back switch command reply if necessary */
+    // Report back switch command reply if necessary
     if (result == HasReturnvaluesIF::RETURN_OK) {
-      actionHelper.finish(true, heaterMapIter->second.replyQueue, heaterMapIter->second.action,
+      actionHelper.finish(true, heater.replyQueue, heater.action, result);
-                          result);
     } else {
-      actionHelper.finish(false, heaterMapIter->second.replyQueue, heaterMapIter->second.action,
+      actionHelper.finish(false, heater.replyQueue, heater.action, result);
-                          result);
     }
   }
-  heaterMapIter->second.active = false;
+  heater.cmdActive = false;
 }
 
-bool HeaterHandler::checkSwitchState(int switchNr) { return switchStates[switchNr]; }
+HeaterHandler::SwitchState HeaterHandler::checkSwitchState(heater::Switchers switchNr) const {
+  MutexGuard mg(heaterMutex);
+  return heaterVec.at(switchNr).switchState;
+}
 
 bool HeaterHandler::allSwitchesOff() {
   bool allSwitchesOrd = false;
+  MutexGuard mg(heaterMutex);
   /* Or all switches. As soon one switch is on, allSwitchesOrd will be true */
-  for (switchNr_t switchNr = 0; switchNr < heaterSwitches::NUMBER_OF_SWITCHES; switchNr++) {
+  for (power::Switch_t switchNr = 0; switchNr < heater::NUMBER_OF_SWITCHES; switchNr++) {
-    allSwitchesOrd = allSwitchesOrd || switchStates[switchNr];
+    allSwitchesOrd = allSwitchesOrd || heaterVec.at(switchNr).switchState;
   }
   return !allSwitchesOrd;
 }
 
-gpioId_t HeaterHandler::getGpioIdFromSwitchNr(int switchNr) {
-  gpioId_t gpioId = 0xFFFF;
-  switch (switchNr) {
-    case heaterSwitches::HEATER_0:
-      gpioId = gpioIds::HEATER_0;
-      break;
-    case heaterSwitches::HEATER_1:
-      gpioId = gpioIds::HEATER_1;
-      break;
-    case heaterSwitches::HEATER_2:
-      gpioId = gpioIds::HEATER_2;
-      break;
-    case heaterSwitches::HEATER_3:
-      gpioId = gpioIds::HEATER_3;
-      break;
-    case heaterSwitches::HEATER_4:
-      gpioId = gpioIds::HEATER_4;
-      break;
-    case heaterSwitches::HEATER_5:
-      gpioId = gpioIds::HEATER_5;
-      break;
-    case heaterSwitches::HEATER_6:
-      gpioId = gpioIds::HEATER_6;
-      break;
-    case heaterSwitches::HEATER_7:
-      gpioId = gpioIds::HEATER_7;
-      break;
-    default:
-      sif::error << "HeaterHandler::getGpioIdFromSwitchNr: Unknown heater switch number"
-                 << std::endl;
-      break;
-  }
-  return gpioId;
-}
-
 MessageQueueId_t HeaterHandler::getCommandQueue() const { return commandQueue->getId(); }
 
 ReturnValue_t HeaterHandler::sendFuseOnCommand(uint8_t fuseNr) { return RETURN_OK; }
 
-ReturnValue_t HeaterHandler::getSwitchState(uint8_t switchNr) const { return 0; }
+ReturnValue_t HeaterHandler::getSwitchState(uint8_t switchNr) const {
+  ReturnValue_t mainSwitchState = mainLineSwitcher->getSwitchState(mainLineSwitch);
+  if (mainSwitchState == PowerSwitchIF::SWITCH_OFF) {
+    return PowerSwitchIF::SWITCH_OFF;
+  }
+  if (switchNr > 7) {
+    return PowerSwitchIF::RETURN_FAILED;
+  }
+  if (checkSwitchState(static_cast<heater::Switchers>(switchNr)) == SwitchState::ON) {
+    return PowerSwitchIF::SWITCH_ON;
+  }
+  return PowerSwitchIF::SWITCH_OFF;
+}
 
 ReturnValue_t HeaterHandler::getFuseState(uint8_t fuseNr) const { return 0; }
 
-uint32_t HeaterHandler::getSwitchDelayMs(void) const { return 0; }
+uint32_t HeaterHandler::getSwitchDelayMs(void) const { return 2000; }

mission/devices/HeaterHandler.h

@@ -4,6 +4,9 @@
 #include <fsfw/action/HasActionsIF.h>
 #include <fsfw/devicehandlers/CookieIF.h>
 #include <fsfw/devicehandlers/DeviceHandlerIF.h>
+#include <fsfw/devicehandlers/HealthDevice.h>
+#include <fsfw/health/HasHealthIF.h>
+#include <fsfw/health/HealthHelper.h>
 #include <fsfw/objectmanager/SystemObject.h>
 #include <fsfw/power/PowerSwitchIF.h>
 #include <fsfw/returnvalues/HasReturnvaluesIF.h>
@@ -11,10 +14,20 @@
 #include <fsfw/timemanager/Countdown.h>
 #include <fsfw_hal/common/gpio/GpioIF.h>
 
-#include <unordered_map>
+#include <vector>
 
 #include "devices/heaterSwitcherList.h"
 
+class PowerSwitchIF;
+class HealthTableIF;
+
+using HeaterPair = std::pair<HealthDevice*, gpioId_t>;
+
+struct HeaterHelper {
+ public:
+  HeaterHelper(std::array<HeaterPair, heater::NUMBER_OF_SWITCHES> heaters) : heaters(heaters) {}
+  std::array<HeaterPair, heater::NUMBER_OF_SWITCHES> heaters = {};
+};
 /**
  * @brief	This class intends the control of heaters.
  *
@@ -33,42 +46,49 @@ class HeaterHandler : public ExecutableObjectIF,
   static const ReturnValue_t MAIN_SWITCH_SET_TIMEOUT = MAKE_RETURN_CODE(0xA4);
   static const ReturnValue_t COMMAND_ALREADY_WAITING = MAKE_RETURN_CODE(0xA5);
 
+  enum CmdSourceParam : uint8_t { INTERNAL = 0, EXTERNAL = 1 };
+
   /** Device command IDs */
   static const DeviceCommandId_t SWITCH_HEATER = 0x0;
 
-  HeaterHandler(object_id_t setObjectId, object_id_t gpioDriverId, CookieIF* gpioCookie,
+  HeaterHandler(object_id_t setObjectId, GpioIF* gpioInterface_, HeaterHelper helper,
-                object_id_t mainLineSwitcherObjectId, uint8_t mainLineSwitch);
+                PowerSwitchIF* mainLineSwitcherObjectId, power::Switch_t mainLineSwitch);
 
   virtual ~HeaterHandler();
 
-  virtual ReturnValue_t performOperation(uint8_t operationCode = 0) override;
+  ReturnValue_t performOperation(uint8_t operationCode = 0) override;
 
-  virtual ReturnValue_t sendSwitchCommand(uint8_t switchNr, ReturnValue_t onOff) override;
+  ReturnValue_t sendSwitchCommand(uint8_t switchNr, ReturnValue_t onOff) override;
-  virtual ReturnValue_t sendFuseOnCommand(uint8_t fuseNr) override;
+  ReturnValue_t sendFuseOnCommand(uint8_t fuseNr) override;
   /**
    * @brief	This function will be called from the Heater object to check
    * 			the current switch state.
    */
-  virtual ReturnValue_t getSwitchState(uint8_t switchNr) const override;
+  ReturnValue_t getSwitchState(uint8_t switchNr) const override;
-  virtual ReturnValue_t getFuseState(uint8_t fuseNr) const override;
+  ReturnValue_t getFuseState(uint8_t fuseNr) const override;
-  virtual uint32_t getSwitchDelayMs(void) const override;
+  uint32_t getSwitchDelayMs(void) const override;
 
-  virtual MessageQueueId_t getCommandQueue() const override;
+  MessageQueueId_t getCommandQueue() const override;
-  virtual ReturnValue_t executeAction(ActionId_t actionId, MessageQueueId_t commandedBy,
+  ReturnValue_t executeAction(ActionId_t actionId, MessageQueueId_t commandedBy,
-                                      const uint8_t* data, size_t size) override;
+                              const uint8_t* data, size_t size) override;
-  virtual ReturnValue_t initialize() override;
+  ReturnValue_t initialize() override;
 
  private:
   static const uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::HEATER_HANDLER;
-  static const Event GPIO_PULL_HIGH_FAILED = MAKE_EVENT(0, severity::LOW);
+  static constexpr Event GPIO_PULL_HIGH_FAILED = MAKE_EVENT(0, severity::LOW);
-  static const Event GPIO_PULL_LOW_FAILED = MAKE_EVENT(1, severity::LOW);
+  static constexpr Event GPIO_PULL_LOW_FAILED = MAKE_EVENT(1, severity::LOW);
-  static const Event SWITCH_ALREADY_ON = MAKE_EVENT(2, severity::LOW);
+  static constexpr Event HEATER_WENT_ON = event::makeEvent(SUBSYSTEM_ID, 2, severity::INFO);
-  static const Event SWITCH_ALREADY_OFF = MAKE_EVENT(3, severity::LOW);
+  static constexpr Event HEATER_WENT_OFF = event::makeEvent(SUBSYSTEM_ID, 3, severity::INFO);
-  static const Event MAIN_SWITCH_TIMEOUT = MAKE_EVENT(4, severity::LOW);
+  static constexpr Event SWITCH_ALREADY_ON = MAKE_EVENT(4, severity::LOW);
+  static constexpr Event SWITCH_ALREADY_OFF = MAKE_EVENT(5, severity::LOW);
+  static constexpr Event MAIN_SWITCH_TIMEOUT = MAKE_EVENT(6, severity::MEDIUM);
+  //! A faulty heater was one. The SW will autonomously attempt to shut it down. P1: Heater Index
+  static constexpr Event FAULTY_HEATER_WAS_ON = event::makeEvent(SUBSYSTEM_ID, 7, severity::LOW);
 
   static const MessageQueueId_t NO_COMMANDER = 0;
 
   enum SwitchState : bool { ON = true, OFF = false };
+  enum SwitchAction : uint8_t { SET_SWITCH_OFF, SET_SWITCH_ON, NONE };
 
   /**
    * @brief   Struct holding information about a heater command to execute.
@@ -80,54 +100,46 @@ class HeaterHandler : public ExecutableObjectIF,
    * @param waitSwitchOn  True if the command is waiting for the main switch being set on.
    * @param mainSwitchCountdown   Sets timeout to wait for main switch being set on.
    */
-  typedef struct HeaterCommandInfo {
+  struct HeaterWrapper {
-    uint8_t action;
+    HeaterWrapper(HeaterPair pair, SwitchState initState)
-    MessageQueueId_t replyQueue;
+        : healthDevice(pair.first), gpioId(pair.second), switchState(initState) {}
-    bool active = false;
+    HealthDevice* healthDevice = nullptr;
+    gpioId_t gpioId = gpio::NO_GPIO;
+    SwitchAction action = SwitchAction::NONE;
+    MessageQueueId_t replyQueue = MessageQueueIF::NO_QUEUE;
+    bool cmdActive = false;
+    SwitchState switchState = SwitchState::OFF;
     bool waitMainSwitchOn = false;
     Countdown mainSwitchCountdown;
-  } HeaterCommandInfo_t;
+  };
 
-  enum SwitchAction { SET_SWITCH_OFF, SET_SWITCH_ON };
+  using HeaterMap = std::vector<HeaterWrapper>;
 
-  using switchNr_t = uint8_t;
+  HeaterMap heaterVec = {};
-  using HeaterMap = std::unordered_map<switchNr_t, HeaterCommandInfo_t>;
-  using HeaterMapIter = HeaterMap::iterator;
 
-  HeaterMap heaterMap;
+  MutexIF* heaterMutex = nullptr;
 
-  bool switchStates[heaterSwitches::NUMBER_OF_SWITCHES];
+  HeaterHelper helper;
 
   /** Size of command queue */
   size_t cmdQueueSize = 20;
 
-  /**
-   * The object ID of the GPIO driver which enables and disables the
-   * heaters.
-   */
-  object_id_t gpioDriverId;
-
-  CookieIF* gpioCookie;
-
   GpioIF* gpioInterface = nullptr;
 
   /** Queue to receive messages from other objects. */
   MessageQueueIF* commandQueue = nullptr;
 
-  object_id_t mainLineSwitcherObjectId;
-
-  /** Switch number of the heater power supply switch */
-  uint8_t mainLineSwitch;
-
   /**
    * Power switcher object which controls the 8V main line of the heater
    * logic on the TCS board.
    */
   PowerSwitchIF* mainLineSwitcher = nullptr;
+  /** Switch number of the heater power supply switch */
+  power::Switch_t mainLineSwitch;
 
   ActionHelper actionHelper;
 
-  StorageManagerIF* IPCStore = nullptr;
+  StorageManagerIF* ipcStore = nullptr;
 
   void readCommandQueue();
 
@@ -135,18 +147,12 @@ class HeaterHandler : public ExecutableObjectIF,
    * @brief   Returns the state of a switch (ON - true, or OFF - false).
    * @param switchNr  The number of the switch to check.
    */
-  bool checkSwitchState(int switchNr);
+  SwitchState checkSwitchState(heater::Switchers switchNr) const;
-
-  /**
-   * @brief   Returns the ID of the GPIO related to a heater identified by the switch number
-   *          which is defined in the heaterSwitches list.
-   */
-  gpioId_t getGpioIdFromSwitchNr(int switchNr);
 
   /**
    * @brief	This function runs commands waiting for execution.
    */
-  void handleActiveCommands();
+  void handleSwitchHandling();
 
   ReturnValue_t initializeHeaterMap();
 
@@ -155,9 +161,9 @@ class HeaterHandler : public ExecutableObjectIF,
    */
   void setInitialSwitchStates();
 
-  void handleSwitchOnCommand(HeaterMapIter heaterMapIter);
+  void handleSwitchOnCommand(heater::Switchers heaterIdx);
 
-  void handleSwitchOffCommand(HeaterMapIter heaterMapIter);
+  void handleSwitchOffCommand(heater::Switchers heaterIdx);
 
   /**
    * @brief   Checks if all switches are off.

mission/devices/Max31865EiveHandler.cpp

@@ -0,0 +1,183 @@
+#include "Max31865EiveHandler.h"
+
+Max31865EiveHandler::Max31865EiveHandler(object_id_t objectId, object_id_t comIF,
+                                         CookieIF* comCookie)
+    : DeviceHandlerBase(objectId, comIF, comCookie, nullptr),
+      sensorDataset(this, EiveMax31855::RtdCommands::EXCHANGE_SET_ID),
+      debugDivider(5) {
+  structLen = exchangeStruct.getSerializedSize();
+}
+
+void Max31865EiveHandler::doStartUp() {
+  updatePeriodicReply(true, EiveMax31855::RtdCommands::EXCHANGE_SET_ID);
+  if (state == InternalState::NONE or state == InternalState::INACTIVE) {
+    if (instantNormal) {
+      state = InternalState::ACTIVE;
+    } else {
+      state = InternalState::ON;
+    }
+    transitionOk = false;
+  }
+  if ((state == InternalState::ON or state == InternalState::ACTIVE) and transitionOk) {
+    if (instantNormal) {
+      setMode(MODE_NORMAL);
+    } else {
+      setMode(MODE_ON);
+    }
+  }
+}
+
+void Max31865EiveHandler::doShutDown() {
+  updatePeriodicReply(false, EiveMax31855::RtdCommands::EXCHANGE_SET_ID);
+  if (state == InternalState::NONE or state == InternalState::ACTIVE or
+      state == InternalState::ON) {
+    state = InternalState::INACTIVE;
+    transitionOk = false;
+  } else {
+    transitionOk = true;
+  }
+  if (state == InternalState::INACTIVE and transitionOk) {
+    setMode(_MODE_POWER_DOWN);
+  }
+}
+
+ReturnValue_t Max31865EiveHandler::buildNormalDeviceCommand(DeviceCommandId_t* id) {
+  //*id = EiveMax31855::RtdCommands::EXCHANGE_SET_ID;
+  return NOTHING_TO_SEND;
+}
+
+ReturnValue_t Max31865EiveHandler::buildTransitionDeviceCommand(DeviceCommandId_t* id) {
+  ReturnValue_t result = NOTHING_TO_SEND;
+  if (state == InternalState::ON) {
+    *id = EiveMax31855::RtdCommands::ON;
+    result = buildCommandFromCommand(*id, nullptr, 0);
+  }
+  if (state == InternalState::ACTIVE) {
+    *id = EiveMax31855::RtdCommands::ACTIVE;
+    result = buildCommandFromCommand(*id, nullptr, 0);
+  }
+  if (state == InternalState::INACTIVE) {
+    *id = EiveMax31855::RtdCommands::OFF;
+    result = buildCommandFromCommand(*id, nullptr, 0);
+  }
+  return result;
+}
+
+ReturnValue_t Max31865EiveHandler::buildCommandFromCommand(DeviceCommandId_t deviceCommand,
+                                                           const uint8_t* commandData,
+                                                           size_t commandDataLen) {
+  auto cmdTyped = static_cast<EiveMax31855::RtdCommands>(deviceCommand);
+  switch (cmdTyped) {
+    case (EiveMax31855::RtdCommands::ON):
+    case (EiveMax31855::RtdCommands::ACTIVE):
+    case (EiveMax31855::RtdCommands::OFF): {
+      simpleCommand(cmdTyped);
+      break;
+    }
+    case (EiveMax31855::RtdCommands::LOW_THRESHOLD):
+    case (EiveMax31855::RtdCommands::HIGH_TRESHOLD): {
+      break;
+    }
+    case (EiveMax31855::RtdCommands::CFG): {
+      break;
+    }
+    default:
+      return NOTHING_TO_SEND;
+  }
+  return RETURN_OK;
+}
+
+void Max31865EiveHandler::setInstantNormal(bool instantNormal) {
+  this->instantNormal = instantNormal;
+}
+
+void Max31865EiveHandler::setDebugMode(bool enable, uint32_t divider) {
+  this->debugMode = enable;
+  debugDivider.setDivider(divider);
+}
+
+void Max31865EiveHandler::simpleCommand(EiveMax31855::RtdCommands cmd) {
+  cmdBuf[0] = static_cast<uint8_t>(cmd);
+  rawPacket = cmdBuf.data();
+  rawPacketLen = 1;
+}
+void Max31865EiveHandler::doTransition(Mode_t modeFrom, Submode_t subModeFrom) {
+  if (mode == _MODE_TO_NORMAL) {
+    if (state != InternalState::ACTIVE) {
+      state = InternalState::ACTIVE;
+      transitionOk = false;
+    } else if (transitionOk) {
+      setMode(MODE_NORMAL);
+    }
+  } else {
+    DeviceHandlerBase::doTransition(modeFrom, subModeFrom);
+  }
+}
+
+void Max31865EiveHandler::fillCommandAndReplyMap() {
+  insertInCommandMap(EiveMax31855::RtdCommands::ON);
+  insertInCommandMap(EiveMax31855::RtdCommands::ACTIVE);
+  insertInCommandMap(EiveMax31855::RtdCommands::OFF);
+  insertInReplyMap(EiveMax31855::RtdCommands::EXCHANGE_SET_ID, 200, &sensorDataset, 0, true);
+}
+
+ReturnValue_t Max31865EiveHandler::scanForReply(const uint8_t* start, size_t remainingSize,
+                                                DeviceCommandId_t* foundId, size_t* foundLen) {
+  if(mode == _MODE_POWER_ON or mode == _MODE_WAIT_ON) {
+    return IGNORE_FULL_PACKET;
+  }
+  if (remainingSize != structLen) {
+    sif::error << "Invalid reply from RTD reader detected, reply size " << remainingSize
+               << " not equal to exchange struct size " << structLen << std::endl;
+    return DeviceHandlerIF::INVALID_DATA;
+  }
+  *foundId = EiveMax31855::RtdCommands::EXCHANGE_SET_ID;
+  *foundLen = remainingSize;
+  return RETURN_OK;
+}
+
+ReturnValue_t Max31865EiveHandler::interpretDeviceReply(DeviceCommandId_t id,
+                                                        const uint8_t* packet) {
+  size_t deserTmp = structLen;
+  auto result = exchangeStruct.deSerialize(&packet, &deserTmp, SerializeIF::Endianness::MACHINE);
+  if (result != RETURN_OK) {
+    return result;
+  }
+  if (mode == _MODE_TO_NORMAL and exchangeStruct.active and state == InternalState::ACTIVE) {
+    transitionOk = true;
+  }
+  if (mode == _MODE_START_UP and exchangeStruct.configured and state == InternalState::ON) {
+    transitionOk = true;
+  }
+  // Calculate resistance
+  float rtdValue = exchangeStruct.adcCode * EiveMax31855::RTD_RREF_PT1000 / INT16_MAX;
+  // calculate approximation
+  float approxTemp = exchangeStruct.adcCode / 32.0 - 256.0;
+
+  if (debugMode) {
+    if (debugDivider.checkAndIncrement()) {
+      sif::info << "Max31865: " << std::setw(20) << std::left << locString << std::right
+                << " | R[Ohm] " << rtdValue << " Ohms | Approx T[C]: " << approxTemp << std::endl;
+    }
+  }
+  return RETURN_OK;
+}
+
+uint32_t Max31865EiveHandler::getTransitionDelayMs(Mode_t modeFrom, Mode_t modeTo) { return 2000; }
+
+ReturnValue_t Max31865EiveHandler::initializeLocalDataPool(localpool::DataPool& localDataPoolMap,
+                                                           LocalDataPoolManager& poolManager) {
+  using namespace MAX31865;
+  localDataPoolMap.emplace(static_cast<lp_id_t>(PoolIds::RTD_VALUE), new PoolEntry<float>({0}));
+  localDataPoolMap.emplace(static_cast<lp_id_t>(PoolIds::TEMPERATURE_C), new PoolEntry<float>({0}));
+  localDataPoolMap.emplace(static_cast<lp_id_t>(PoolIds::FAULT_BYTE), new PoolEntry<uint8_t>({0}));
+  poolManager.subscribeForPeriodicPacket(sensorDataset.getSid(), false, 30.0, false);
+  return RETURN_OK;
+}
+
+void Max31865EiveHandler::setDeviceInfo(uint8_t idx_, std::string location_) {
+  idx = idx_;
+  locString = std::move(location_);
+}
+
+ReturnValue_t Max31865EiveHandler::initialize() { return DeviceHandlerBase::initialize(); }

mission/devices/Max31865EiveHandler.h

@@ -0,0 +1,47 @@
+#ifndef MISSION_DEVICES_MAX31865EIVEHANDLER_H_
+#define MISSION_DEVICES_MAX31865EIVEHANDLER_H_
+
+#include <fsfw/devicehandlers/DeviceHandlerBase.h>
+#include <fsfw/globalfunctions/PeriodicOperationDivider.h>
+
+#include "devicedefinitions/Max31865Definitions.h"
+
+class Max31865EiveHandler : public DeviceHandlerBase {
+ public:
+  Max31865EiveHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie);
+  void setInstantNormal(bool instantNormal);
+  void setDebugMode(bool enable, uint32_t divider);
+  void setDeviceInfo(uint8_t idx, std::string location);
+
+ private:
+  void doStartUp() override;
+  void doShutDown() override;
+  void doTransition(Mode_t modeFrom, Submode_t subModeFrom) override;
+  ReturnValue_t buildNormalDeviceCommand(DeviceCommandId_t* id) override;
+  ReturnValue_t buildTransitionDeviceCommand(DeviceCommandId_t* id) override;
+  void fillCommandAndReplyMap() override;
+  ReturnValue_t buildCommandFromCommand(DeviceCommandId_t deviceCommand, const uint8_t* commandData,
+                                        size_t commandDataLen) override;
+  ReturnValue_t scanForReply(const uint8_t* start, size_t remainingSize, DeviceCommandId_t* foundId,
+                             size_t* foundLen) override;
+  ReturnValue_t interpretDeviceReply(DeviceCommandId_t id, const uint8_t* packet) override;
+  uint32_t getTransitionDelayMs(Mode_t modeFrom, Mode_t modeTo) override;
+  ReturnValue_t initializeLocalDataPool(localpool::DataPool& localDataPoolMap,
+                                        LocalDataPoolManager& poolManager) override;
+  ReturnValue_t initialize() override;
+
+  void simpleCommand(EiveMax31855::RtdCommands cmd);
+  std::array<uint8_t, 12> cmdBuf = {};
+  uint8_t idx = 0;
+  std::string locString = "Unknown";
+  EiveMax31855::ReadOutStruct exchangeStruct;
+  bool debugMode = false;
+  size_t structLen = 0;
+  bool instantNormal = false;
+  MAX31865::Max31865Set sensorDataset;
+  PeriodicOperationDivider debugDivider;
+  enum class InternalState { NONE, ON, ACTIVE, INACTIVE } state = InternalState::NONE;
+  bool transitionOk = false;
+};
+
+#endif /* MISSION_DEVICES_MAX31865EIVEHANDLER_H_ */

mission/devices/Max31865PT1000Handler.cpp

@@ -8,7 +8,7 @@
 Max31865PT1000Handler::Max31865PT1000Handler(object_id_t objectId, object_id_t comIF,
                                              CookieIF *comCookie)
     : DeviceHandlerBase(objectId, comIF, comCookie),
-      sensorDataset(this),
+      sensorDataset(this, MAX31865::REQUEST_RTD),
       sensorDatasetSid(sensorDataset.getSid()) {
 #if OBSW_VERBOSE_LEVEL >= 1
   debugDivider = new PeriodicOperationDivider(10);
@@ -93,13 +93,13 @@ void Max31865PT1000Handler::doShutDown() {
 
 ReturnValue_t Max31865PT1000Handler::buildNormalDeviceCommand(DeviceCommandId_t *id) {
   if (internalState == InternalState::RUNNING) {
-    *id = Max31865Definitions::REQUEST_RTD;
+    *id = MAX31865::REQUEST_RTD;
     return buildCommandFromCommand(*id, nullptr, 0);
   } else if (internalState == InternalState::REQUEST_FAULT_BYTE) {
-    *id = Max31865Definitions::REQUEST_FAULT_BYTE;
+    *id = MAX31865::REQUEST_FAULT_BYTE;
     return buildCommandFromCommand(*id, nullptr, 0);
   } else if (internalState == InternalState::CLEAR_FAULT_BYTE) {
-    *id = Max31865Definitions::CLEAR_FAULT_BYTE;
+    *id = MAX31865::CLEAR_FAULT_BYTE;
     return buildCommandFromCommand(*id, nullptr, 0);
   } else {
     return DeviceHandlerBase::NOTHING_TO_SEND;
@@ -113,32 +113,32 @@ ReturnValue_t Max31865PT1000Handler::buildTransitionDeviceCommand(DeviceCommandI
     case (InternalState::RUNNING):
       return DeviceHandlerBase::NOTHING_TO_SEND;
     case (InternalState::CONFIGURE): {
-      *id = Max31865Definitions::CONFIG_CMD;
+      *id = MAX31865::CONFIG_CMD;
       uint8_t config[1] = {DEFAULT_CONFIG};
       return buildCommandFromCommand(*id, config, 1);
     }
     case (InternalState::REQUEST_CONFIG): {
-      *id = Max31865Definitions::REQUEST_CONFIG;
+      *id = MAX31865::REQUEST_CONFIG;
       return buildCommandFromCommand(*id, nullptr, 0);
     }
     case (InternalState::CONFIG_HIGH_THRESHOLD): {
-      *id = Max31865Definitions::WRITE_HIGH_THRESHOLD;
+      *id = MAX31865::WRITE_HIGH_THRESHOLD;
       return buildCommandFromCommand(*id, nullptr, 0);
     }
     case (InternalState::REQUEST_HIGH_THRESHOLD): {
-      *id = Max31865Definitions::REQUEST_HIGH_THRESHOLD;
+      *id = MAX31865::REQUEST_HIGH_THRESHOLD;
       return buildCommandFromCommand(*id, nullptr, 0);
     }
     case (InternalState::CONFIG_LOW_THRESHOLD): {
-      *id = Max31865Definitions::WRITE_LOW_THRESHOLD;
+      *id = MAX31865::WRITE_LOW_THRESHOLD;
       return buildCommandFromCommand(*id, nullptr, 0);
     }
     case (InternalState::REQUEST_LOW_THRESHOLD): {
-      *id = Max31865Definitions::REQUEST_LOW_THRESHOLD;
+      *id = MAX31865::REQUEST_LOW_THRESHOLD;
       return buildCommandFromCommand(*id, nullptr, 0);
     }
     case (InternalState::CLEAR_FAULT_BYTE): {
-      *id = Max31865Definitions::CLEAR_FAULT_BYTE;
+      *id = MAX31865::CLEAR_FAULT_BYTE;
       return buildCommandFromCommand(*id, nullptr, 0);
     }
 
@@ -156,10 +156,11 @@ ReturnValue_t Max31865PT1000Handler::buildCommandFromCommand(DeviceCommandId_t d
                                                              const uint8_t *commandData,
                                                              size_t commandDataLen) {
   switch (deviceCommand) {
-    case (Max31865Definitions::CONFIG_CMD): {
+    case (MAX31865::CONFIG_CMD): {
-      commandBuffer[0] = static_cast<uint8_t>(Max31865Definitions::CONFIG_CMD);
+      commandBuffer[0] = static_cast<uint8_t>(MAX31865::CONFIG_CMD);
       if (commandDataLen == 1) {
         commandBuffer[1] = commandData[0];
+        currentCfg = commandData[0];
         DeviceHandlerBase::rawPacketLen = 2;
         DeviceHandlerBase::rawPacket = commandBuffer.data();
         return HasReturnvaluesIF::RETURN_OK;
@@ -167,54 +168,54 @@ ReturnValue_t Max31865PT1000Handler::buildCommandFromCommand(DeviceCommandId_t d
         return DeviceHandlerIF::NO_COMMAND_DATA;
       }
     }
-    case (Max31865Definitions::CLEAR_FAULT_BYTE): {
+    case (MAX31865::CLEAR_FAULT_BYTE): {
-      commandBuffer[0] = static_cast<uint8_t>(Max31865Definitions::CONFIG_CMD);
+      commandBuffer[0] = static_cast<uint8_t>(MAX31865::CONFIG_CMD);
-      commandBuffer[1] = Max31865Definitions::CLEAR_FAULT_BIT_VAL;
+      commandBuffer[1] = currentCfg | MAX31865::CLEAR_FAULT_BIT_VAL;
       DeviceHandlerBase::rawPacketLen = 2;
       DeviceHandlerBase::rawPacket = commandBuffer.data();
       return HasReturnvaluesIF::RETURN_OK;
     }
-    case (Max31865Definitions::REQUEST_CONFIG): {
+    case (MAX31865::REQUEST_CONFIG): {
-      commandBuffer[0] = static_cast<uint8_t>(Max31865Definitions::REQUEST_CONFIG);
+      commandBuffer[0] = static_cast<uint8_t>(MAX31865::REQUEST_CONFIG);
       commandBuffer[1] = 0x00;  // dummy byte
       DeviceHandlerBase::rawPacketLen = 2;
       DeviceHandlerBase::rawPacket = commandBuffer.data();
       return HasReturnvaluesIF::RETURN_OK;
     }
-    case (Max31865Definitions::WRITE_HIGH_THRESHOLD): {
+    case (MAX31865::WRITE_HIGH_THRESHOLD): {
-      commandBuffer[0] = static_cast<uint8_t>(Max31865Definitions::WRITE_HIGH_THRESHOLD);
+      commandBuffer[0] = static_cast<uint8_t>(MAX31865::WRITE_HIGH_THRESHOLD);
       commandBuffer[1] = static_cast<uint8_t>(HIGH_THRESHOLD >> 8);
       commandBuffer[2] = static_cast<uint8_t>(HIGH_THRESHOLD & 0xFF);
       DeviceHandlerBase::rawPacketLen = 3;
       DeviceHandlerBase::rawPacket = commandBuffer.data();
       return HasReturnvaluesIF::RETURN_OK;
     }
-    case (Max31865Definitions::REQUEST_HIGH_THRESHOLD): {
+    case (MAX31865::REQUEST_HIGH_THRESHOLD): {
-      commandBuffer[0] = static_cast<uint8_t>(Max31865Definitions::REQUEST_HIGH_THRESHOLD);
+      commandBuffer[0] = static_cast<uint8_t>(MAX31865::REQUEST_HIGH_THRESHOLD);
       commandBuffer[1] = 0x00;  // dummy byte
       commandBuffer[2] = 0x00;  // dummy byte
       DeviceHandlerBase::rawPacketLen = 3;
       DeviceHandlerBase::rawPacket = commandBuffer.data();
       return HasReturnvaluesIF::RETURN_OK;
     }
-    case (Max31865Definitions::WRITE_LOW_THRESHOLD): {
+    case (MAX31865::WRITE_LOW_THRESHOLD): {
-      commandBuffer[0] = static_cast<uint8_t>(Max31865Definitions::WRITE_LOW_THRESHOLD);
+      commandBuffer[0] = static_cast<uint8_t>(MAX31865::WRITE_LOW_THRESHOLD);
       commandBuffer[1] = static_cast<uint8_t>(LOW_THRESHOLD >> 8);
       commandBuffer[2] = static_cast<uint8_t>(LOW_THRESHOLD & 0xFF);
       DeviceHandlerBase::rawPacketLen = 3;
       DeviceHandlerBase::rawPacket = commandBuffer.data();
       return HasReturnvaluesIF::RETURN_OK;
     }
-    case (Max31865Definitions::REQUEST_LOW_THRESHOLD): {
+    case (MAX31865::REQUEST_LOW_THRESHOLD): {
-      commandBuffer[0] = static_cast<uint8_t>(Max31865Definitions::REQUEST_LOW_THRESHOLD);
+      commandBuffer[0] = static_cast<uint8_t>(MAX31865::REQUEST_LOW_THRESHOLD);
       commandBuffer[1] = 0x00;  // dummy byte
       commandBuffer[2] = 0x00;  // dummy byte
       DeviceHandlerBase::rawPacketLen = 3;
       DeviceHandlerBase::rawPacket = commandBuffer.data();
       return HasReturnvaluesIF::RETURN_OK;
     }
-    case (Max31865Definitions::REQUEST_RTD): {
+    case (MAX31865::REQUEST_RTD): {
-      commandBuffer[0] = static_cast<uint8_t>(Max31865Definitions::REQUEST_RTD);
+      commandBuffer[0] = static_cast<uint8_t>(MAX31865::REQUEST_RTD);
       // two dummy bytes
       commandBuffer[1] = 0x00;
       commandBuffer[2] = 0x00;
@@ -222,8 +223,8 @@ ReturnValue_t Max31865PT1000Handler::buildCommandFromCommand(DeviceCommandId_t d
       DeviceHandlerBase::rawPacket = commandBuffer.data();
       return HasReturnvaluesIF::RETURN_OK;
     }
-    case (Max31865Definitions::REQUEST_FAULT_BYTE): {
+    case (MAX31865::REQUEST_FAULT_BYTE): {
-      commandBuffer[0] = static_cast<uint8_t>(Max31865Definitions::REQUEST_FAULT_BYTE);
+      commandBuffer[0] = static_cast<uint8_t>(MAX31865::REQUEST_FAULT_BYTE);
       commandBuffer[1] = 0x00;
       DeviceHandlerBase::rawPacketLen = 2;
       DeviceHandlerBase::rawPacket = commandBuffer.data();
@@ -236,15 +237,15 @@ ReturnValue_t Max31865PT1000Handler::buildCommandFromCommand(DeviceCommandId_t d
 }
 
 void Max31865PT1000Handler::fillCommandAndReplyMap() {
-  insertInCommandAndReplyMap(Max31865Definitions::CONFIG_CMD, 3);
+  insertInCommandAndReplyMap(MAX31865::CONFIG_CMD, 3);
-  insertInCommandAndReplyMap(Max31865Definitions::REQUEST_CONFIG, 3);
+  insertInCommandAndReplyMap(MAX31865::REQUEST_CONFIG, 3);
-  insertInCommandAndReplyMap(Max31865Definitions::WRITE_LOW_THRESHOLD, 3);
+  insertInCommandAndReplyMap(MAX31865::WRITE_LOW_THRESHOLD, 3);
-  insertInCommandAndReplyMap(Max31865Definitions::REQUEST_LOW_THRESHOLD, 3);
+  insertInCommandAndReplyMap(MAX31865::REQUEST_LOW_THRESHOLD, 3);
-  insertInCommandAndReplyMap(Max31865Definitions::WRITE_HIGH_THRESHOLD, 3);
+  insertInCommandAndReplyMap(MAX31865::WRITE_HIGH_THRESHOLD, 3);
-  insertInCommandAndReplyMap(Max31865Definitions::REQUEST_HIGH_THRESHOLD, 3);
+  insertInCommandAndReplyMap(MAX31865::REQUEST_HIGH_THRESHOLD, 3);
-  insertInCommandAndReplyMap(Max31865Definitions::REQUEST_RTD, 3, &sensorDataset);
+  insertInCommandAndReplyMap(MAX31865::REQUEST_RTD, 3, &sensorDataset);
-  insertInCommandAndReplyMap(Max31865Definitions::REQUEST_FAULT_BYTE, 3);
+  insertInCommandAndReplyMap(MAX31865::REQUEST_FAULT_BYTE, 3);
-  insertInCommandAndReplyMap(Max31865Definitions::CLEAR_FAULT_BYTE, 3);
+  insertInCommandAndReplyMap(MAX31865::CLEAR_FAULT_BYTE, 3);
 }
 
 ReturnValue_t Max31865PT1000Handler::scanForReply(const uint8_t *start, size_t remainingSize,
@@ -253,7 +254,7 @@ ReturnValue_t Max31865PT1000Handler::scanForReply(const uint8_t *start, size_t r
   size_t configReplySize = 2;
 
   if (remainingSize == rtdReplySize and internalState == InternalState::RUNNING) {
-    *foundId = Max31865Definitions::REQUEST_RTD;
+    *foundId = MAX31865::REQUEST_RTD;
     *foundLen = rtdReplySize;
     return RETURN_OK;
   }
@@ -262,24 +263,24 @@ ReturnValue_t Max31865PT1000Handler::scanForReply(const uint8_t *start, size_t r
     switch (internalState) {
       case (InternalState::CONFIG_HIGH_THRESHOLD): {
         *foundLen = 3;
-        *foundId = Max31865Definitions::WRITE_HIGH_THRESHOLD;
+        *foundId = MAX31865::WRITE_HIGH_THRESHOLD;
         commandExecuted = true;
         return RETURN_OK;
       }
       case (InternalState::REQUEST_HIGH_THRESHOLD): {
         *foundLen = 3;
-        *foundId = Max31865Definitions::REQUEST_HIGH_THRESHOLD;
+        *foundId = MAX31865::REQUEST_HIGH_THRESHOLD;
         return RETURN_OK;
       }
       case (InternalState::CONFIG_LOW_THRESHOLD): {
         *foundLen = 3;
-        *foundId = Max31865Definitions::WRITE_LOW_THRESHOLD;
+        *foundId = MAX31865::WRITE_LOW_THRESHOLD;
         commandExecuted = true;
         return RETURN_OK;
       }
       case (InternalState::REQUEST_LOW_THRESHOLD): {
         *foundLen = 3;
-        *foundId = Max31865Definitions::REQUEST_LOW_THRESHOLD;
+        *foundId = MAX31865::REQUEST_LOW_THRESHOLD;
         return RETURN_OK;
       }
       default: {
@@ -293,13 +294,13 @@ ReturnValue_t Max31865PT1000Handler::scanForReply(const uint8_t *start, size_t r
     if (internalState == InternalState::CONFIGURE) {
       commandExecuted = true;
       *foundLen = configReplySize;
-      *foundId = Max31865Definitions::CONFIG_CMD;
+      *foundId = MAX31865::CONFIG_CMD;
     } else if (internalState == InternalState::REQUEST_FAULT_BYTE) {
-      *foundId = Max31865Definitions::REQUEST_FAULT_BYTE;
+      *foundId = MAX31865::REQUEST_FAULT_BYTE;
       *foundLen = 2;
       internalState = InternalState::RUNNING;
     } else if (internalState == InternalState::CLEAR_FAULT_BYTE) {
-      *foundId = Max31865Definitions::CLEAR_FAULT_BYTE;
+      *foundId = MAX31865::CLEAR_FAULT_BYTE;
       *foundLen = 2;
       if (mode == _MODE_START_UP) {
         commandExecuted = true;
@@ -307,7 +308,7 @@ ReturnValue_t Max31865PT1000Handler::scanForReply(const uint8_t *start, size_t r
         internalState = InternalState::RUNNING;
       }
     } else {
-      *foundId = Max31865Definitions::REQUEST_CONFIG;
+      *foundId = MAX31865::REQUEST_CONFIG;
       *foundLen = configReplySize;
     }
   }
@@ -318,7 +319,7 @@ ReturnValue_t Max31865PT1000Handler::scanForReply(const uint8_t *start, size_t r
 ReturnValue_t Max31865PT1000Handler::interpretDeviceReply(DeviceCommandId_t id,
                                                           const uint8_t *packet) {
   switch (id) {
-    case (Max31865Definitions::REQUEST_CONFIG): {
+    case (MAX31865::REQUEST_CONFIG): {
       if (packet[1] != DEFAULT_CONFIG) {
         if (warningSwitch) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
@@ -342,7 +343,7 @@ ReturnValue_t Max31865PT1000Handler::interpretDeviceReply(DeviceCommandId_t id,
       }
       break;
     }
-    case (Max31865Definitions::REQUEST_LOW_THRESHOLD): {
+    case (MAX31865::REQUEST_LOW_THRESHOLD): {
       uint16_t readLowThreshold = packet[1] << 8 | packet[2];
       if (readLowThreshold != LOW_THRESHOLD) {
 #if FSFW_VERBOSE_LEVEL >= 1
@@ -360,8 +361,8 @@ ReturnValue_t Max31865PT1000Handler::interpretDeviceReply(DeviceCommandId_t id,
       commandExecuted = true;
       break;
     }
-    case (Max31865Definitions::REQUEST_HIGH_THRESHOLD): {
+    case (MAX31865::REQUEST_HIGH_THRESHOLD): {
-      uint16_t readHighThreshold = packet[1] << 8 | packet[2];
+      uint16_t readHighThreshold = (packet[1] << 8) | packet[2];
       if (readHighThreshold != HIGH_THRESHOLD) {
 #if FSFW_VERBOSE_LEVEL >= 1
 #if FSFW_CPP_OSTREAM_ENABLED == 1
@@ -378,13 +379,13 @@ ReturnValue_t Max31865PT1000Handler::interpretDeviceReply(DeviceCommandId_t id,
       commandExecuted = true;
       break;
     }
-    case (Max31865Definitions::REQUEST_RTD): {
+    case (MAX31865::REQUEST_RTD): {
       // first bit of LSB reply byte is the fault bit
-      uint8_t faultBit = packet[2] & 0b0000'0001;
+      bool faultBit = packet[2] & 0b0000'0001;
       if (resetFaultBit) {
         internalState = InternalState::CLEAR_FAULT_BYTE;
         resetFaultBit = false;
-      } else if (faultBit == 1) {
+      } else if (shouldFaultStatusBeRequested(faultBit)) {
         // Maybe we should attempt to restart it?
         internalState = InternalState::REQUEST_FAULT_BYTE;
         resetFaultBit = true;
@@ -393,9 +394,8 @@ ReturnValue_t Max31865PT1000Handler::interpretDeviceReply(DeviceCommandId_t id,
       // RTD value consists of last seven bits of the LSB reply byte and
       // the MSB reply byte
       uint16_t adcCode = ((packet[1] << 8) | packet[2]) >> 1;
-      // do something with rtd value, will propably be stored in
+      // Calculate resistance
-      // dataset.
+      float rtdValue = adcCode * EiveMax31855::RTD_RREF_PT1000 / INT16_MAX;
-      float rtdValue = adcCode * RTD_RREF_PT1000 / INT16_MAX;
       // calculate approximation
       float approxTemp = adcCode / 32.0 - 256.0;
 
@@ -403,9 +403,9 @@ ReturnValue_t Max31865PT1000Handler::interpretDeviceReply(DeviceCommandId_t id,
 #if OBSW_VERBOSE_LEVEL >= 1
         if (debugDivider->checkAndIncrement()) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-          sif::info << "Max31865: ObjID " << std::hex << this->getObjectId() << " | RTD "
+          sif::info << "Max31865: " << std::setw(24) << std::left << locString << std::right
-                    << std::dec << static_cast<int>(deviceIdx) << ": R[Ohm] " << rtdValue
+                    << " | R[Ohm] " << rtdValue << " Ohms | Approx T[C]: " << approxTemp
-                    << " Ohms | Approx T[C]: " << approxTemp << std::endl;
+                    << std::endl;
 #else
           sif::printInfo("Max31685: Measured resistance is %f Ohms\n", rtdValue);
           sif::printInfo("Approximated temperature is %f C\n", approxTemp);
@@ -438,58 +438,57 @@ ReturnValue_t Max31865PT1000Handler::interpretDeviceReply(DeviceCommandId_t id,
       sensorDataset.temperatureCelcius = approxTemp;
       break;
     }
-    case (Max31865Definitions::REQUEST_FAULT_BYTE): {
+    case (MAX31865::REQUEST_FAULT_BYTE): {
-      faultByte = packet[1];
+      currentFaultStatus = packet[1];
+      bool faultStatusChanged = (currentFaultStatus != lastFaultStatus);
+      // Spam protection
+      if (faultStatusChanged or
+          ((currentFaultStatus == lastFaultStatus) and (sameFaultStatusCounter < 3))) {
+        // TODO: Think about triggering an event here
 #if OBSW_VERBOSE_LEVEL >= 1
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-      sif::warning << "Max31865PT1000Handler::interpretDeviceReply: Object ID: " << std::hex
+        sif::warning << "Max31865PT1000Handler::interpretDeviceReply: Object ID: " << std::hex
-                   << this->getObjectId()
+                     << this->getObjectId() << ": Fault byte is: 0b"
-                   << ": Fault byte"
+                     << std::bitset<8>(currentFaultStatus) << std::endl;
-                      " is: 0b"
-                   << std::bitset<8>(faultByte) << std::endl;
 #else
-      sif::printWarning(
+        sif::printWarning(
-          "Max31865PT1000Handler::interpretDeviceReply: Fault byte"
+            "Max31865PT1000Handler::interpretDeviceReply: Fault byte"
-          " is: 0b" BYTE_TO_BINARY_PATTERN "\n",
+            " is: 0b" BYTE_TO_BINARY_PATTERN "\n",
-          BYTE_TO_BINARY(faultByte));
+            BYTE_TO_BINARY(faultByte));
 #endif
 #endif
-      ReturnValue_t result = sensorDataset.read();
+        if (faultStatusChanged) {
+          sameFaultStatusCounter = 0;
+        } else {
+          sameFaultStatusCounter++;
+        }
+      }
+      if (faultStatusChanged) {
+        lastFaultStatus = currentFaultStatus;
+      }
+
+      PoolReadGuard pg(&sensorDataset);
+      auto result = pg.getReadResult();
       if (result != HasReturnvaluesIF::RETURN_OK) {
         // Configuration error
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-        sif::debug << "Max31865PT1000Handler::interpretDeviceReply: Object ID: " << std::hex
+        sif::warning << "Max31865PT1000Handler::interpretDeviceReply: Object ID: " << std::hex
-                   << this->getObjectId()
+                     << this->getObjectId() << ": Error reading dataset" << std::endl;
-                   << ":"
-                      "Error reading dataset!"
-                   << std::endl;
 #else
-        sif::printDebug(
+        sif::printWarning("Max31865PT1000Handler::interpretDeviceReply: Error reading dataset\n");
-            "Max31865PT1000Handler::interpretDeviceReply: "
-            "Error reading dataset!\n");
 #endif
         return result;
       }
+      if (faultStatusChanged) {
+        sensorDataset.lastErrorByte.setValid(true);
+        sensorDataset.lastErrorByte = lastFaultStatus;
+      }
       sensorDataset.errorByte.setValid(true);
-      sensorDataset.errorByte = faultByte;
+      sensorDataset.errorByte = currentFaultStatus;
-      if (faultByte != 0) {
+
+      if (currentFaultStatus != 0) {
         sensorDataset.temperatureCelcius.setValid(false);
       }
-
-      result = sensorDataset.commit();
-      if (result != HasReturnvaluesIF::RETURN_OK) {
-        // Configuration error
-#if FSFW_CPP_OSTREAM_ENABLED == 1
-        sif::debug << "Max31865PT1000Handler::interpretDeviceReply: Object ID: " << std::hex
-                   << this->getObjectId() << ": Error commiting dataset!" << std::endl;
-#else
-        sif::printDebug(
-            "Max31865PT1000Handler::interpretDeviceReply: "
-            "Error commiting dataset!\n");
-#endif
-        return result;
-      }
-
       break;
     }
     default:
@@ -498,11 +497,8 @@ ReturnValue_t Max31865PT1000Handler::interpretDeviceReply(DeviceCommandId_t id,
   return HasReturnvaluesIF::RETURN_OK;
 }
 
-void Max31865PT1000Handler::debugInterface(uint8_t positionTracker, object_id_t objectId,
-                                           uint32_t parameter) {}
-
 uint32_t Max31865PT1000Handler::getTransitionDelayMs(Mode_t modeFrom, Mode_t modeTo) {
-  return 25000;
+  return 5000;
 }
 
 ReturnValue_t Max31865PT1000Handler::getSwitches(const uint8_t **switches,
@@ -512,10 +508,12 @@ ReturnValue_t Max31865PT1000Handler::getSwitches(const uint8_t **switches,
 
 ReturnValue_t Max31865PT1000Handler::initializeLocalDataPool(localpool::DataPool &localDataPoolMap,
                                                              LocalDataPoolManager &poolManager) {
-  localDataPoolMap.emplace(Max31865Definitions::PoolIds::RTD_VALUE, new PoolEntry<float>({0}));
+  using namespace MAX31865;
-  localDataPoolMap.emplace(Max31865Definitions::PoolIds::TEMPERATURE_C,
+  localDataPoolMap.emplace(static_cast<lp_id_t>(PoolIds::RTD_VALUE), new PoolEntry<float>({0}));
-                           new PoolEntry<float>({0}, 1, true));
+  localDataPoolMap.emplace(static_cast<lp_id_t>(PoolIds::TEMPERATURE_C), new PoolEntry<float>({0}));
-  localDataPoolMap.emplace(Max31865Definitions::PoolIds::FAULT_BYTE, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(static_cast<lp_id_t>(PoolIds::LAST_FAULT_BYTE),
+                           new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(static_cast<lp_id_t>(PoolIds::FAULT_BYTE), new PoolEntry<uint8_t>({0}));
   poolManager.subscribeForPeriodicPacket(sensorDataset.getSid(), false, 30.0, false);
   return HasReturnvaluesIF::RETURN_OK;
 }
@@ -526,10 +524,23 @@ void Max31865PT1000Handler::setInstantNormal(bool instantNormal) {
 
 void Max31865PT1000Handler::modeChanged() {
   if (mode == MODE_OFF) {
+    lastFaultStatus = 0;
+    currentFaultStatus = 0;
+    sameFaultStatusCounter = 0;
     internalState = InternalState::NONE;
   }
 }
 
-void Max31865PT1000Handler::setDeviceIdx(uint8_t idx) { deviceIdx = idx; }
+void Max31865PT1000Handler::setDeviceInfo(uint8_t idx, std::string locString_) {
+  deviceIdx = idx;
+  locString = std::move(locString_);
+}
 
 void Max31865PT1000Handler::setDebugMode(bool enable) { this->debugMode = enable; }
+
+bool Max31865PT1000Handler::shouldFaultStatusBeRequested(bool faultBit) {
+  if ((sameFaultStatusCounter < 3) and faultBit) {
+    return true;
+  }
+  return false;
+}

mission/devices/Max31865PT1000Handler.h

@@ -48,7 +48,7 @@ class Max31865PT1000Handler : public DeviceHandlerBase {
   static constexpr uint8_t DEFAULT_CONFIG = 0b11000001;
 
   void setInstantNormal(bool instantNormal);
-  void setDeviceIdx(uint8_t idx);
+  void setDeviceInfo(uint8_t idx, std::string locString);
 
   /**
    * Expected temperature range is -100 C and 100 C.
@@ -61,7 +61,6 @@ class Max31865PT1000Handler : public DeviceHandlerBase {
   static constexpr uint16_t HIGH_THRESHOLD = 11298;  // = 100 C
   static constexpr uint16_t LOW_THRESHOLD = 4902;    // = -100 C
 
-  static constexpr float RTD_RREF_PT1000 = 4020.0;         //!< Ohm
   static constexpr float RTD_RESISTANCE0_PT1000 = 1000.0;  //!< Ohm
  protected:
   // DeviceHandlerBase abstract function implementation
@@ -77,12 +76,10 @@ class Max31865PT1000Handler : public DeviceHandlerBase {
   ReturnValue_t interpretDeviceReply(DeviceCommandId_t id, const uint8_t *packet) override;
   uint32_t getTransitionDelayMs(Mode_t modeFrom, Mode_t modeTo) override;
   ReturnValue_t getSwitches(const uint8_t **switches, uint8_t *numberOfSwitches) override;
-
-  void debugInterface(uint8_t positionTracker = 0, object_id_t objectId = 0,
-                      uint32_t parameter = 0) override;
   ReturnValue_t initializeLocalDataPool(localpool::DataPool &localDataPoolMap,
                                         LocalDataPoolManager &poolManager) override;
   void modeChanged() override;
+  bool shouldFaultStatusBeRequested(bool faultBit);
 
  private:
   uint8_t switchId = 0;
@@ -109,11 +106,15 @@ class Max31865PT1000Handler : public DeviceHandlerBase {
 
   bool resetFaultBit = false;
   dur_millis_t startTime = 0;
-  uint8_t faultByte = 0;
+  uint8_t currentCfg = 0;
+  uint8_t currentFaultStatus = 0;
+  uint8_t lastFaultStatus = 0;
+  uint16_t sameFaultStatusCounter = 0;
+  std::string locString;
   uint8_t deviceIdx = 0;
   std::array<uint8_t, 3> commandBuffer{0};
 
-  Max31865Definitions::Max31865Set sensorDataset;
+  MAX31865::Max31865Set sensorDataset;
   sid_t sensorDatasetSid;
 
 #if OBSW_VERBOSE_LEVEL >= 1

mission/devices/PayloadPcduHandler.cpp

@@ -716,7 +716,7 @@ ReturnValue_t PayloadPcduHandler::transferAsTwo(SpiComIF* comIf, SpiCookie* cook
   GpioIF* gpioIF = comIf->getGpioInterface();
   MutexIF::TimeoutType timeoutType = MutexIF::TimeoutType::WAITING;
   uint32_t timeoutMs = 0;
-  MutexIF* mutex = comIf->getMutex(&timeoutType, &timeoutMs);
+  MutexIF* mutex = comIf->getCsMutex();
   if (mutex == nullptr or gpioIF == nullptr) {
 #if OBSW_VERBOSE_LEVEL >= 1
     sif::warning << "GyroADIS16507Handler::spiSendCallback: "
@@ -727,6 +727,7 @@ ReturnValue_t PayloadPcduHandler::transferAsTwo(SpiComIF* comIf, SpiCookie* cook
   }
 
   if (gpioId != gpio::NO_GPIO) {
+    cookie->getMutexParams(timeoutType, timeoutMs);
     result = mutex->lockMutex(timeoutType, timeoutMs);
     if (result != RETURN_OK) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1

mission/devices/devicedefinitions/Max31865Definitions.h

@@ -7,20 +7,48 @@
 
 #include "objects/systemObjectList.h"
 
-namespace Max31865Definitions {
+namespace MAX31865 {
 
-enum PoolIds : lp_id_t { RTD_VALUE, TEMPERATURE_C, FAULT_BYTE };
+enum class PoolIds : lp_id_t { RTD_VALUE, TEMPERATURE_C, LAST_FAULT_BYTE, FAULT_BYTE };
+enum Wires : unsigned int { TWO_WIRE = 0, THREE_WIRE = 1, FOUR_WIRE = 0 };
+
+enum ConvMode : unsigned int { NORM_OFF = 0, AUTO = 1 };
+
+enum Bias : unsigned int { OFF = 0, ON = 1 };
+
+enum FilterSel : unsigned int { FIFTY_HERTZ = 1, SIXTY_HERTZ = 0 };
+
+enum CfgBitPos {
+  FILTER_SEL = 0,
+  FAULT_STATUS_CLEAR = 1,
+  FDCC = 2,
+  WIRE_SEL = 4,
+  ONE_SHOT = 5,
+  CONV_MODE = 6,
+  BIAS_SEL = 7
+};
+
+static constexpr uint32_t WARMUP_MS = 100;
+
+static constexpr uint8_t WRITE_BIT = 0b10000000;
+
+enum Regs : uint8_t {
+  CONFIG = 0x00,
+  RTD = 0x01,
+  HIGH_THRESHOLD = 0x03,
+  LOW_THRESHOLD = 0x05,
+  FAULT_BYTE = 0x07
+};
 
 static constexpr DeviceCommandId_t CONFIG_CMD = 0x80;
 static constexpr DeviceCommandId_t WRITE_HIGH_THRESHOLD = 0x83;
 static constexpr DeviceCommandId_t WRITE_LOW_THRESHOLD = 0x85;
 
-static constexpr DeviceCommandId_t REQUEST_CONFIG = 0x00;
+static constexpr DeviceCommandId_t REQUEST_CONFIG = CONFIG;
-static constexpr DeviceCommandId_t REQUEST_RTD = 0x01;
+static constexpr DeviceCommandId_t REQUEST_RTD = RTD;
-static constexpr DeviceCommandId_t REQUEST_HIGH_THRESHOLD = 0x03;
+static constexpr DeviceCommandId_t REQUEST_HIGH_THRESHOLD = HIGH_THRESHOLD;
-static constexpr DeviceCommandId_t REQUEST_LOW_THRESHOLD = 0x05;
+static constexpr DeviceCommandId_t REQUEST_LOW_THRESHOLD = LOW_THRESHOLD;
-static constexpr DeviceCommandId_t REQUEST_FAULT_BYTE = 0x07;
+static constexpr DeviceCommandId_t REQUEST_FAULT_BYTE = FAULT_BYTE;
-
 static constexpr DeviceCommandId_t CLEAR_FAULT_BYTE = 0x08;
 
 static constexpr uint32_t MAX31865_SET_ID = REQUEST_RTD;
@@ -28,26 +56,82 @@ static constexpr uint8_t CLEAR_FAULT_BIT_VAL = 0b0000'0010;
 
 static constexpr size_t MAX_REPLY_SIZE = 5;
 
-class Max31865Set : public StaticLocalDataSet<sizeof(float) + sizeof(uint8_t)> {
+class Max31865Set : public StaticLocalDataSet<4> {
  public:
   /**
    * Constructor used by owner and data creators like device handlers.
    * @param owner
    * @param setId
    */
-  Max31865Set(HasLocalDataPoolIF* owner) : StaticLocalDataSet(owner, MAX31865_SET_ID) {}
+  Max31865Set(HasLocalDataPoolIF* owner, uint32_t setId) : StaticLocalDataSet(owner, setId) {}
 
   /**
    * Constructor used by data users like controllers.
    * @param sid
    */
-  Max31865Set(object_id_t objectId) : StaticLocalDataSet(sid_t(objectId, MAX31865_SET_ID)) {}
+  Max31865Set(object_id_t objectId, uint32_t setId) : StaticLocalDataSet(sid_t(objectId, setId)) {}
 
-  lp_var_t<float> rtdValue = lp_var_t<float>(sid.objectId, PoolIds::RTD_VALUE, this);
+  lp_var_t<float> rtdValue =
-  lp_var_t<float> temperatureCelcius = lp_var_t<float>(sid.objectId, PoolIds::TEMPERATURE_C, this);
+      lp_var_t<float>(sid.objectId, static_cast<lp_id_t>(PoolIds::RTD_VALUE), this);
-  lp_var_t<uint8_t> errorByte = lp_var_t<uint8_t>(sid.objectId, PoolIds::FAULT_BYTE, this);
+  lp_var_t<float> temperatureCelcius =
+      lp_var_t<float>(sid.objectId, static_cast<lp_id_t>(PoolIds::TEMPERATURE_C), this);
+  lp_var_t<uint8_t> lastErrorByte =
+      lp_var_t<uint8_t>(sid.objectId, static_cast<lp_id_t>(PoolIds::LAST_FAULT_BYTE), this);
+  lp_var_t<uint8_t> errorByte =
+      lp_var_t<uint8_t>(sid.objectId, static_cast<lp_id_t>(PoolIds::FAULT_BYTE), this);
 };
 
-}  // namespace Max31865Definitions
+}  // namespace MAX31865
+
+namespace EiveMax31855 {
+
+static constexpr float RTD_RREF_PT1000 = 4020.0;  //!< Ohm
+static constexpr uint8_t NUM_RTDS = 16;
+
+enum RtdCommands : DeviceCommandId_t {
+  ON = 0,
+  EXCHANGE_SET_ID = MAX31865::REQUEST_RTD,
+  ACTIVE = 2,
+  LOW_THRESHOLD = 3,
+  HIGH_TRESHOLD = 4,
+  OFF = 5,
+  CFG = 6,
+  NUM_CMDS
+};
+
+class ReadOutStruct : public SerialLinkedListAdapter<SerializeIF> {
+ public:
+  ReadOutStruct() { setLinks(); }
+  ReadOutStruct(bool active, uint32_t spiErrCnt, bool faultBitSet, uint8_t faultVal,
+                uint16_t rtdVal)
+      : active(active),
+        adcCode(rtdVal),
+        faultBitSet(faultBitSet),
+        faultValue(faultVal),
+        spiErrorCount(spiErrCnt) {
+    setLinks();
+  }
+
+  //! RTD was set on and is configured, but is not periodically polled
+  SerializeElement<bool> configured = false;
+  //! RTD is active and polled periodically
+  SerializeElement<bool> active = false;
+  SerializeElement<uint16_t> adcCode = 0;
+  SerializeElement<bool> faultBitSet = false;
+  SerializeElement<uint8_t> faultValue = 0;
+  SerializeElement<uint32_t> spiErrorCount = 0;
+
+ private:
+  void setLinks() {
+    setStart(&configured);
+    configured.setNext(&active);
+    active.setNext(&adcCode);
+    adcCode.setNext(&faultBitSet);
+    faultBitSet.setNext(&faultValue);
+    faultValue.setNext(&spiErrorCount);
+  };
+};
+
+};  // namespace EiveMax31855
 
 #endif /* MISSION_DEVICES_DEVICEDEFINITIONS_MAX13865DEFINITIONS_H_ */

mission/memory/CMakeLists.txt

@@ -1,5 +1 @@
-target_sources(${LIB_EIVE_MISSION} PRIVATE
+target_sources(${LIB_EIVE_MISSION} PRIVATE NVMParameterBase.cpp)
-	NVMParameterBase.cpp
-)
-
-

mission/system/CMakeLists.txt

@@ -1,16 +1,15 @@
-target_sources(${LIB_EIVE_MISSION} PRIVATE
+target_sources(
-    EiveSystem.cpp
+  ${LIB_EIVE_MISSION}
-    AcsSubsystem.cpp
+  PRIVATE EiveSystem.cpp
-    ComSubsystem.cpp
+          AcsSubsystem.cpp
-    PayloadSubsystem.cpp
+          ComSubsystem.cpp
-
+          PayloadSubsystem.cpp
-    AcsBoardAssembly.cpp
+          AcsBoardAssembly.cpp
-    RwAssembly.cpp
+          RwAssembly.cpp
-    SusAssembly.cpp
+          SusAssembly.cpp
-    DualLanePowerStateMachine.cpp
+          DualLanePowerStateMachine.cpp
-    PowerStateMachineBase.cpp
+          PowerStateMachineBase.cpp
-    DualLaneAssemblyBase.cpp
+          DualLaneAssemblyBase.cpp
-    TcsBoardAssembly.cpp
+          TcsBoardAssembly.cpp)
-)
 
 add_subdirectory(fdir)

mission/system/TcsBoardAssembly.cpp

@@ -10,7 +10,7 @@ TcsBoardAssembly::TcsBoardAssembly(object_id_t objectId, object_id_t parentId,
   eventQueue = QueueFactory::instance()->createMessageQueue(24);
   ModeListEntry entry;
   for (uint8_t idx = 0; idx < NUMBER_RTDS; idx++) {
-    entry.setObject(helper.rtdIds[idx]);
+    entry.setObject(helper.rtdInfos[idx].first);
     entry.setMode(MODE_OFF);
     entry.setSubmode(SUBMODE_NONE);
     entry.setInheritSubmode(false);
@@ -56,7 +56,7 @@ ReturnValue_t TcsBoardAssembly::checkChildrenStateOn(Mode_t wantedMode, Submode_
   int devsInWrongMode = 0;
   try {
     for (uint8_t idx = 0; idx < NUMBER_RTDS; idx++) {
-      if (childrenMap.at(helper.rtdIds[idx]).mode != wantedMode) {
+      if (childrenMap.at(helper.rtdInfos[idx].first).mode != wantedMode) {
         devsInWrongMode++;
       }
     }
@@ -92,8 +92,8 @@ ReturnValue_t TcsBoardAssembly::isModeCombinationValid(Mode_t mode, Submode_t su
 
 ReturnValue_t TcsBoardAssembly::initialize() {
   ReturnValue_t result = RETURN_OK;
-  for (const auto& obj : helper.rtdIds) {
+  for (const auto& obj : helper.rtdInfos) {
-    result = registerChild(obj);
+    result = registerChild(obj.first);
     if (result != HasReturnvaluesIF::RETURN_OK) {
       return result;
     }
@@ -125,8 +125,8 @@ ReturnValue_t TcsBoardAssembly::handleNormalOrOnModeCmd(Mode_t mode, Submode_t s
   object_id_t objId = 0;
   try {
     for (uint8_t idx = 0; idx < NUMBER_RTDS; idx++) {
-      devMode = childrenMap.at(helper.rtdIds[idx]).mode;
+      devMode = childrenMap.at(helper.rtdInfos[idx].first).mode;
-      objId = helper.rtdIds[idx];
+      objId = helper.rtdInfos[idx].first;
       if (mode == devMode) {
         modeTable[idx].setMode(mode);
       } else if (mode == DeviceHandlerIF::MODE_NORMAL) {

mission/system/TcsBoardAssembly.h

@@ -6,9 +6,10 @@
 #include <fsfw/power/PowerSwitcher.h>
 
 struct TcsBoardHelper {
-  TcsBoardHelper(std::array<object_id_t, 16> rtdIds) : rtdIds(rtdIds) {}
+  TcsBoardHelper(std::array<std::pair<object_id_t, std::string>, 16> rtdInfos)
+      : rtdInfos(std::move(rtdInfos)) {}
 
-  std::array<object_id_t, 16> rtdIds = {};
+  std::array<std::pair<object_id_t, std::string>, 16> rtdInfos = {};
 };
 
 class TcsBoardAssembly : public AssemblyBase, public ConfirmsFailuresIF {

mission/system/fdir/CMakeLists.txt

@@ -1,7 +1,3 @@
-target_sources(${LIB_EIVE_MISSION} PRIVATE
+target_sources(
-    AcsBoardFdir.cpp
+  ${LIB_EIVE_MISSION} PRIVATE AcsBoardFdir.cpp RtdFdir.cpp SusFdir.cpp
-    RtdFdir.cpp
+                              SyrlinksFdir.cpp GomspacePowerFdir.cpp)
-    SusFdir.cpp
-    SyrlinksFdir.cpp
-    GomspacePowerFdir.cpp
-)

mission/tmtc/CMakeLists.txt

@@ -1,6 +1 @@
-target_sources(${LIB_EIVE_MISSION} PRIVATE
+target_sources(${LIB_EIVE_MISSION} PRIVATE CCSDSHandler.cpp VirtualChannel.cpp)
-	CCSDSHandler.cpp
- 	VirtualChannel.cpp
-)
-
-

mission/utility/CMakeLists.txt

@@ -1,8 +1,2 @@
-target_sources(${LIB_EIVE_MISSION} PRIVATE
+target_sources(${LIB_EIVE_MISSION} PRIVATE TmFunnel.cpp Timestamp.cpp
-	TmFunnel.cpp
+                                           ProgressPrinter.cpp Filenaming.cpp)
-	Timestamp.cpp
-	ProgressPrinter.cpp
-	Filenaming.cpp
-)
-
-

mission/utility/ProgressPrinter.cpp

@@ -1,5 +1,6 @@
 #include "ProgressPrinter.h"
 
+#include <cmath>
 #include <iomanip>
 
 #include "fsfw/serviceinterface/ServiceInterfaceStream.h"
@@ -16,4 +17,9 @@ void ProgressPrinter::print(uint32_t currentStep) {
               << std::endl;
     nextProgressPrint += percentageResolution;
   }
+  if (nextProgressPrint - progressInPercent < 0) {
+    nextProgressPrint =
+        (std::floor(progressInPercent / percentageResolution) * percentageResolution) +
+        percentageResolution;
+  }
 }

scripts/apply-clang-format.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-if [[ ! -f README.md ]]; then
-	cd ..
-fi
-
-find ./mission -iname *.h -o -iname *.cpp -o -iname *.c | xargs clang-format --style=file -i
-find ./linux -iname *.h -o -iname *.cpp -o -iname *.c | xargs clang-format --style=file -i
-find ./bsp_q7s -iname *.h -o -iname *.cpp -o -iname *.c | xargs clang-format --style=file -i
-find ./bsp_linux_board -iname *.h -o -iname *.cpp -o -iname *.c | xargs clang-format --style=file -i
-find ./bsp_hosted -iname *.h -o -iname *.cpp -o -iname *.c | xargs clang-format --style=file -i
-find ./bsp_egse -iname *.h -o -iname *.cpp -o -iname *.c | xargs clang-format --style=file -i
-find ./test -iname *.h -o -iname *.cpp -o -iname *.c | xargs clang-format --style=file -i
-find ./unittest -iname *.h -o -iname *.cpp -o -iname *.c -o -type d -name build -prune | \
-	xargs clang-format --style=file -i

scripts/auto-formatter.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+if [[ ! -f README.md ]]; then
+	cd ..
+fi
+
+folder_list=(
+  "./mission"
+  "./linux"
+  "./bsp_q7s"
+  "./bsp_linux_board"
+  "./bsp_hosted"
+  "./bsp_egse"
+  "./test"
+  "./common"
+)
+
+cmake_fmt="cmake-format"
+file_selectors="-iname CMakeLists.txt"
+if command -v ${cmake_fmt} &> /dev/null; then
+  echo "Auto-formatting all CMakeLists.txt files"
+  ${cmake_fmt} -i CMakeLists.txt
+  for dir in ${folder_list[@]}; do
+  	find ${dir} ${file_selectors} | xargs ${cmake_fmt} -i
+  done
+else
+  echo "No ${cmake_fmt} tool found, not formatting CMake files"
+fi
+
+cpp_format="clang-format"
+file_selectors="-iname *.h -o -iname *.cpp -o -iname *.c -o -iname *.tpp"
+if command -v ${cpp_format} &> /dev/null; then
+  for dir in ${folder_list[@]}; do
+    echo "Auto-formatting C/C++ files in ${dir} recursively"
+    find ${dir} ${file_selectors} | xargs ${cpp_format} --style=file -i
+  done
+  find ./unittest ${file_selectors} -o -type d -name build -prune | \
+	xargs clang-format --style=file -i
+else
+  echo "No ${cpp_format} tool found, not formatting C++/C files"
+fi

scripts/install-obsw-yocto.sh

@@ -1,9 +1,16 @@
 #!/bin/bash
 # This is a helper script to install the compiles EIVE OBSW files
 # into the yocto repository to re-generate the mission root filesystem
+build_dir=cmake-build-release-q7s
+if [ ! -z ${1} ]; then
+  if [[ "${1}" == "em" ]]; then
+    echo "-I- Installing EM binaries"
+    build_dir=cmake-build-release-q7s-em
+  fi
+fi
 
 init_dir=$(pwd)
-build_dir=cmake-build-release-q7s
+
 obsw_root=""
 q7s_yocto_dir="q7s-yocto"
 q7s_package_path="q7s-package/${q7s_yocto_dir}"

test/gpio/CMakeLists.txt

@@ -1,7 +1,3 @@
-target_sources(${OBSW_NAME} PUBLIC
+target_sources(${OBSW_NAME} PUBLIC DummyGpioIF.cpp)
-	DummyGpioIF.cpp
-)
 
-target_include_directories(${OBSW_NAME} PUBLIC
+target_include_directories(${OBSW_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-	${CMAKE_CURRENT_SOURCE_DIR}
-)

test/testtasks/CMakeLists.txt

@@ -1,7 +1,3 @@
-target_sources(${OBSW_NAME} PUBLIC
+target_sources(${OBSW_NAME} PUBLIC TestTask.cpp)
-	TestTask.cpp
-)
 
-target_include_directories(${OBSW_NAME} PUBLIC
+target_include_directories(${OBSW_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-	${CMAKE_CURRENT_SOURCE_DIR}
-)

tmtc

@@ -1 +1 @@
-Subproject commit a681850248fdf33c948b8cbda84acdf268d28669
+Subproject commit 9332fb8690de200070e712a70b1fa339d5b6b8d8