added spdlog

2021-05-12 19:16:38 +02:00
49 changed files with 534 additions and 735 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -1,6 +0,0 @@
-/build*
-generators
-misc
-tmtc
-doc
-
--- a/.gitmodules
+++ b/.gitmodules
@ -13,3 +13,6 @@
 [submodule "fsfw"]
 	path = fsfw
 	url = https://egit.irs.uni-stuttgart.de/fsfw/fsfw.git
+[submodule "spdlog"]
+	path = spdlog
+	url = https://github.com/gabime/spdlog.git
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -55,6 +55,7 @@ set(MISSION_PATH mission)
 set(COMMON_PATH common)
 set(TEST_PATH test)
 set(LWIP_PATH lwip)
+set(SPDLOG_PATH spdlog)
 set(LIB_FSFW_HAL_PATH fsfw_hal)

 # Analyse different OS and architecture/target options, determine BSP_PATH,
@ -117,11 +118,15 @@ add_subdirectory(${LIB_FSFW_HAL_PATH})
 # Post-Sources preparation
 ################################################################################

+# set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} sbdlog)
+add_subdirectory(spdlog)
+
 # Add libraries for all sources.
 target_link_libraries(${TARGET_NAME} PRIVATE
    ${LIB_FSFW_NAME} 
    ${LIB_OS_NAME} 
    ${LIB_FSFW_HAL_NAME}
+    spdlog
 )

 # Add include paths for all sources.
--- a/bsp_hosted/Dockerfile
+++ b/bsp_hosted/Dockerfile
@ -1,18 +0,0 @@
-FROM ubuntu:latest
-# FROM alpine:latest
-
-RUN apt-get update && apt-get install -y cmake g++
-# RUN apk add cmake make g++
-
-WORKDIR /usr/src/app
-COPY . .
-
-RUN set -ex; \
-    rm -rf build-hosted; \
-    mkdir build-hosted; \
-    cd build-hosted; \
-    cmake -DCMAKE_BUILD_TYPE=Release -DOS_FSFW=host ..;
-
-ENTRYPOINT ["cmake", "--build", "build-hosted"]
-CMD ["-j"]
-# CMD ["bash"]
--- a/bsp_hosted/fsfwconfig/events/translateEvents.cpp
+++ b/bsp_hosted/fsfwconfig/events/translateEvents.cpp
@ -1,249 +0,0 @@
-/**
- * @brief    Auto-generated event translation file. Contains 78 translations.
- * @details
- * Generated on: 2021-05-14 11:51:26
- */
-#include "translateEvents.h"
-
-const char *STORE_SEND_WRITE_FAILED_STRING = "STORE_SEND_WRITE_FAILED";
-const char *STORE_WRITE_FAILED_STRING = "STORE_WRITE_FAILED";
-const char *STORE_SEND_READ_FAILED_STRING = "STORE_SEND_READ_FAILED";
-const char *STORE_READ_FAILED_STRING = "STORE_READ_FAILED";
-const char *UNEXPECTED_MSG_STRING = "UNEXPECTED_MSG";
-const char *STORING_FAILED_STRING = "STORING_FAILED";
-const char *TM_DUMP_FAILED_STRING = "TM_DUMP_FAILED";
-const char *STORE_INIT_FAILED_STRING = "STORE_INIT_FAILED";
-const char *STORE_INIT_EMPTY_STRING = "STORE_INIT_EMPTY";
-const char *STORE_CONTENT_CORRUPTED_STRING = "STORE_CONTENT_CORRUPTED";
-const char *STORE_INITIALIZE_STRING = "STORE_INITIALIZE";
-const char *INIT_DONE_STRING = "INIT_DONE";
-const char *DUMP_FINISHED_STRING = "DUMP_FINISHED";
-const char *DELETION_FINISHED_STRING = "DELETION_FINISHED";
-const char *DELETION_FAILED_STRING = "DELETION_FAILED";
-const char *AUTO_CATALOGS_SENDING_FAILED_STRING = "AUTO_CATALOGS_SENDING_FAILED";
-const char *GET_DATA_FAILED_STRING = "GET_DATA_FAILED";
-const char *STORE_DATA_FAILED_STRING = "STORE_DATA_FAILED";
-const char *DEVICE_BUILDING_COMMAND_FAILED_STRING = "DEVICE_BUILDING_COMMAND_FAILED";
-const char *DEVICE_SENDING_COMMAND_FAILED_STRING = "DEVICE_SENDING_COMMAND_FAILED";
-const char *DEVICE_REQUESTING_REPLY_FAILED_STRING = "DEVICE_REQUESTING_REPLY_FAILED";
-const char *DEVICE_READING_REPLY_FAILED_STRING = "DEVICE_READING_REPLY_FAILED";
-const char *DEVICE_INTERPRETING_REPLY_FAILED_STRING = "DEVICE_INTERPRETING_REPLY_FAILED";
-const char *DEVICE_MISSED_REPLY_STRING = "DEVICE_MISSED_REPLY";
-const char *DEVICE_UNKNOWN_REPLY_STRING = "DEVICE_UNKNOWN_REPLY";
-const char *DEVICE_UNREQUESTED_REPLY_STRING = "DEVICE_UNREQUESTED_REPLY";
-const char *INVALID_DEVICE_COMMAND_STRING = "INVALID_DEVICE_COMMAND";
-const char *MONITORING_LIMIT_EXCEEDED_STRING = "MONITORING_LIMIT_EXCEEDED";
-const char *MONITORING_AMBIGUOUS_STRING = "MONITORING_AMBIGUOUS";
-const char *FUSE_CURRENT_HIGH_STRING = "FUSE_CURRENT_HIGH";
-const char *FUSE_WENT_OFF_STRING = "FUSE_WENT_OFF";
-const char *POWER_ABOVE_HIGH_LIMIT_STRING = "POWER_ABOVE_HIGH_LIMIT";
-const char *POWER_BELOW_LOW_LIMIT_STRING = "POWER_BELOW_LOW_LIMIT";
-const char *SWITCH_WENT_OFF_STRING = "SWITCH_WENT_OFF";
-const char *HEATER_ON_STRING = "HEATER_ON";
-const char *HEATER_OFF_STRING = "HEATER_OFF";
-const char *HEATER_TIMEOUT_STRING = "HEATER_TIMEOUT";
-const char *HEATER_STAYED_ON_STRING = "HEATER_STAYED_ON";
-const char *HEATER_STAYED_OFF_STRING = "HEATER_STAYED_OFF";
-const char *TEMP_SENSOR_HIGH_STRING = "TEMP_SENSOR_HIGH";
-const char *TEMP_SENSOR_LOW_STRING = "TEMP_SENSOR_LOW";
-const char *TEMP_SENSOR_GRADIENT_STRING = "TEMP_SENSOR_GRADIENT";
-const char *COMPONENT_TEMP_LOW_STRING = "COMPONENT_TEMP_LOW";
-const char *COMPONENT_TEMP_HIGH_STRING = "COMPONENT_TEMP_HIGH";
-const char *COMPONENT_TEMP_OOL_LOW_STRING = "COMPONENT_TEMP_OOL_LOW";
-const char *COMPONENT_TEMP_OOL_HIGH_STRING = "COMPONENT_TEMP_OOL_HIGH";
-const char *TEMP_NOT_IN_OP_RANGE_STRING = "TEMP_NOT_IN_OP_RANGE";
-const char *FDIR_CHANGED_STATE_STRING = "FDIR_CHANGED_STATE";
-const char *FDIR_STARTS_RECOVERY_STRING = "FDIR_STARTS_RECOVERY";
-const char *FDIR_TURNS_OFF_DEVICE_STRING = "FDIR_TURNS_OFF_DEVICE";
-const char *MONITOR_CHANGED_STATE_STRING = "MONITOR_CHANGED_STATE";
-const char *VALUE_BELOW_LOW_LIMIT_STRING = "VALUE_BELOW_LOW_LIMIT";
-const char *VALUE_ABOVE_HIGH_LIMIT_STRING = "VALUE_ABOVE_HIGH_LIMIT";
-const char *VALUE_OUT_OF_RANGE_STRING = "VALUE_OUT_OF_RANGE";
-const char *SWITCHING_TM_FAILED_STRING = "SWITCHING_TM_FAILED";
-const char *CHANGING_MODE_STRING = "CHANGING_MODE";
-const char *MODE_INFO_STRING = "MODE_INFO";
-const char *FALLBACK_FAILED_STRING = "FALLBACK_FAILED";
-const char *MODE_TRANSITION_FAILED_STRING = "MODE_TRANSITION_FAILED";
-const char *CANT_KEEP_MODE_STRING = "CANT_KEEP_MODE";
-const char *OBJECT_IN_INVALID_MODE_STRING = "OBJECT_IN_INVALID_MODE";
-const char *FORCING_MODE_STRING = "FORCING_MODE";
-const char *MODE_CMD_REJECTED_STRING = "MODE_CMD_REJECTED";
-const char *HEALTH_INFO_STRING = "HEALTH_INFO";
-const char *CHILD_CHANGED_HEALTH_STRING = "CHILD_CHANGED_HEALTH";
-const char *CHILD_PROBLEMS_STRING = "CHILD_PROBLEMS";
-const char *OVERWRITING_HEALTH_STRING = "OVERWRITING_HEALTH";
-const char *TRYING_RECOVERY_STRING = "TRYING_RECOVERY";
-const char *RECOVERY_STEP_STRING = "RECOVERY_STEP";
-const char *RECOVERY_DONE_STRING = "RECOVERY_DONE";
-const char *RF_AVAILABLE_STRING = "RF_AVAILABLE";
-const char *RF_LOST_STRING = "RF_LOST";
-const char *BIT_LOCK_STRING = "BIT_LOCK";
-const char *BIT_LOCK_LOST_STRING = "BIT_LOCK_LOST";
-const char *FRAME_PROCESSING_FAILED_STRING = "FRAME_PROCESSING_FAILED";
-const char *CLOCK_SET_STRING = "CLOCK_SET";
-const char *CLOCK_SET_FAILURE_STRING = "CLOCK_SET_FAILURE";
-const char *TEST_STRING = "TEST";
-
-const char * translateEvents(Event event) {
-	switch( (event & 0xffff) ) {
-	case(2200):
-		return STORE_SEND_WRITE_FAILED_STRING;
-	case(2201):
-		return STORE_WRITE_FAILED_STRING;
-	case(2202):
-		return STORE_SEND_READ_FAILED_STRING;
-	case(2203):
-		return STORE_READ_FAILED_STRING;
-	case(2204):
-		return UNEXPECTED_MSG_STRING;
-	case(2205):
-		return STORING_FAILED_STRING;
-	case(2206):
-		return TM_DUMP_FAILED_STRING;
-	case(2207):
-		return STORE_INIT_FAILED_STRING;
-	case(2208):
-		return STORE_INIT_EMPTY_STRING;
-	case(2209):
-		return STORE_CONTENT_CORRUPTED_STRING;
-	case(2210):
-		return STORE_INITIALIZE_STRING;
-	case(2211):
-		return INIT_DONE_STRING;
-	case(2212):
-		return DUMP_FINISHED_STRING;
-	case(2213):
-		return DELETION_FINISHED_STRING;
-	case(2214):
-		return DELETION_FAILED_STRING;
-	case(2215):
-		return AUTO_CATALOGS_SENDING_FAILED_STRING;
-	case(2600):
-		return GET_DATA_FAILED_STRING;
-	case(2601):
-		return STORE_DATA_FAILED_STRING;
-	case(2800):
-		return DEVICE_BUILDING_COMMAND_FAILED_STRING;
-	case(2801):
-		return DEVICE_SENDING_COMMAND_FAILED_STRING;
-	case(2802):
-		return DEVICE_REQUESTING_REPLY_FAILED_STRING;
-	case(2803):
-		return DEVICE_READING_REPLY_FAILED_STRING;
-	case(2804):
-		return DEVICE_INTERPRETING_REPLY_FAILED_STRING;
-	case(2805):
-		return DEVICE_MISSED_REPLY_STRING;
-	case(2806):
-		return DEVICE_UNKNOWN_REPLY_STRING;
-	case(2807):
-		return DEVICE_UNREQUESTED_REPLY_STRING;
-	case(2808):
-		return INVALID_DEVICE_COMMAND_STRING;
-	case(2809):
-		return MONITORING_LIMIT_EXCEEDED_STRING;
-	case(2810):
-		return MONITORING_AMBIGUOUS_STRING;
-	case(4201):
-		return FUSE_CURRENT_HIGH_STRING;
-	case(4202):
-		return FUSE_WENT_OFF_STRING;
-	case(4204):
-		return POWER_ABOVE_HIGH_LIMIT_STRING;
-	case(4205):
-		return POWER_BELOW_LOW_LIMIT_STRING;
-	case(4300):
-		return SWITCH_WENT_OFF_STRING;
-	case(5000):
-		return HEATER_ON_STRING;
-	case(5001):
-		return HEATER_OFF_STRING;
-	case(5002):
-		return HEATER_TIMEOUT_STRING;
-	case(5003):
-		return HEATER_STAYED_ON_STRING;
-	case(5004):
-		return HEATER_STAYED_OFF_STRING;
-	case(5200):
-		return TEMP_SENSOR_HIGH_STRING;
-	case(5201):
-		return TEMP_SENSOR_LOW_STRING;
-	case(5202):
-		return TEMP_SENSOR_GRADIENT_STRING;
-	case(5901):
-		return COMPONENT_TEMP_LOW_STRING;
-	case(5902):
-		return COMPONENT_TEMP_HIGH_STRING;
-	case(5903):
-		return COMPONENT_TEMP_OOL_LOW_STRING;
-	case(5904):
-		return COMPONENT_TEMP_OOL_HIGH_STRING;
-	case(5905):
-		return TEMP_NOT_IN_OP_RANGE_STRING;
-	case(7101):
-		return FDIR_CHANGED_STATE_STRING;
-	case(7102):
-		return FDIR_STARTS_RECOVERY_STRING;
-	case(7103):
-		return FDIR_TURNS_OFF_DEVICE_STRING;
-	case(7201):
-		return MONITOR_CHANGED_STATE_STRING;
-	case(7202):
-		return VALUE_BELOW_LOW_LIMIT_STRING;
-	case(7203):
-		return VALUE_ABOVE_HIGH_LIMIT_STRING;
-	case(7204):
-		return VALUE_OUT_OF_RANGE_STRING;
-	case(7301):
-		return SWITCHING_TM_FAILED_STRING;
-	case(7400):
-		return CHANGING_MODE_STRING;
-	case(7401):
-		return MODE_INFO_STRING;
-	case(7402):
-		return FALLBACK_FAILED_STRING;
-	case(7403):
-		return MODE_TRANSITION_FAILED_STRING;
-	case(7404):
-		return CANT_KEEP_MODE_STRING;
-	case(7405):
-		return OBJECT_IN_INVALID_MODE_STRING;
-	case(7406):
-		return FORCING_MODE_STRING;
-	case(7407):
-		return MODE_CMD_REJECTED_STRING;
-	case(7506):
-		return HEALTH_INFO_STRING;
-	case(7507):
-		return CHILD_CHANGED_HEALTH_STRING;
-	case(7508):
-		return CHILD_PROBLEMS_STRING;
-	case(7509):
-		return OVERWRITING_HEALTH_STRING;
-	case(7510):
-		return TRYING_RECOVERY_STRING;
-	case(7511):
-		return RECOVERY_STEP_STRING;
-	case(7512):
-		return RECOVERY_DONE_STRING;
-	case(7900):
-		return RF_AVAILABLE_STRING;
-	case(7901):
-		return RF_LOST_STRING;
-	case(7902):
-		return BIT_LOCK_STRING;
-	case(7903):
-		return BIT_LOCK_LOST_STRING;
-	case(7905):
-		return FRAME_PROCESSING_FAILED_STRING;
-	case(8900):
-		return CLOCK_SET_STRING;
-	case(8901):
-		return CLOCK_SET_FAILURE_STRING;
-	case(9700):
-		return TEST_STRING;
-	default:
-		return "UNKNOWN_EVENT";
-	}
-	return 0;
-}
--- a/bsp_hosted/fsfwconfig/events/translateEvents.h
+++ b/bsp_hosted/fsfwconfig/events/translateEvents.h
@ -1,8 +0,0 @@
-#ifndef FSFWCONFIG_EVENTS_TRANSLATEEVENTS_H_
-#define FSFWCONFIG_EVENTS_TRANSLATEEVENTS_H_
-
-#include <fsfw/events/Event.h>
-
-const char * translateEvents(Event event);
-
-#endif /* FSFWCONFIG_EVENTS_TRANSLATEEVENTS_H_ */
--- a/bsp_linux/Dockerfile
+++ b/bsp_linux/Dockerfile
@ -1,18 +0,0 @@
-FROM ubuntu:latest
-# FROM alpine:latest
-
-RUN apt-get update && apt-get install -y cmake g++
-# RUN apk add cmake make g++
-
-WORKDIR /usr/src/app
-COPY . .
-
-RUN set -ex; \
-    rm -rf build-linux; \
-    mkdir build-linux; \
-    cd build-linux; \
-    cmake -DCMAKE_BUILD_TYPE=Release -DOS_FSFW=linux ..;
-
-ENTRYPOINT ["cmake", "--build", "build-linux"]
-CMD ["-j"]
-# CMD ["bash"]
--- a/bsp_stm32_freertos/Dockerfile
+++ b/bsp_stm32_freertos/Dockerfile
@ -1,41 +0,0 @@
-# Specify the cross compiler version
-# See: https://github.com/xpack-dev-tools/arm-none-eabi-gcc-xpack
-ARG XPM_ARM_XCOMPILER_VERSION_DEFAULT="10.2.1-1.1.2"
-
-# Stage 0
-
-# FROM node:current-alpine3.13
-FROM node:latest
-# Issues with XPM cross-compiler on alpine..
-ARG XPM_ARM_XCOMPILER_VERSION_DEFAULT
-ENV XPM_ARM_XCOMPILER_VERSION=$XPM_ARM_XCOMPILER_VERSION_DEFAULT
-
-RUN npm install --global xpm@latest; \
-    xpm install --global @xpack-dev-tools/arm-none-eabi-gcc@${XPM_ARM_XCOMPILER_VERSION}
-
-# Stage 1
-
-FROM ubuntu:latest
-# FROM alpine:latest
-COPY --from=0 /root/.local/xPacks/@xpack-dev-tools /usr/tools/
-ARG XPM_ARM_XCOMPILER_VERSION_DEFAULT
-ENV XPM_ARM_XCOMPILER_VERSION=$XPM_ARM_XCOMPILER_VERSION_DEFAULT
-RUN echo ${XPM_ARM_XCOMPILER_VERSION}
-
-RUN apt-get update && apt-get install -y cmake g++
-# RUN apk add cmake make g++
-
-ENV PATH="/usr/tools/arm-none-eabi-gcc/${XPM_ARM_XCOMPILER_VERSION}/.content/bin:${PATH}"
-
-WORKDIR /usr/src/app
-COPY . .
-
-RUN set -ex; \
-    rm -rf build-freertos; \
-    mkdir build-freertos; \
-    cd build-freertos; \
-    cmake -DCMAKE_BUILD_TYPE=Release -DOS_FSFW=freertos -DTGT_BSP=arm/stm32h743zi-nucleo ..;
-
-ENTRYPOINT ["cmake", "--build", "build-freertos"]
-CMD ["-j"]
-# CMD ["bash"]
--- a/cmake/scripts/BeagleBoneBlack/crosscompile/create_cmake_debug_cfg.sh
+++ b/cmake/scripts/BeagleBoneBlack/crosscompile/create_cmake_debug_cfg.sh
--- a/cmake/scripts/RPi/crosscompile/create_cmake_debug_cfg.sh
+++ b/cmake/scripts/RPi/crosscompile/create_cmake_debug_cfg.sh
--- a/doc/README-rpi.md
+++ b/doc/README-rpi.md
@ -84,12 +84,6 @@ toolchain binaries are added to the path accordingly.
    wget https://github.com/Pro/raspi-toolchain/releases/latest/download/raspi-toolchain.tar.gz
    ```

-   Then extract to the opt folder:
-   
-   ```sh
-   sudo tar xfz raspi-toolchain.tar.gz --strip-components=1 -C /opt
-   ```
-   
   Please note that this version of the toolchain might become obsolete in the future.
   If another toolchain installation is used, it is still recommended to unpack the toolchain in the 
   `/opt/cross-pi-gcc` folder so that the Eclipse configuration and helper 
@ -129,7 +123,7 @@ toolchain binaries are added to the path accordingly.
   `$HOME/raspberrypi/rootfs`.

   ```sh
-   rsync -avHAXR --numeric-ids --info=progress2 <username>@<ip-address>:/{lib,usr,opt/vc/lib} <rootfs-path>
+   rsync -avHAXR --numeric-ids --info=progress2 <username>@<ip-address>:/{lib,usr} <rootfs-path>
   ```

   On Linux, it is recommended to repair some symlinks which can be problematic:
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,17 +0,0 @@
-version: "3.8"
-
-services:
-    build-linux:
-        build:
-            context: .
-            dockerfile: bsp_linux/Dockerfile
-
-    build-host:
-        build:
-            context: .
-            dockerfile: bsp_hosted/Dockerfile
-
-    build-freertos:
-        build:
-            context: .
-            dockerfile: bsp_stm32_freertos/Dockerfile
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit f3d9fb645ea5f4dfdf8b1d8aafe542ff8bbbefd6
+Subproject commit b06113993c4952532c39b8adbcabf2a630457a5e
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit d801319c12713d08cbdbc571ee2a922ce2f0c851
+Subproject commit a85c01465bc8687773676f05c5e7eb8af54b25ff
--- a/generators/definitions.py
+++ b/generators/definitions.py
@ -1,16 +0,0 @@
-import enum
-
-
-class BspSelect(enum.Enum):
-    BSP_HOSTED = enum.auto()
-    BSP_LINUX = enum.auto()
-    BSP_STM32_FREERTOS = enum.auto()
-    BSP_STM32_RTEMS = enum.auto()
-
-
-BspFolderDict = {
-    BspSelect.BSP_HOSTED.value: "bsp_hosted",
-    BspSelect.BSP_LINUX.value: "bsp_linux",
-    BspSelect.BSP_STM32_FREERTOS.value: "bsp_stm32_freertos",
-    BspSelect.BSP_STM32_RTEMS.value: "bsp_stm32_rtems",
-}
--- a/generators/events/event_parser.py
+++ b/generators/events/event_parser.py
@ -1,92 +0,0 @@
-#! /usr/bin/python3
-"""
-@file   event_parser.py
-@brief  Part of the Mission Information Base Exporter for the SOURCE project by KSat.
-@details
-Event exporter.
-
-To use MySQLdb, run pip install mysqlclient or install in IDE.
-On Windows, Build Tools installation might be necessary
-@data   21.11.2019
-"""
-import datetime
-
-from modgen.events.event_parser import handle_csv_export, handle_cpp_export, SubsystemDefinitionParser, EventParser
-from modgen.parserbase.file_list_parser import FileListParser
-from modgen.utility.mib_printer import PrettyPrinter
-
-from definitions import BspSelect, BspFolderDict
-from utility.mib_file_management import copy_file, move_file
-
-# TODO: Ask from user or store in json file?
-BSP_SELECT = BspSelect.BSP_HOSTED.value
-BSP_FOLDER = BspFolderDict[BSP_SELECT]
-DATE_TODAY = datetime.datetime.now()
-DATE_STRING_FULL = DATE_TODAY.strftime("%Y-%m-%d %H:%M:%S")
-
-GENERATE_CPP = True
-GENERATE_CPP_H = True
-GENERATE_CSV = True
-COPY_CPP_FILE = True
-COPY_CPP_H_FILE = True
-MOVE_CSV_FILE = True
-
-PARSE_HOST_BSP = True
-
-CSV_FILENAME = "mib_events.csv"
-CSV_MOVE_DESTINATION = "../"
-
-CPP_FILENAME = "translateEvents.cpp"
-CPP_H_FILENAME = "translateEvents.h"
-
-CPP_COPY_DESTINATION = f"../../{BSP_FOLDER}/fsfwconfig/events/"
-
-FILE_SEPARATOR = ";"
-SUBSYSTEM_DEFINITION_DESTINATIONS = [
-    f"../../{BSP_FOLDER}/fsfwconfig/events/subsystemIdRanges.h",
-    "../../fsfw/events/fwSubsystemIdRanges.h"
-]
-HEADER_DEFINITION_DESTINATIONS = ["../../mission/", "../../fsfw/", f"../../{BSP_FOLDER}", "../../test/"]
-
-
-def main():
-    print("EventParser: Parsing events: ")
-    event_list = parse_events()
-    if GENERATE_CSV:
-        handle_csv_export(file_name=CSV_FILENAME, event_list=event_list, file_separator=FILE_SEPARATOR)
-        if MOVE_CSV_FILE:
-            move_file(file_name=CSV_FILENAME, destination=CSV_MOVE_DESTINATION)
-    if GENERATE_CPP:
-        handle_cpp_export(
-            event_list=event_list, date_string=DATE_STRING_FULL, file_name=CPP_FILENAME,
-            generate_header=GENERATE_CPP_H, header_file_name=CPP_H_FILENAME
-        )
-        if COPY_CPP_FILE:
-            print(f"EventParser: Copying file to {CPP_COPY_DESTINATION}")
-            copy_file(CPP_FILENAME, CPP_COPY_DESTINATION)
-            copy_file(CPP_H_FILENAME, CPP_COPY_DESTINATION)
-    print("")
-
-
-def parse_events():
-    subsystem_parser = SubsystemDefinitionParser(SUBSYSTEM_DEFINITION_DESTINATIONS)
-    subsystem_table = subsystem_parser.parse_files()
-    print(f"Found {len(subsystem_table)} subsystem definitions.")
-    PrettyPrinter.pprint(subsystem_table)
-    event_header_parser = FileListParser(HEADER_DEFINITION_DESTINATIONS)
-    event_headers = event_header_parser.parse_header_files(
-        True, "Parsing event header file list:\n", True
-    )
-    # PrettyPrinter.pprint(event_headers)
-    # myEventList = parseHeaderFiles(subsystem_table, event_headers)
-    event_parser = EventParser(event_headers, subsystem_table)
-    event_parser.set_moving_window_mode(moving_window_size=7)
-    event_table = event_parser.parse_files()
-    list_items = sorted(event_table.items())
-    print(f"Found {len(list_items)} entries:")
-    PrettyPrinter.pprint(list_items)
-    return list_items
-
-
-if __name__ == "__main__":
-    main()
--- a/generators/events/mib_events.py
+++ b/generators/events/mib_events.py
@ -0,0 +1,223 @@
+#! /usr/bin/python3.8
+"""
+@file   mib_events.py
+@brief  Part of the Mission Information Base Exporter for the SOURCE project by KSat.
+@details
+Event exporter.
+
+To use MySQLdb, run pip install mysqlclient or install in IDE.
+On Windows, Build Tools installation might be necessary
+@data   21.11.2019
+"""
+import re
+import datetime
+from parserbase.mib_file_list_parser import FileListParser
+from parserbase.mib_parser import FileParser
+from utility.mib_printer import PrettyPrinter
+from utility.mib_file_management import copy_file, move_file
+
+DATE_TODAY = datetime.datetime.now()
+DATE_STRING_FULL = DATE_TODAY.strftime("%Y-%m-%d %H:%M:%S")
+
+GENERATE_CPP = True
+GENERATE_CSV = True
+COPY_CPP_FILE = True
+MOVE_CSV_FILE = True
+
+CSV_FILENAME = "mib_events.csv"
+CSV_MOVE_DESTINATION = "../"
+
+CPP_FILENAME = "translateEvents.cpp"
+CPP_COPY_DESTINATION = "../../config/events/"
+
+FILE_SEPARATOR = ";"
+SUBSYSTEM_DEFINITION_DESTINATIONS = ["../../config/tmtc/subsystemIdRanges.h",
+                                     "../../fsfw/events/fwSubsystemIdRanges.h"]
+HEADER_DEFINITION_DESTINATIONS = ["../../mission/", "../../fsfw/"]
+
+
+def main():
+    print("EventParser: Parsing events: ")
+    event_list = parse_events()
+    if GENERATE_CSV:
+        handle_csv_export(CSV_FILENAME, event_list)
+        if MOVE_CSV_FILE:
+            move_file(CSV_FILENAME, CSV_MOVE_DESTINATION)
+    if GENERATE_CPP:
+        handle_cpp_export(CPP_FILENAME, event_list)
+        if COPY_CPP_FILE:
+            print("EventParser: Copying file to " + CPP_COPY_DESTINATION)
+            copy_file(CPP_FILENAME, CPP_COPY_DESTINATION)
+    print("")
+
+
+def parse_events():
+    subsystem_parser = SubsystemDefinitionParser(SUBSYSTEM_DEFINITION_DESTINATIONS)
+    subsystem_table = subsystem_parser.parse_files()
+    print("Found " + str(len(subsystem_table)) + " subsystem definitions.")
+    PrettyPrinter.pprint(subsystem_table)
+    event_header_parser = FileListParser(HEADER_DEFINITION_DESTINATIONS)
+    event_headers = event_header_parser.parse_header_files(
+        True, "Parsing event header file list:\n", True)
+    # g.PP.pprint(event_headers)
+    # myEventList = parseHeaderFiles(subsystem_table, event_headers)
+    event_parser = EventParser(event_headers, subsystem_table)
+    event_table = event_parser.parse_files()
+    list_items = sorted(event_table.items())
+    print("Found " + str(len(list_items)) + " entries:")
+    PrettyPrinter.pprint(list_items)
+    return list_items
+
+
+class SubsystemDefinitionParser(FileParser):
+    def __init__(self, file_list):
+        super().__init__(file_list)
+
+    def _handle_file_parsing(self, file_name: str, *args, **kwargs):
+        file = open(file_name, "r")
+        for line in file.readlines():
+            match = re.search(r'([A-Z0-9_]*) = ([0-9]{1,2})', line)
+            if match:
+                self.mib_table.update({match.group(1): [match.group(2)]})
+
+    def _post_parsing_operation(self):
+        pass
+
+
+class EventParser(FileParser):
+    def __init__(self, file_list, interface_list):
+        super().__init__(file_list)
+        self.interfaces = interface_list
+        self.count = 0
+        self.myId = 0
+        self.currentId = 0
+        self.last_lines = ["", "", ""]
+
+    def _handle_file_parsing(self, file_name: str, *args: any, **kwargs):
+        try:
+            file = open(file_name, 'r', encoding='utf-8')
+            all_lines = file.readlines()
+        except UnicodeDecodeError:
+            file = open(file_name, 'r', encoding='cp1252')
+            all_lines = file.readlines()
+        total_count = 0
+        for line in all_lines:
+            self.__handle_line_reading(line, file_name)
+        if self.count > 0:
+            print("File " + file_name + " contained " + str(self.count) + " events.")
+            total_count += self.count
+            self.count = 0
+
+    def _post_parsing_operation(self):
+        pass
+
+    def __handle_line_reading(self, line, file_name):
+        if not self.last_lines[0] == '\n':
+            twolines = self.last_lines[0] + ' ' + line.strip()
+        else:
+            twolines = ''
+        match1 = re.search('SUBSYSTEM_ID[\s]*=[\s]*SUBSYSTEM_ID::([A-Z_0-9]*);', twolines)
+        if match1:
+            self.currentId = self.interfaces[match1.group(1)][0]
+            # print( "Current ID: " + str(currentId) )
+            self.myId = self.return_number_from_string(self.currentId)
+        match = re.search(
+            '(//)?[\t ]*static const(?:expr)? Event[\s]*([A-Z_0-9]*)[\s]*=[\s]*'
+            'MAKE_EVENT\(([0-9]{1,2}),[\s]*SEVERITY::([A-Z]*)\);[\t ]*(//!<)?([^\n]*)', twolines)
+        if match:
+            if match.group(1):
+                self.last_lines[0] = line
+                return
+            description = " "
+            if match.group(6):
+                description = self.clean_up_description(match.group(6))
+            string_to_add = match.group(2)
+            full_id = (self.myId * 100) + self.return_number_from_string(match.group(3))
+            severity = match.group(4)
+            if full_id in self.mib_table:
+                # print("EventParser: Duplicate Event " + hex(full_id) + " from " + file_name +
+                #      " was already in " + self.mib_table[full_id][3])
+                pass
+            self.mib_table.update({full_id: (string_to_add, severity, description, file_name)})
+            self.count = self.count + 1
+        self.last_lines[0] = line
+
+    def build_checked_string(self, first_part, second_part):
+        my_str = first_part + self.convert(second_part)
+        if len(my_str) > 16:
+            print("EventParser: Entry: " + my_str + " too long. Will truncate.")
+            my_str = my_str[0:14]
+        # else:
+        # print( "Entry: " + myStr + " is all right.")
+        return my_str
+
+    @staticmethod
+    def return_number_from_string(a_string):
+        if a_string.startswith('0x'):
+            return int(a_string, 16)
+        elif a_string.isdigit():
+            return int(a_string)
+        else:
+            print('EventParser: Illegal number representation: ' + a_string)
+            return 0
+
+    @staticmethod
+    def convert(name):
+        single_strings = name.split('_')
+        new_string = ''
+        for one_string in single_strings:
+            one_string = one_string.lower()
+            one_string = one_string.capitalize()
+            new_string = new_string + one_string
+        return new_string
+
+    @staticmethod
+    def clean_up_description(description):
+        description = description.lstrip('//!<>')
+        description = description.lstrip()
+        if description == '':
+            description = ' '
+        return description
+
+
+def export_to_file(filename, list_of_entries):
+    print("EventParser: Exporting to file: " + filename)
+    file = open(filename, "w")
+    for entry in list_of_entries:
+        file.write(str(entry[0]) + FILE_SEPARATOR + entry[1][0] + FILE_SEPARATOR + entry[1][1]
+                   + FILE_SEPARATOR + entry[1][2] + FILE_SEPARATOR + entry[1][3] + '\n')
+    file.close()
+    return
+
+
+def write_translation_file(filename, list_of_entries):
+    outputfile = open(filename, "w")
+    definitions = ""
+
+    function = "const char * translateEvents(Event event){\n\tswitch((event&0xFFFF)){\n"
+    for entry in list_of_entries:
+        definitions += "const char *" + entry[1][0] + "_STRING = \"" + entry[1][0] + "\";\n"
+        function += "\t\tcase " + str(entry[0]) + ":\n\t\t\treturn " + entry[1][0] + "_STRING;\n"
+    function += '\t\tdefault:\n\t\t\treturn "UNKNOWN_EVENT";\n'
+    outputfile.write("/**\n * @brief    Auto-generated event translation file. "
+                     "Contains " + str(len(list_of_entries)) + " translations.\n"
+                     " * Generated on: " + DATE_STRING_FULL +
+                     " \n */\n")
+    outputfile.write("#include \"translateEvents.h\"\n\n")
+    outputfile.write(definitions + "\n" + function + "\t}\n\treturn 0;\n}\n")
+    outputfile.close()
+
+
+def handle_csv_export(file_name: str, list_items: list):
+    """
+    Generates the CSV in the same directory as the .py file and copes the CSV to another
+    directory if specified.
+    """
+    export_to_file(file_name, list_items)
+
+def handle_cpp_export(file_name: str, list_items):
+    print("EventParser: Generating translation cpp file.")
+    write_translation_file(file_name, list_items)
+
+if __name__ == "__main__":
+    main()
--- a/generators/events/translateEvents.cpp
+++ b/generators/events/translateEvents.cpp
@ -1,7 +1,6 @@
 /**
 * @brief    Auto-generated event translation file. Contains 78 translations.
- * @details
- * Generated on: 2021-05-14 11:51:26
+ * Generated on: 2020-09-30 15:17:26 
 */
 #include "translateEvents.h"

@ -84,166 +83,166 @@ const char *CLOCK_SET_STRING = "CLOCK_SET";
 const char *CLOCK_SET_FAILURE_STRING = "CLOCK_SET_FAILURE";
 const char *TEST_STRING = "TEST";

-const char * translateEvents(Event event) {
-	switch( (event & 0xffff) ) {
-	case(2200):
-		return STORE_SEND_WRITE_FAILED_STRING;
-	case(2201):
-		return STORE_WRITE_FAILED_STRING;
-	case(2202):
-		return STORE_SEND_READ_FAILED_STRING;
-	case(2203):
-		return STORE_READ_FAILED_STRING;
-	case(2204):
-		return UNEXPECTED_MSG_STRING;
-	case(2205):
-		return STORING_FAILED_STRING;
-	case(2206):
-		return TM_DUMP_FAILED_STRING;
-	case(2207):
-		return STORE_INIT_FAILED_STRING;
-	case(2208):
-		return STORE_INIT_EMPTY_STRING;
-	case(2209):
-		return STORE_CONTENT_CORRUPTED_STRING;
-	case(2210):
-		return STORE_INITIALIZE_STRING;
-	case(2211):
-		return INIT_DONE_STRING;
-	case(2212):
-		return DUMP_FINISHED_STRING;
-	case(2213):
-		return DELETION_FINISHED_STRING;
-	case(2214):
-		return DELETION_FAILED_STRING;
-	case(2215):
-		return AUTO_CATALOGS_SENDING_FAILED_STRING;
-	case(2600):
-		return GET_DATA_FAILED_STRING;
-	case(2601):
-		return STORE_DATA_FAILED_STRING;
-	case(2800):
-		return DEVICE_BUILDING_COMMAND_FAILED_STRING;
-	case(2801):
-		return DEVICE_SENDING_COMMAND_FAILED_STRING;
-	case(2802):
-		return DEVICE_REQUESTING_REPLY_FAILED_STRING;
-	case(2803):
-		return DEVICE_READING_REPLY_FAILED_STRING;
-	case(2804):
-		return DEVICE_INTERPRETING_REPLY_FAILED_STRING;
-	case(2805):
-		return DEVICE_MISSED_REPLY_STRING;
-	case(2806):
-		return DEVICE_UNKNOWN_REPLY_STRING;
-	case(2807):
-		return DEVICE_UNREQUESTED_REPLY_STRING;
-	case(2808):
-		return INVALID_DEVICE_COMMAND_STRING;
-	case(2809):
-		return MONITORING_LIMIT_EXCEEDED_STRING;
-	case(2810):
-		return MONITORING_AMBIGUOUS_STRING;
-	case(4201):
-		return FUSE_CURRENT_HIGH_STRING;
-	case(4202):
-		return FUSE_WENT_OFF_STRING;
-	case(4204):
-		return POWER_ABOVE_HIGH_LIMIT_STRING;
-	case(4205):
-		return POWER_BELOW_LOW_LIMIT_STRING;
-	case(4300):
-		return SWITCH_WENT_OFF_STRING;
-	case(5000):
-		return HEATER_ON_STRING;
-	case(5001):
-		return HEATER_OFF_STRING;
-	case(5002):
-		return HEATER_TIMEOUT_STRING;
-	case(5003):
-		return HEATER_STAYED_ON_STRING;
-	case(5004):
-		return HEATER_STAYED_OFF_STRING;
-	case(5200):
-		return TEMP_SENSOR_HIGH_STRING;
-	case(5201):
-		return TEMP_SENSOR_LOW_STRING;
-	case(5202):
-		return TEMP_SENSOR_GRADIENT_STRING;
-	case(5901):
-		return COMPONENT_TEMP_LOW_STRING;
-	case(5902):
-		return COMPONENT_TEMP_HIGH_STRING;
-	case(5903):
-		return COMPONENT_TEMP_OOL_LOW_STRING;
-	case(5904):
-		return COMPONENT_TEMP_OOL_HIGH_STRING;
-	case(5905):
-		return TEMP_NOT_IN_OP_RANGE_STRING;
-	case(7101):
-		return FDIR_CHANGED_STATE_STRING;
-	case(7102):
-		return FDIR_STARTS_RECOVERY_STRING;
-	case(7103):
-		return FDIR_TURNS_OFF_DEVICE_STRING;
-	case(7201):
-		return MONITOR_CHANGED_STATE_STRING;
-	case(7202):
-		return VALUE_BELOW_LOW_LIMIT_STRING;
-	case(7203):
-		return VALUE_ABOVE_HIGH_LIMIT_STRING;
-	case(7204):
-		return VALUE_OUT_OF_RANGE_STRING;
-	case(7301):
-		return SWITCHING_TM_FAILED_STRING;
-	case(7400):
-		return CHANGING_MODE_STRING;
-	case(7401):
-		return MODE_INFO_STRING;
-	case(7402):
-		return FALLBACK_FAILED_STRING;
-	case(7403):
-		return MODE_TRANSITION_FAILED_STRING;
-	case(7404):
-		return CANT_KEEP_MODE_STRING;
-	case(7405):
-		return OBJECT_IN_INVALID_MODE_STRING;
-	case(7406):
-		return FORCING_MODE_STRING;
-	case(7407):
-		return MODE_CMD_REJECTED_STRING;
-	case(7506):
-		return HEALTH_INFO_STRING;
-	case(7507):
-		return CHILD_CHANGED_HEALTH_STRING;
-	case(7508):
-		return CHILD_PROBLEMS_STRING;
-	case(7509):
-		return OVERWRITING_HEALTH_STRING;
-	case(7510):
-		return TRYING_RECOVERY_STRING;
-	case(7511):
-		return RECOVERY_STEP_STRING;
-	case(7512):
-		return RECOVERY_DONE_STRING;
-	case(7900):
-		return RF_AVAILABLE_STRING;
-	case(7901):
-		return RF_LOST_STRING;
-	case(7902):
-		return BIT_LOCK_STRING;
-	case(7903):
-		return BIT_LOCK_LOST_STRING;
-	case(7905):
-		return FRAME_PROCESSING_FAILED_STRING;
-	case(8900):
-		return CLOCK_SET_STRING;
-	case(8901):
-		return CLOCK_SET_FAILURE_STRING;
-	case(9700):
-		return TEST_STRING;
-	default:
-		return "UNKNOWN_EVENT";
+const char * translateEvents(Event event){
+	switch((event&0xFFFF)){
+		case 2200:
+			return STORE_SEND_WRITE_FAILED_STRING;
+		case 2201:
+			return STORE_WRITE_FAILED_STRING;
+		case 2202:
+			return STORE_SEND_READ_FAILED_STRING;
+		case 2203:
+			return STORE_READ_FAILED_STRING;
+		case 2204:
+			return UNEXPECTED_MSG_STRING;
+		case 2205:
+			return STORING_FAILED_STRING;
+		case 2206:
+			return TM_DUMP_FAILED_STRING;
+		case 2207:
+			return STORE_INIT_FAILED_STRING;
+		case 2208:
+			return STORE_INIT_EMPTY_STRING;
+		case 2209:
+			return STORE_CONTENT_CORRUPTED_STRING;
+		case 2210:
+			return STORE_INITIALIZE_STRING;
+		case 2211:
+			return INIT_DONE_STRING;
+		case 2212:
+			return DUMP_FINISHED_STRING;
+		case 2213:
+			return DELETION_FINISHED_STRING;
+		case 2214:
+			return DELETION_FAILED_STRING;
+		case 2215:
+			return AUTO_CATALOGS_SENDING_FAILED_STRING;
+		case 2600:
+			return GET_DATA_FAILED_STRING;
+		case 2601:
+			return STORE_DATA_FAILED_STRING;
+		case 2800:
+			return DEVICE_BUILDING_COMMAND_FAILED_STRING;
+		case 2801:
+			return DEVICE_SENDING_COMMAND_FAILED_STRING;
+		case 2802:
+			return DEVICE_REQUESTING_REPLY_FAILED_STRING;
+		case 2803:
+			return DEVICE_READING_REPLY_FAILED_STRING;
+		case 2804:
+			return DEVICE_INTERPRETING_REPLY_FAILED_STRING;
+		case 2805:
+			return DEVICE_MISSED_REPLY_STRING;
+		case 2806:
+			return DEVICE_UNKNOWN_REPLY_STRING;
+		case 2807:
+			return DEVICE_UNREQUESTED_REPLY_STRING;
+		case 2808:
+			return INVALID_DEVICE_COMMAND_STRING;
+		case 2809:
+			return MONITORING_LIMIT_EXCEEDED_STRING;
+		case 2810:
+			return MONITORING_AMBIGUOUS_STRING;
+		case 4201:
+			return FUSE_CURRENT_HIGH_STRING;
+		case 4202:
+			return FUSE_WENT_OFF_STRING;
+		case 4204:
+			return POWER_ABOVE_HIGH_LIMIT_STRING;
+		case 4205:
+			return POWER_BELOW_LOW_LIMIT_STRING;
+		case 4300:
+			return SWITCH_WENT_OFF_STRING;
+		case 5000:
+			return HEATER_ON_STRING;
+		case 5001:
+			return HEATER_OFF_STRING;
+		case 5002:
+			return HEATER_TIMEOUT_STRING;
+		case 5003:
+			return HEATER_STAYED_ON_STRING;
+		case 5004:
+			return HEATER_STAYED_OFF_STRING;
+		case 5200:
+			return TEMP_SENSOR_HIGH_STRING;
+		case 5201:
+			return TEMP_SENSOR_LOW_STRING;
+		case 5202:
+			return TEMP_SENSOR_GRADIENT_STRING;
+		case 5901:
+			return COMPONENT_TEMP_LOW_STRING;
+		case 5902:
+			return COMPONENT_TEMP_HIGH_STRING;
+		case 5903:
+			return COMPONENT_TEMP_OOL_LOW_STRING;
+		case 5904:
+			return COMPONENT_TEMP_OOL_HIGH_STRING;
+		case 5905:
+			return TEMP_NOT_IN_OP_RANGE_STRING;
+		case 7101:
+			return FDIR_CHANGED_STATE_STRING;
+		case 7102:
+			return FDIR_STARTS_RECOVERY_STRING;
+		case 7103:
+			return FDIR_TURNS_OFF_DEVICE_STRING;
+		case 7201:
+			return MONITOR_CHANGED_STATE_STRING;
+		case 7202:
+			return VALUE_BELOW_LOW_LIMIT_STRING;
+		case 7203:
+			return VALUE_ABOVE_HIGH_LIMIT_STRING;
+		case 7204:
+			return VALUE_OUT_OF_RANGE_STRING;
+		case 7301:
+			return SWITCHING_TM_FAILED_STRING;
+		case 7400:
+			return CHANGING_MODE_STRING;
+		case 7401:
+			return MODE_INFO_STRING;
+		case 7402:
+			return FALLBACK_FAILED_STRING;
+		case 7403:
+			return MODE_TRANSITION_FAILED_STRING;
+		case 7404:
+			return CANT_KEEP_MODE_STRING;
+		case 7405:
+			return OBJECT_IN_INVALID_MODE_STRING;
+		case 7406:
+			return FORCING_MODE_STRING;
+		case 7407:
+			return MODE_CMD_REJECTED_STRING;
+		case 7506:
+			return HEALTH_INFO_STRING;
+		case 7507:
+			return CHILD_CHANGED_HEALTH_STRING;
+		case 7508:
+			return CHILD_PROBLEMS_STRING;
+		case 7509:
+			return OVERWRITING_HEALTH_STRING;
+		case 7510:
+			return TRYING_RECOVERY_STRING;
+		case 7511:
+			return RECOVERY_STEP_STRING;
+		case 7512:
+			return RECOVERY_DONE_STRING;
+		case 7900:
+			return RF_AVAILABLE_STRING;
+		case 7901:
+			return RF_LOST_STRING;
+		case 7902:
+			return BIT_LOCK_STRING;
+		case 7903:
+			return BIT_LOCK_LOST_STRING;
+		case 7905:
+			return FRAME_PROCESSING_FAILED_STRING;
+		case 8900:
+			return CLOCK_SET_STRING;
+		case 8901:
+			return CLOCK_SET_FAILURE_STRING;
+		case 9700:
+			return TEST_STRING;
+		default:
+			return "UNKNOWN_EVENT";
 	}
 	return 0;
 }
--- a/generators/events/translateEvents.h
+++ b/generators/events/translateEvents.h
@ -1,8 +0,0 @@
-#ifndef FSFWCONFIG_EVENTS_TRANSLATEEVENTS_H_
-#define FSFWCONFIG_EVENTS_TRANSLATEEVENTS_H_
-
-#include <fsfw/events/Event.h>
-
-const char * translateEvents(Event event);
-
-#endif /* FSFWCONFIG_EVENTS_TRANSLATEEVENTS_H_ */
--- a/generators/mib_exporter.py
+++ b/generators/mib_exporter.py
@ -1,7 +1,7 @@
 #! /usr/bin/python3.8
 # -*- coding: utf-8 -*-
 """
-@file   mod_exporter.py
+@file   mib_exporter.py
@brief  Mission Information Base Exporter for the SOURCE project by KSat.
@details
 Parses OBSW which is based on FSFW developed by the Institute of Space Systems (IRS) Stuttgart.
@ -315,7 +315,7 @@ def handle_external_file_running():
    TODO: Make this stuff OOP too. Retvals and objects were already refactored
    """
    os.chdir("events")
-    os.system("python event_parser.py")
+    os.system("python mib_events.py")
    os.chdir("..")
    print_string = "Exported to file: MIB_Events.csv\r\n"
    return print_string
--- a/generators/modgen
+++ b/generators/modgen
@ -1 +1 @@
-Subproject commit d9beb68bd9d1a1e6015e4979d547a762d199bff7
+Subproject commit b2f7cb79e9ab1f21748d84f3a7de8a0a75458531
--- a/1
+++ b/1
@ -0,0 +1 @@
+Subproject commit 87133ef6b7e36913abfaaddf89af309f5f142650
--- a/test/TestTask.cpp
+++ b/test/TestTask.cpp
@ -3,6 +3,12 @@
 #include <fsfw/objectmanager/ObjectManagerIF.h>
 #include <fsfw/serviceinterface/ServiceInterface.h>

+#define TEST_SPDLOG 1
+
+#if TEST_SPDLOG == 1
+#include "spdlog/spdlog.h"
+#endif
+
 bool TestTask::oneShotAction = true;
 MutexIF* TestTask::testLock = nullptr;

@ -45,6 +51,9 @@ ReturnValue_t TestTask::performOperation(uint8_t operationCode) {

 ReturnValue_t TestTask::performOneShotAction() {
 	/* Everything here will only be performed once. */
+#if TEST_SPDLOG == 1
+    spdlog::info("Welcome to spdlog!");
+#endif
    return HasReturnvaluesIF::RETURN_OK;
 }

--- a/tmtc/.idea/runConfigurations/Event_Service_5.xml
+++ b/tmtc/.idea/runConfigurations/Event_Service_5.xml
@ -13,7 +13,7 @@
    <option name="ADD_SOURCE_ROOTS" value="true" />
    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-s 5 -t 5" />
+    <option name="PARAMETERS" value="-m seqcmd -s 5 -t 5" />
    <option name="SHOW_COMMAND_LINE" value="false" />
    <option name="EMULATE_TERMINAL" value="true" />
    <option name="MODULE_MODE" value="false" />
--- a/tmtc/.idea/runConfigurations/Functional_Service_8.xml
+++ b/tmtc/.idea/runConfigurations/Functional_Service_8.xml
@ -13,7 +13,7 @@
    <option name="ADD_SOURCE_ROOTS" value="true" />
    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-s 8 -t 4" />
+    <option name="PARAMETERS" value="-m seqcmd -s 8 -t 4" />
    <option name="SHOW_COMMAND_LINE" value="false" />
    <option name="EMULATE_TERMINAL" value="true" />
    <option name="MODULE_MODE" value="false" />
--- a/tmtc/.idea/runConfigurations/Mode_Service_200.xml
+++ b/tmtc/.idea/runConfigurations/Mode_Service_200.xml
@ -13,7 +13,7 @@
    <option name="ADD_SOURCE_ROOTS" value="true" />
    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-s 200 -t 4" />
+    <option name="PARAMETERS" value="-m seqcmd -s 200 -t 4" />
    <option name="SHOW_COMMAND_LINE" value="false" />
    <option name="EMULATE_TERMINAL" value="true" />
    <option name="MODULE_MODE" value="false" />
--- a/tmtc/.idea/runConfigurations/Ping_Service_17.xml
+++ b/tmtc/.idea/runConfigurations/Ping_Service_17.xml
@ -13,7 +13,7 @@
    <option name="ADD_SOURCE_ROOTS" value="true" />
    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-s 17 -o 0 -t 3" />
+    <option name="PARAMETERS" value="-m seqcmd -s 17 -t 3" />
    <option name="SHOW_COMMAND_LINE" value="false" />
    <option name="EMULATE_TERMINAL" value="false" />
    <option name="MODULE_MODE" value="false" />
--- a/tmtc/.idea/runConfigurations/Raw_Commanding_Service_2.xml
+++ b/tmtc/.idea/runConfigurations/Raw_Commanding_Service_2.xml
@ -13,7 +13,7 @@
    <option name="ADD_SOURCE_ROOTS" value="true" />
    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-s 2 -t 4" />
+    <option name="PARAMETERS" value="-m seqcmd -s 2 -t 4" />
    <option name="SHOW_COMMAND_LINE" value="false" />
    <option name="EMULATE_TERMINAL" value="false" />
    <option name="MODULE_MODE" value="false" />
--- a/tmtc/.idea/runConfigurations/Service_3_All_Tests.xml
+++ b/tmtc/.idea/runConfigurations/Service_3_All_Tests.xml
@ -13,7 +13,7 @@
    <option name="ADD_SOURCE_ROOTS" value="true" />
    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-s 3 -o 0 --hk -t 3" />
+    <option name="PARAMETERS" value="-m seqcmd -s 3 -o 0 --hk -t 3" />
    <option name="SHOW_COMMAND_LINE" value="false" />
    <option name="EMULATE_TERMINAL" value="true" />
    <option name="MODULE_MODE" value="false" />
--- a/tmtc/.idea/runConfigurations/Service_3_HK_Basic.xml
+++ b/tmtc/.idea/runConfigurations/Service_3_HK_Basic.xml
@ -13,7 +13,7 @@
    <option name="ADD_SOURCE_ROOTS" value="true" />
    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-s 3 -o 2 --hk -t 3" />
+    <option name="PARAMETERS" value="-m seqcmd -s 3 -o 2 --hk -t 3" />
    <option name="SHOW_COMMAND_LINE" value="false" />
    <option name="EMULATE_TERMINAL" value="true" />
    <option name="MODULE_MODE" value="false" />
--- a/tmtc/.idea/runConfigurations/Service_3_Notif_Demo.xml
+++ b/tmtc/.idea/runConfigurations/Service_3_Notif_Demo.xml
@ -13,7 +13,7 @@
    <option name="ADD_SOURCE_ROOTS" value="true" />
    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-s 3 -o 3 --hk -t 3" />
+    <option name="PARAMETERS" value="-m seqcmd -s 3 -o 3 --hk -t 3" />
    <option name="SHOW_COMMAND_LINE" value="false" />
    <option name="EMULATE_TERMINAL" value="true" />
    <option name="MODULE_MODE" value="false" />
--- a/tmtc/.idea/runConfigurations/Service_3_One_HK.xml
+++ b/tmtc/.idea/runConfigurations/Service_3_One_HK.xml
@ -13,7 +13,7 @@
    <option name="ADD_SOURCE_ROOTS" value="true" />
    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-s 3 -o 1 --hk -t 3" />
+    <option name="PARAMETERS" value="-m seqcmd -s 3 -o 1 --hk -t 3" />
    <option name="SHOW_COMMAND_LINE" value="false" />
    <option name="EMULATE_TERMINAL" value="true" />
    <option name="MODULE_MODE" value="false" />
--- a/tmtc/.idea/runConfigurations/Single_Command.xml
+++ b/tmtc/.idea/runConfigurations/Single_Command.xml
@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Single Command" type="PythonConfigurationType" factoryName="Python" folderName="Service Demos">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_core/tmtcc_runner.py" />
+    <option name="PARAMETERS" value="-m 0 -c 2" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>
--- a/tmtc/config/custom_mode_op.py
+++ b/tmtc/config/custom_mode_op.py
@ -6,7 +6,7 @@
 import sys

 from tmtccmd.core.backend import TmTcHandler
-from tmtccmd.utility.logger import get_logger
+from tmtccmd.utility.tmtcc_logger import get_logger

 LOGGER = get_logger()

@ -15,5 +15,7 @@ def perform_mode_operation_user(tmtc_backend: TmTcHandler, mode: int):
    """
    Custom modes can be implemented here
    """
+    if tmtc_backend:
+        pass
    LOGGER.error(f"Unknown mode {mode}, Configuration error !")
    sys.exit()
--- a/tmtc/config/hook_base.py
+++ b/tmtc/config/hook_base.py
@ -1,8 +1,8 @@
 import argparse
 from typing import Dict, Union, Tuple

-from tmtccmd.config.definitions import ServiceOpCodeDictT
-from tmtccmd.config.hook import TmTcHookBase
+from tmtccmd.core.hook_base import TmTcHookBase
+from tmtccmd.ecss.tc import PusTelecommand
 from tmtccmd.pus_tm.service_3_base import Service3Base


@ -17,26 +17,19 @@ class FsfwHookBase(TmTcHookBase):
        from config.version import SW_NAME, SW_VERSION, SW_SUBVERSION, SW_SUBSUBVERSION
        return f"{SW_NAME} {SW_VERSION}.{SW_SUBVERSION}.{SW_SUBSUBVERSION}"

-    def get_json_config_file_path(self) -> str:
-        return "config/tmtc_config.json"
-
-    def get_service_op_code_dictionary(self) -> ServiceOpCodeDictT:
-        from tmtccmd.config.globals import get_default_service_op_code_dict
-        return get_default_service_op_code_dict()
-
    def add_globals_pre_args_parsing(self, gui: bool = False):
-        from tmtccmd.config.globals import set_default_globals_pre_args_parsing
+        from tmtccmd.defaults.globals_setup import set_default_globals_pre_args_parsing
        set_default_globals_pre_args_parsing(gui=gui, apid=0xef)

    def add_globals_post_args_parsing(self, args: argparse.Namespace):
-        from tmtccmd.config.globals import set_default_globals_post_args_parsing
-        set_default_globals_post_args_parsing(args=args, json_cfg_path=self.get_json_config_file_path())
+        from tmtccmd.defaults.globals_setup import set_default_globals_post_args_parsing
+        set_default_globals_post_args_parsing(args=args, json_cfg_path=self.set_json_config_file_path())

-    def assign_communication_interface(self, com_if_key: str, tmtc_printer: TmTcPrinter) -> \
+    def assign_communication_interface(self, com_if: int, tmtc_printer: TmTcPrinter) -> \
            Union[CommunicationInterface, None]:
-        from tmtccmd.config.com_if import create_communication_interface_default
+        from tmtccmd.defaults.com_setup import create_communication_interface_default
        return create_communication_interface_default(
-            com_if_key=com_if_key, tmtc_printer=tmtc_printer, json_cfg_path=self.get_json_config_file_path()
+            com_if=com_if, tmtc_printer=tmtc_printer, json_cfg_path=self.set_json_config_file_path()
        )

    def perform_mode_operation(self, tmtc_backend: TmTcHandler, mode: int):
@ -46,13 +39,17 @@ class FsfwHookBase(TmTcHookBase):
        from pus_tc.tc_packing import pack_service_queue_user
        pack_service_queue_user(service=service, op_code=op_code, service_queue=service_queue)

+    def pack_total_service_queue(self) -> Union[None, TcQueueT]:
+        from pus_tc.tc_packing import create_total_tc_queue_user
+        return create_total_tc_queue_user()
+
    def tm_user_factory_hook(self, raw_tm_packet: bytearray) -> Union[None, PusTelemetry]:
        from pus_tm.factory_hook import tm_user_factory_hook
        return tm_user_factory_hook(raw_tm_packet=raw_tm_packet)

-    def get_object_ids(self) -> Dict[bytes, list]:
-        from config.object_ids import get_object_ids
-        return get_object_ids()
+    def set_object_ids(self) -> Dict[bytes, list]:
+        from config.object_ids import set_object_ids
+        return set_object_ids()

    @staticmethod
    def handle_service_8_telemetry(
@ -65,9 +62,18 @@ class FsfwHookBase(TmTcHookBase):

    @staticmethod
    def handle_service_3_housekeeping(
-        object_id: bytes, set_id: int, hk_data: bytearray, service3_packet: Service3Base
+        object_id: bytearray, set_id: int, hk_data: bytearray, service3_packet: Service3Base
    ) -> Tuple[list, list, bytearray, int]:
        from pus_tm.service_3_hk_handling import service_3_hk_handling
        return service_3_hk_handling(
            object_id=object_id, set_id=set_id, hk_data=hk_data, service3_packet=service3_packet
        )
+
+    def command_preparation_hook(self) -> Union[None, PusTelecommand]:
+        pass
+
+    def set_json_config_file_path(self) -> str:
+        return "config/tmtc_config.json"
+
+
+
--- a/tmtc/config/object_ids.py
+++ b/tmtc/config/object_ids.py
@ -3,17 +3,18 @@
@details    Template configuration file. Copy this folder to the TMTC commander root and adapt
            it to your needs.
 """
+
 from typing import Dict

-PUS_SERVICE_17_ID = bytes([0x53, 0x00, 0x00, 0x17])
-TEST_DEVICE_0_ID = bytes([0x44, 0x01, 0xAF, 0xFE])
-TEST_DEVICE_1_ID = bytes([0x44, 0x02, 0xAF, 0xFE])
+SERVICE_17_OBJ_ID = bytes([0x53, 0x00, 0x00, 0x17])
+TEST_DEVICE_0_OBJ_ID = bytes([0x44, 0x01, 0xAF, 0xFE])
+TEST_DEVICE_1_OBJ_ID = bytes([0x44, 0x02, 0xAF, 0xFE])


-def get_object_ids() -> Dict[bytes, list]:
+def set_object_ids() -> Dict[bytes, list]:
    object_id_dict = {
-            PUS_SERVICE_17_ID: ["PUS Service 17"],
-            TEST_DEVICE_0_ID: ["Test Device 0"],
-            TEST_DEVICE_1_ID: ["Test Device 1"]
+            SERVICE_17_OBJ_ID: ["Service 17"],
+            TEST_DEVICE_0_OBJ_ID: ["Test Device 0"],
+            TEST_DEVICE_1_OBJ_ID: ["Test Device 1"],
    }
    return object_id_dict
--- a/tmtc/config/version.py
+++ b/tmtc/config/version.py
@ -1,4 +1,4 @@
 SW_NAME = "fsfw-tmtc"
 SW_VERSION = 1
-SW_SUBVERSION = 2
+SW_SUBVERSION = 1
 SW_SUBSUBVERSION = 0
--- a/tmtc/pus_tc/service_200_mode.py
+++ b/tmtc/pus_tc/service_200_mode.py
@ -5,13 +5,12 @@
@author R. Mueller
@date   02.05.2020
 """
-from tmtccmd.config.definitions import QueueCommands
+from config.object_ids import TEST_DEVICE_0_OBJ_ID, TEST_DEVICE_1_OBJ_ID
+from tmtccmd.core.definitions import QueueCommands
 from tmtccmd.ecss.tc import PusTelecommand
 from tmtccmd.pus_tc.packer import TcQueueT
 from tmtccmd.pus_tc.service_200_mode import pack_mode_data

-from config.object_ids import TEST_DEVICE_0_ID
-

 def pack_service_200_commands_into(tc_queue: TcQueueT, op_code: str):
    if op_code == "0":
@ -22,7 +21,7 @@ def pack_service_200_test_into(init_ssc: int, tc_queue: TcQueueT) -> int:
    new_ssc = init_ssc
    tc_queue.appendleft((QueueCommands.PRINT, "Testing Service 200"))
    # Object ID: DUMMY Device
-    object_id = TEST_DEVICE_0_ID
+    object_id = TEST_DEVICE_0_OBJ_ID
    # Set On Mode
    tc_queue.appendleft((QueueCommands.PRINT, "Testing Service 200: Set Mode On"))
    mode_data = pack_mode_data(object_id, 1, 0)
--- a/tmtc/pus_tc/service_20_parameters.py
+++ b/tmtc/pus_tc/service_20_parameters.py
@ -1,16 +1,18 @@
 import struct

-from tmtccmd.config.definitions import QueueCommands
+from tmtccmd.core.definitions import QueueCommands
 from tmtccmd.ecss.tc import PusTelecommand
 from tmtccmd.pus_tc.definitions import TcQueueT
 from tmtccmd.pus_tc.service_20_parameter import pack_type_and_matrix_data, \
    pack_parameter_id
 from tmtccmd.pus_tc.service_200_mode import pack_mode_data
-from tmtccmd.utility.logger import get_logger
+from tmtccmd.utility.tmtcc_logger import get_logger

-from config.object_ids import TEST_DEVICE_0_ID
+
+from config.object_ids import TEST_DEVICE_0_OBJ_ID

 LOGGER = get_logger()
+TEST_DEVICE_0_ID = bytearray()


 def pack_service20_commands_into(tc_queue: TcQueueT, op_code: str):
@ -21,7 +23,7 @@ def pack_service20_commands_into(tc_queue: TcQueueT, op_code: str):
 def pack_service20_test_into(tc_queue: TcQueueT, called_externally: bool = False):
    if called_externally is False:
        tc_queue.appendleft((QueueCommands.PRINT, "Testing Service 20"))
-    object_id = TEST_DEVICE_0_ID
+    object_id = TEST_DEVICE_0_OBJ_ID

    # set mode normal
    tc_queue.appendleft((QueueCommands.PRINT, "Testing Service 20: Set Normal Mode"))
@ -38,7 +40,7 @@ def pack_service20_test_into(tc_queue: TcQueueT, called_externally: bool = False


 def load_param_0_simple_test_commands(tc_queue: TcQueueT):
-    object_id = TEST_DEVICE_0_ID
+    object_id = TEST_DEVICE_0_OBJ_ID
    parameter_id_0 = pack_parameter_id(domain_id=0, unique_id=0, linear_index=0)
    # test checking Load for uint32_t
    tc_queue.appendleft((QueueCommands.PRINT, "Testing Service 20: Load uint32_t"))
--- a/tmtc/pus_tc/service_2_raw_cmd.py
+++ b/tmtc/pus_tc/service_2_raw_cmd.py
@ -7,13 +7,13 @@
 """
 import struct

-from tmtccmd.config.definitions import QueueCommands
+from tmtccmd.core.definitions import QueueCommands
 from tmtccmd.ecss.tc import PusTelecommand
 from tmtccmd.pus_tc.definitions import TcQueueT
 from pus_tc.service_200_mode import pack_mode_data

 import pus_tc.command_data as cmd_data
-from config.object_ids import TEST_DEVICE_0_ID
+from config.object_ids import TEST_DEVICE_0_OBJ_ID, TEST_DEVICE_1_OBJ_ID


 def pack_service_2_commands_into(tc_queue: TcQueueT, op_code: str):
@ -25,7 +25,7 @@ def pack_service_2_commands_into(tc_queue: TcQueueT, op_code: str):

 def pack_generic_service_2_test_into(init_ssc: int, tc_queue: TcQueueT) -> int:
    new_ssc = init_ssc
-    object_id = TEST_DEVICE_0_ID  # dummy device
+    object_id = TEST_DEVICE_0_OBJ_ID  # dummy device
    # Set Raw Mode
    tc_queue.appendleft((QueueCommands.PRINT, "Testing Service 2: Setting Raw Mode"))
    mode_data = pack_mode_data(object_id, 3, 0)
--- a/tmtc/pus_tc/service_3_housekeeping.py
+++ b/tmtc/pus_tc/service_3_housekeeping.py
@ -1,4 +1,4 @@
-from tmtccmd.config.definitions import QueueCommands
+from tmtccmd.core.definitions import QueueCommands
 from tmtccmd.pus_tc.service_200_mode import pack_mode_data
 from tmtccmd.pus_tc.service_20_parameter import pack_boolean_parameter_command
 from tmtccmd.pus_tc.service_3_housekeeping import make_sid, generate_one_hk_command, \
@ -7,8 +7,8 @@ from tmtccmd.ecss.tc import PusTelecommand
 from tmtccmd.pus_tc.definitions import TcQueueT
 from tmtccmd.pus_tc.service_8_functional_cmd import generate_action_command

-from config.object_ids import TEST_DEVICE_0_ID, TEST_DEVICE_1_ID

+from config.object_ids import TEST_DEVICE_1_OBJ_ID, TEST_DEVICE_0_OBJ_ID

 # Set IDs
 TEST_SET_ID = 0
@ -25,9 +25,9 @@ def pack_service_3_commands_into(tc_queue: TcQueueT, op_code: str):
    # TODO: Import this from config instead
    device_idx = 0
    if device_idx == 0:
-        object_id = TEST_DEVICE_0_ID
+        object_id = TEST_DEVICE_0_OBJ_ID
    else:
-        object_id = TEST_DEVICE_1_ID
+        object_id = TEST_DEVICE_1_OBJ_ID

    if op_code == "0":
        # This will pack all the tests
--- a/tmtc/pus_tc/service_8_func_cmd.py
+++ b/tmtc/pus_tc/service_8_func_cmd.py
@ -1,11 +1,10 @@
-from tmtccmd.config.definitions import QueueCommands
+from tmtccmd.core.definitions import QueueCommands
 from tmtccmd.ecss.tc import PusTelecommand
 from tmtccmd.pus_tc.definitions import TcQueueT

 import pus_tc.command_data as cmd_data
 from pus_tc.service_200_mode import pack_mode_data
-
-from config.object_ids import TEST_DEVICE_0_ID
+from config.object_ids import TEST_DEVICE_1_OBJ_ID, TEST_DEVICE_0_OBJ_ID


 def pack_service_8_commands_into(tc_queue: TcQueueT, op_code: str):
@ -17,7 +16,7 @@ def pack_service_8_commands_into(tc_queue: TcQueueT, op_code: str):

 def pack_generic_service_8_test_into(tc_queue: TcQueueT):
    tc_queue.appendleft((QueueCommands.PRINT, "Testing Service 8"))
-    object_id = TEST_DEVICE_0_ID
+    object_id = TEST_DEVICE_0_OBJ_ID

    # set mode on
    tc_queue.appendleft((QueueCommands.PRINT, "Testing Service 8: Set On Mode"))
--- a/tmtc/pus_tc/tc_packing.py
+++ b/tmtc/pus_tc/tc_packing.py
@ -6,15 +6,14 @@

 import os
 from collections import deque
-from typing import Union

 from pus_tc.service_20_parameters import pack_service20_commands_into
 from pus_tc.service_2_raw_cmd import pack_service_2_commands_into
 from pus_tc.service_3_housekeeping import pack_service_3_commands_into
 from pus_tc.service_8_func_cmd import pack_service_8_commands_into
-from tmtccmd.utility.logger import get_logger
+from tmtccmd.utility.tmtcc_logger import get_logger
 from tmtccmd.pus_tc.definitions import TcQueueT
-from tmtccmd.config.definitions import CoreServiceList
+from tmtccmd.core.definitions import CoreServiceList
 from tmtccmd.pus_tc.service_5_event import pack_generic_service5_test_into
 from tmtccmd.pus_tc.service_17_test import pack_generic_service17_test
 from pus_tc.service_200_mode import pack_service_200_commands_into
@ -22,20 +21,20 @@ from pus_tc.service_200_mode import pack_service_200_commands_into
 LOGGER = get_logger()


-def pack_service_queue_user(service: Union[str, int], op_code: str, service_queue: TcQueueT):
-    if service == CoreServiceList.SERVICE_2.value:
+def pack_service_queue_user(service: int, op_code: str, service_queue: TcQueueT):
+    if service == CoreServiceList.SERVICE_2:
        return pack_service_2_commands_into(op_code=op_code, tc_queue=service_queue)
-    if service == CoreServiceList.SERVICE_3.value:
+    if service == CoreServiceList.SERVICE_3:
        return pack_service_3_commands_into(op_code=op_code, tc_queue=service_queue)
-    if service == CoreServiceList.SERVICE_5.value:
+    if service == CoreServiceList.SERVICE_5:
        return pack_generic_service5_test_into(tc_queue=service_queue)
-    if service == CoreServiceList.SERVICE_8.value:
+    if service == CoreServiceList.SERVICE_8:
        return pack_service_8_commands_into(op_code=op_code, tc_queue=service_queue)
-    if service == CoreServiceList.SERVICE_17.value:
+    if service == CoreServiceList.SERVICE_17:
        return pack_generic_service17_test(init_ssc=1700, tc_queue=service_queue)
-    if service == CoreServiceList.SERVICE_20.value:
+    if service == CoreServiceList.SERVICE_20:
        return pack_service20_commands_into(tc_queue=service_queue, op_code=op_code)
-    if service == CoreServiceList.SERVICE_200.value:
+    if service == CoreServiceList.SERVICE_200:
        return pack_service_200_commands_into(tc_queue=service_queue, op_code=op_code)
    LOGGER.warning("Invalid Service !")

--- a/tmtc/pus_tm/factory_hook.py
+++ b/tmtc/pus_tm/factory_hook.py
@ -5,7 +5,7 @@
 """

 from tmtccmd.ecss.tm import PusTelemetry
-from tmtccmd.utility.logger import get_logger
+from tmtccmd.utility.tmtcc_logger import get_logger
 from tmtccmd.pus_tm.service_1_verification import Service1TM
 from tmtccmd.pus_tm.service_2_raw_cmd import Service2TM
 from tmtccmd.pus_tm.service_3_housekeeping import Service3TM
--- a/tmtc/pus_tm/service_3_hk_handling.py
+++ b/tmtc/pus_tm/service_3_hk_handling.py
@ -7,35 +7,33 @@
 import struct
 from typing import Tuple
 from tmtccmd.pus_tm.service_3_housekeeping import Service3Base
-from tmtccmd.utility.logger import get_logger
+from tmtccmd.utility.tmtcc_logger import get_logger

-from config.object_ids import TEST_DEVICE_0_ID, TEST_DEVICE_1_ID
+from config.object_ids import TEST_DEVICE_0_OBJ_ID, TEST_DEVICE_1_OBJ_ID
 LOGGER = get_logger()


 def service_3_hk_handling(
-        object_id: bytes, set_id: int, hk_data: bytearray, service3_packet: Service3Base
+        object_id: bytearray, set_id: int, hk_data: bytearray, service3_packet: Service3Base
 ) -> Tuple[list, list, bytearray, int]:
    """
    This function is called when a Service 3 Housekeeping packet is received.

-    Please note that the object IDs should be compared by value because direct comparison of
-    enumerations does not work in Python. For example use:
-
-        if object_id.value == ObjectIds.TEST_OBJECT.value
-
-    to test equality based on the object ID list.
-
-    @param object_id:
-    @param set_id:
-    @param hk_data:
-    @param service3_packet:
-    @return: Expects a tuple, consisting of two lists, a bytearray and an integer
+    :param object_id:
+    :param set_id:
+    :param hk_data:
+    :param service3_packet:
+    :return: Expects a tuple, consisting of two lists, a bytearray and an integer
    The first list contains the header columns, the second list the list with
    the corresponding values. The bytearray is the validity buffer, which is usually appended
    at the end of the housekeeping packet. The last value is the number of parameters.
    """
-    if object_id == TEST_DEVICE_0_ID or object_id == TEST_DEVICE_1_ID:
+    if set_id:
+        pass
+    if service3_packet:
+        pass
+    if object_id == TEST_DEVICE_0_OBJ_ID or \
+            object_id == TEST_DEVICE_1_OBJ_ID:
        return handle_test_set_deserialization(hk_data=hk_data)
    else:
        LOGGER.info("Service3TM: Parsing for this SID has not been implemented.")
--- a/tmtc/pus_tm/service_8_handling.py
+++ b/tmtc/pus_tm/service_8_handling.py
@ -14,6 +14,14 @@ def custom_service_8_handling(
    @param custom_data:
    @return:
    """
+    if object_id:
+        pass
+
+    if action_id:
+        pass
+
+    if custom_data:
+        pass
    header_list = []
    content_list = []
    return header_list, content_list
--- a/tmtc/tmtc_client_cli.py
+++ b/tmtc/tmtc_client_cli.py
@ -39,7 +39,7 @@ except ImportError:
 def main():
    hook_obj = FsfwHookBase()
    initialize_tmtc_commander(hook_object=hook_obj)
-    run_tmtc_commander(use_gui=False, app_name="TMTC Commander FSFW")
+    run_tmtc_commander(False)


 if __name__ == "__main__":
--- a/tmtc/tmtc_client_gui.py
+++ b/tmtc/tmtc_client_gui.py
@ -33,7 +33,7 @@ from tmtccmd.runner import run_tmtc_commander, initialize_tmtc_commander
 def main():
    hook_obj = FsfwHookBase()
    initialize_tmtc_commander(hook_object=hook_obj)
-    run_tmtc_commander(use_gui=True, app_name="TMTC Commander FSFW")
+    run_tmtc_commander(True)


 if __name__ == "__main__":
--- a/tmtc/tmtccmd
+++ b/tmtc/tmtccmd
@ -1 +1 @@
-Subproject commit 2fe13b2d7183dce67b6b7ec4b89dd7771ee46a2f
+Subproject commit 75dd5d0266b70fcdf6971ac7b692a3b78b43a772
				`@ -0,0 +1 @@`
				`Subproject commit 87133ef6b7e36913abfaaddf89af309f5f142650`