From 590db280ba0389a6a1f4ade7190bc58d156d494e Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Tue, 4 May 2021 15:22:21 +0200
Subject: [PATCH 01/21] merge origin master

---
 generators/modgen | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generators/modgen b/generators/modgen
index 403bdd1..b2f7cb7 160000
--- a/generators/modgen
+++ b/generators/modgen
@@ -1 +1 @@
-Subproject commit 403bdd15b6175685ca2d45fed648812445483a40
+Subproject commit b2f7cb79e9ab1f21748d84f3a7de8a0a75458531
-- 
2.34.1


From c68e3c6e6d58c80212614e3f1ff3b7aab5360b00 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Tue, 4 May 2021 18:32:36 +0200
Subject: [PATCH 02/21] updated tmtccmd

---
 tmtc/pus_tc/service_3_housekeeping.py | 1 -
 tmtc/tmtccmd                          | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/tmtc/pus_tc/service_3_housekeeping.py b/tmtc/pus_tc/service_3_housekeeping.py
index 3fa532b..36b9bb1 100644
--- a/tmtc/pus_tc/service_3_housekeeping.py
+++ b/tmtc/pus_tc/service_3_housekeeping.py
@@ -1,5 +1,4 @@
 from tmtccmd.core.definitions import QueueCommands
-from tmtccmd.core.object_id_manager import get_object_id
 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, \
diff --git a/tmtc/tmtccmd b/tmtc/tmtccmd
index 0d2450d..474ccbc 160000
--- a/tmtc/tmtccmd
+++ b/tmtc/tmtccmd
@@ -1 +1 @@
-Subproject commit 0d2450dfd2f34fdd5eb0b0ff55d1fbc0684f852d
+Subproject commit 474ccbcaad7cedeb252c560c979dd7bf0d3f5ef3
-- 
2.34.1


From f889812b391d12ed9f8ff07e4ed0748c5756c306 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Tue, 4 May 2021 18:37:05 +0200
Subject: [PATCH 03/21] updated .cproject file

---
 misc/eclipse/.cproject | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/misc/eclipse/.cproject b/misc/eclipse/.cproject
index 7b20cce..a98963e 100644
--- a/misc/eclipse/.cproject
+++ b/misc/eclipse/.cproject
@@ -18,7 +18,7 @@
 					<folderInfo id="cdt.managedbuild.toolchain.gnu.base.450259316.1933681494." name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.base.278840997" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.base">
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.GNU_ELF" id="cdt.managedbuild.target.gnu.platform.base.1841242502" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/>
-							<builder arguments="--build ." buildPath="${workspace_loc:/fsfw_example/build-Debug-Linux}" command="cmake" id="cdt.managedbuild.target.gnu.builder.base.1872525696" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cdt.managedbuild.target.gnu.builder.base"/>
+							<builder arguments="--build ." buildPath="${workspace_loc:/fsfw_example_public/build-Debug-Linux}" command="cmake" id="cdt.managedbuild.target.gnu.builder.base.1872525696" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cdt.managedbuild.target.gnu.builder.base"/>
 							<tool id="cdt.managedbuild.tool.gnu.archiver.base.1985468037" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
 							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.1424606859" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.include.paths.642413900" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
@@ -70,7 +70,7 @@
 					<folderInfo id="cdt.managedbuild.toolchain.gnu.base.450259316.1933681494.1347848179." name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.base.159290000" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.base">
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.GNU_ELF;org.eclipse.cdt.core.PE64;org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.gnu.platform.base.1930506317" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/>
-							<builder arguments="--build ." buildPath="${workspace_loc:/fsfw_example/build-Release-Linux}" command="cmake" id="cdt.managedbuild.target.gnu.builder.base.1965960475" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cdt.managedbuild.target.gnu.builder.base"/>
+							<builder arguments="--build ." buildPath="${workspace_loc:/fsfw_example_public/build-Release-Linux}" command="cmake" id="cdt.managedbuild.target.gnu.builder.base.1965960475" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cdt.managedbuild.target.gnu.builder.base"/>
 							<tool id="cdt.managedbuild.tool.gnu.archiver.base.1609672491" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
 							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.1491459311" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.include.paths.1743900662" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
@@ -122,7 +122,7 @@
 					<folderInfo id="cdt.managedbuild.toolchain.gnu.base.450259316.1933681494.615695818." name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.mingw.base.623801143" name="MinGW GCC" superClass="cdt.managedbuild.toolchain.gnu.mingw.base">
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.GNU_ELF;org.eclipse.cdt.core.PE64;org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.gnu.platform.mingw.base.1711871351" name="Debug Platform" osList="win32" superClass="cdt.managedbuild.target.gnu.platform.mingw.base"/>
-							<builder arguments="--build ." autoBuildTarget="all" buildPath="${workspace_loc:/fsfw_example/build-Debug-Host}" cleanBuildTarget="clean" command="cmake" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="cdt.managedbuild.builder.gnu.cross.1761965921" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cdt.managedbuild.builder.gnu.cross"/>
+							<builder arguments="--build ." autoBuildTarget="all" buildPath="${workspace_loc:/fsfw_example_public/build-Debug-Host}" cleanBuildTarget="clean" command="cmake" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="cdt.managedbuild.builder.gnu.cross.1761965921" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cdt.managedbuild.builder.gnu.cross"/>
 							<tool id="cdt.managedbuild.tool.gnu.assembler.mingw.base.13166088" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.base">
 								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1629700138" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 							</tool>
@@ -174,7 +174,7 @@
 					<folderInfo id="cdt.managedbuild.toolchain.gnu.base.450259316.1933681494.615695818.954051921." name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.mingw.base.1448115319" name="MinGW GCC" superClass="cdt.managedbuild.toolchain.gnu.mingw.base">
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.GNU_ELF;org.eclipse.cdt.core.PE64;org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.gnu.platform.mingw.base.169860740" name="Debug Platform" osList="win32" superClass="cdt.managedbuild.target.gnu.platform.mingw.base"/>
-							<builder arguments="--build ." autoBuildTarget="all" buildPath="${workspace_loc:/fsfw_example/Release-Host}" cleanBuildTarget="clean" command="cmake" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="cdt.managedbuild.builder.gnu.cross.1108079754" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cdt.managedbuild.builder.gnu.cross"/>
+							<builder arguments="--build ." autoBuildTarget="all" buildPath="${workspace_loc:/fsfw_example_public/build-Release-Host}" cleanBuildTarget="clean" command="cmake" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="cdt.managedbuild.builder.gnu.cross.1108079754" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cdt.managedbuild.builder.gnu.cross"/>
 							<tool id="cdt.managedbuild.tool.gnu.assembler.mingw.base.1193239387" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.base">
 								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1144625128" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 							</tool>
@@ -300,7 +300,7 @@
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.other.1998715444" name="Other debugging flags" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.other"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.showDevicesTab.1164065327" name="showDevicesTab" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.showDevicesTab"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.859936413" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
-							<builder arguments="--build ." autoBuildTarget="all" buildPath="${workspace_loc:/fsfw_example/build-Debug-RPi}" cleanBuildTarget="clean" command="cmake" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="ilg.gnuarmeclipse.managedbuild.cross.builder.510727936" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder"/>
+							<builder arguments="--build ." autoBuildTarget="all" buildPath="${workspace_loc:/fsfw_example_public/build-Debug-RPi}" cleanBuildTarget="clean" command="cmake" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="ilg.gnuarmeclipse.managedbuild.cross.builder.510727936" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder"/>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.1275243710" name="GNU Arm Cross Assembler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.1772374282" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" value="true" valueType="boolean"/>
 								<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.input.1512175823" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.input"/>
@@ -441,7 +441,7 @@
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.other.1941954257" name="Other debugging flags" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.other"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.showDevicesTab.1643607730" name="showDevicesTab" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.showDevicesTab"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.1156260373" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
-							<builder arguments="--build ." autoBuildTarget="all" buildPath="${workspace_loc:/fsfw_example/build-Release-RPi}" cleanBuildTarget="clean" command="cmake" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="ilg.gnuarmeclipse.managedbuild.cross.builder.221137140" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder"/>
+							<builder arguments="--build ." autoBuildTarget="all" buildPath="${workspace_loc:/fsfw_example_public/build-Release-RPi}" cleanBuildTarget="clean" command="cmake" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="ilg.gnuarmeclipse.managedbuild.cross.builder.221137140" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder"/>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.1050996101" name="GNU Arm Cross Assembler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.577446546" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" value="true" valueType="boolean"/>
 								<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.input.1908565237" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.input"/>
@@ -587,7 +587,7 @@
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.other.1229082279" name="Other debugging flags" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.other"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.showDevicesTab.1853005011" name="showDevicesTab" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.showDevicesTab"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.GNU_ELF;org.eclipse.cdt.core.PE64;org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.787378269" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
-							<builder arguments="--build ." autoBuildTarget="all" buildPath="${workspace_loc:/fsfw_example/build-Debug-STM32H743-RTEMS}" cleanBuildTarget="clean" command="cmake" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="ilg.gnuarmeclipse.managedbuild.cross.builder.2086445741" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder"/>
+							<builder arguments="--build ." autoBuildTarget="all" buildPath="${workspace_loc:/fsfw_example_public/build-Debug-STM32H743-RTEMS}" cleanBuildTarget="clean" command="cmake" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="ilg.gnuarmeclipse.managedbuild.cross.builder.2086445741" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder"/>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.69591689" name="GNU Arm Cross Assembler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.823743724" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" value="true" valueType="boolean"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths.1507142905" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths" valueType="includePath">
@@ -747,7 +747,7 @@
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.other.1883044707" name="Other debugging flags" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.other"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.showDevicesTab.1981903948" name="showDevicesTab" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.showDevicesTab"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.GNU_ELF;org.eclipse.cdt.core.PE64;org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.633957164" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
-							<builder arguments="--build ." buildPath="${workspace_loc:/fsfw_example/build-Release-STM32H743-RTEMS}" command="cmake" id="ilg.gnuarmeclipse.managedbuild.cross.builder.744774495" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder"/>
+							<builder arguments="--build ." buildPath="${workspace_loc:/fsfw_example_public/build-Release-STM32H743-RTEMS}" command="cmake" id="ilg.gnuarmeclipse.managedbuild.cross.builder.744774495" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder"/>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.1724462366" name="GNU Arm Cross Assembler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.1298708475" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" value="true" valueType="boolean"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths.488497726" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths" valueType="includePath">
@@ -900,7 +900,7 @@
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.other.211372987" name="Other debugging flags" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.other"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.showDevicesTab.1913468245" name="showDevicesTab" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.showDevicesTab"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.197500878" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
-							<builder arguments="--build ." buildPath="${workspace_loc:/fsfw_example/build-Debug-STM32H743-FreeRTOS}" command="cmake" id="ilg.gnuarmeclipse.managedbuild.cross.builder.1059796223" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder"/>
+							<builder arguments="--build ." buildPath="${workspace_loc:/fsfw_example_public/build-Debug-STM32H743-FreeRTOS}" command="cmake" id="ilg.gnuarmeclipse.managedbuild.cross.builder.1059796223" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder"/>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.43129417" name="GNU Arm Cross Assembler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.82715789" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" value="true" valueType="boolean"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.defs.671384657" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.defs" valueType="definedSymbols">
@@ -1056,7 +1056,7 @@
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.other.1424010361" name="Other debugging flags" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.other"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.showDevicesTab.213201916" name="showDevicesTab" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.showDevicesTab"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.1241442493" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
-							<builder arguments="--build ." buildPath="${workspace_loc:/fsfw_example/build-Release-STM32H743-FreeRTOS}" command="cmake" id="ilg.gnuarmeclipse.managedbuild.cross.builder.1531059207" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder"/>
+							<builder arguments="--build ." buildPath="${workspace_loc:/fsfw_example_public/build-Release-STM32H743-FreeRTOS}" command="cmake" id="ilg.gnuarmeclipse.managedbuild.cross.builder.1531059207" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder"/>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.672489248" name="GNU Arm Cross Assembler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.1922193266" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" value="true" valueType="boolean"/>
 								<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.input.1784187041" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.input"/>
-- 
2.34.1


From fe50ea388ca405c73ef4148d3fa619fe37c20333 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Tue, 4 May 2021 18:37:53 +0200
Subject: [PATCH 04/21] updated launch config

---
 misc/eclipse/cmake/MinGW/fsfw-mingw-debug-cmake.launch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/misc/eclipse/cmake/MinGW/fsfw-mingw-debug-cmake.launch b/misc/eclipse/cmake/MinGW/fsfw-mingw-debug-cmake.launch
index abf8b39..a13c8b7 100644
--- a/misc/eclipse/cmake/MinGW/fsfw-mingw-debug-cmake.launch
+++ b/misc/eclipse/cmake/MinGW/fsfw-mingw-debug-cmake.launch
@@ -19,11 +19,11 @@
     <booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
     <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
     <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build-Debug-Host/fsfw_example.exe"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="fsfw_example"/>
+    <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="fsfw_example_public"/>
     <booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="false"/>
     <stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="cdt.managedbuild.toolchain.gnu.base.450259316.1933681494.615695818"/>
     <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-        <listEntry value="/fsfw_example"/>
+        <listEntry value="/fsfw_example_public"/>
     </listAttribute>
     <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
         <listEntry value="4"/>
-- 
2.34.1


From 5f4b1520d5c77b977279176d426b331a68dc59ae Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Tue, 4 May 2021 18:39:49 +0200
Subject: [PATCH 05/21] updated release config launch file

---
 misc/eclipse/cmake/MinGW/fsfw-mingw-release-cmake.launch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/misc/eclipse/cmake/MinGW/fsfw-mingw-release-cmake.launch b/misc/eclipse/cmake/MinGW/fsfw-mingw-release-cmake.launch
index f290182..aec114c 100644
--- a/misc/eclipse/cmake/MinGW/fsfw-mingw-release-cmake.launch
+++ b/misc/eclipse/cmake/MinGW/fsfw-mingw-release-cmake.launch
@@ -19,11 +19,11 @@
     <booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
     <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
     <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build-Release-Host/fsfw_example.exe"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="fsfw_example"/>
+    <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="fsfw_example_public"/>
     <booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="false"/>
     <stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="cdt.managedbuild.toolchain.gnu.base.450259316.1933681494.615695818.954051921"/>
     <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-        <listEntry value="/fsfw_example"/>
+        <listEntry value="/fsfw_example_public"/>
     </listAttribute>
     <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
         <listEntry value="4"/>
-- 
2.34.1


From 8502b7ad26fa77847b528d074ac9e17dc260d11d Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Wed, 5 May 2021 19:43:03 +0200
Subject: [PATCH 06/21] submodule update, obj factory update, cmake form

---
 bsp_hosted/core/ObjectFactory.cpp |  3 +--
 bsp_linux/core/ObjectFactory.cpp  |  3 +--
 cmake/PreProjectConfig.cmake      | 26 +++++++++++++-------------
 fsfw                              |  2 +-
 tmtc/tmtccmd                      |  2 +-
 5 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/bsp_hosted/core/ObjectFactory.cpp b/bsp_hosted/core/ObjectFactory.cpp
index 573eb39..bf5839e 100644
--- a/bsp_hosted/core/ObjectFactory.cpp
+++ b/bsp_hosted/core/ObjectFactory.cpp
@@ -47,8 +47,7 @@ void ObjectFactory::produce(){
     }
 
     /* TMTC Reception via UDP socket */
-    auto tmtcBridge = new UdpTmTcBridge(objects::UDP_BRIDGE, objects::CCSDS_DISTRIBUTOR,
-            objects::TM_STORE, objects::TC_STORE);
+    auto tmtcBridge = new UdpTmTcBridge(objects::UDP_BRIDGE, objects::CCSDS_DISTRIBUTOR);
     tmtcBridge->setMaxNumberOfPacketsStored(20);
     new UdpTcPollingTask(objects::UDP_POLLING_TASK, objects::UDP_BRIDGE);
 
diff --git a/bsp_linux/core/ObjectFactory.cpp b/bsp_linux/core/ObjectFactory.cpp
index 7332997..be8514b 100644
--- a/bsp_linux/core/ObjectFactory.cpp
+++ b/bsp_linux/core/ObjectFactory.cpp
@@ -48,8 +48,7 @@ void ObjectFactory::produce() {
 	}
 
 	/* TMTC Reception via UDP socket */
-	auto tmtcBridge = new UdpTmTcBridge(objects::UDP_BRIDGE, objects::CCSDS_DISTRIBUTOR,
-			objects::TM_STORE, objects::TC_STORE);
+	auto tmtcBridge = new UdpTmTcBridge(objects::UDP_BRIDGE, objects::CCSDS_DISTRIBUTOR);
 	tmtcBridge->setMaxNumberOfPacketsStored(20);
 	new UdpTcPollingTask(objects::UDP_POLLING_TASK, objects::UDP_BRIDGE);
 #endif /* OBSW_ADD_CORE_COMPONENTS == 1 */
diff --git a/cmake/PreProjectConfig.cmake b/cmake/PreProjectConfig.cmake
index 457b0d6..c42277b 100644
--- a/cmake/PreProjectConfig.cmake
+++ b/cmake/PreProjectConfig.cmake
@@ -110,19 +110,19 @@ elseif(${OS_FSFW} STREQUAL linux AND TGT_BSP)
 				"$ENV{RASPBERRY_VERSION}"
 			)
 		endif()
-            if(LINUX_CROSS_COMPILE)
-                set(CMAKE_TOOLCHAIN_FILE
-                    "${CMAKE_SCRIPT_PATH}/RPiCrossCompileConfig.cmake"
-                    PARENT_SCOPE
-                )
-            endif()
-        elseif(${TGT_BSP} MATCHES "arm/beagleboneblack")
-            if(LINUX_CROSS_COMPILE)
-                set(CMAKE_TOOLCHAIN_FILE
-                    "${CMAKE_SCRIPT_PATH}/BBBCrossCompileConfig.cmake"
-                    PARENT_SCOPE
-                )
-            endif()
+        if(LINUX_CROSS_COMPILE)
+            set(CMAKE_TOOLCHAIN_FILE
+                "${CMAKE_SCRIPT_PATH}/RPiCrossCompileConfig.cmake"
+                PARENT_SCOPE
+            )
+        endif()
+    elseif(${TGT_BSP} MATCHES "arm/beagleboneblack")
+        if(LINUX_CROSS_COMPILE)
+            set(CMAKE_TOOLCHAIN_FILE
+                "${CMAKE_SCRIPT_PATH}/BBBCrossCompileConfig.cmake"
+                PARENT_SCOPE
+            )
+        endif()
 	else()
 		message(WARNING "Target BSP (TGT_BSP) ${TGT_BSP} unknown!")
 	endif()
diff --git a/fsfw b/fsfw
index 08b9e92..c1d30aa 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 08b9e92d25bc78b68d7a101a2451c17def7c8d3b
+Subproject commit c1d30aad13753591b57db9e549333a596b606947
diff --git a/tmtc/tmtccmd b/tmtc/tmtccmd
index 474ccbc..f80d00e 160000
--- a/tmtc/tmtccmd
+++ b/tmtc/tmtccmd
@@ -1 +1 @@
-Subproject commit 474ccbcaad7cedeb252c560c979dd7bf0d3f5ef3
+Subproject commit f80d00ea63b9be872fd3422866ab50d686fddf01
-- 
2.34.1


From 7f24f26f850aad347fa3d2595d2832213b8a6d36 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Wed, 5 May 2021 21:31:21 +0200
Subject: [PATCH 07/21] fsfw hal update

---
 fsfw_hal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fsfw_hal b/fsfw_hal
index a4f5e78..a85c014 160000
--- a/fsfw_hal
+++ b/fsfw_hal
@@ -1 +1 @@
-Subproject commit a4f5e783e1d0452321559c1d612ef0add868d47c
+Subproject commit a85c01465bc8687773676f05c5e7eb8af54b25ff
-- 
2.34.1


From 63608b0da15cea1721ca78d2fa417c34b9e70efb Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Thu, 6 May 2021 20:20:04 +0200
Subject: [PATCH 08/21] updated tmtccmd

---
 tmtc/.idea/runConfigurations/Mode_Service_200.xml | 2 +-
 tmtc/config/hook_base.py                          | 8 +++++---
 tmtc/tmtccmd                                      | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/tmtc/.idea/runConfigurations/Mode_Service_200.xml b/tmtc/.idea/runConfigurations/Mode_Service_200.xml
index 67baae0..9123e75 100644
--- 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="-m onecmd -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" />
diff --git a/tmtc/config/hook_base.py b/tmtc/config/hook_base.py
index abd29c9..c9f47b3 100644
--- a/tmtc/config/hook_base.py
+++ b/tmtc/config/hook_base.py
@@ -21,14 +21,16 @@ class FsfwHookBase(TmTcHookBase):
         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, json_cfg_path: str = ""):
+    def add_globals_post_args_parsing(self, args: argparse.Namespace):
         from tmtccmd.defaults.globals_setup import set_default_globals_post_args_parsing
-        set_default_globals_post_args_parsing(args=args, json_cfg_path=json_cfg_path)
+        set_default_globals_post_args_parsing(args=args, json_cfg_path=self.set_json_config_file_path())
 
     def assign_communication_interface(self, com_if: int, tmtc_printer: TmTcPrinter) -> \
             Union[CommunicationInterface, None]:
         from tmtccmd.defaults.com_setup import create_communication_interface_default
-        return create_communication_interface_default(com_if=com_if, tmtc_printer=tmtc_printer)
+        return create_communication_interface_default(
+            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):
         print("No custom mode operation implemented")
diff --git a/tmtc/tmtccmd b/tmtc/tmtccmd
index f80d00e..75dd5d0 160000
--- a/tmtc/tmtccmd
+++ b/tmtc/tmtccmd
@@ -1 +1 @@
-Subproject commit f80d00ea63b9be872fd3422866ab50d686fddf01
+Subproject commit 75dd5d0266b70fcdf6971ac7b692a3b78b43a772
-- 
2.34.1


From a6fbe4af6e7e35ba0fed74efe5c1ae2b8a6e538e Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Fri, 7 May 2021 00:23:47 +0200
Subject: [PATCH 09/21] fsfw update

---
 fsfw | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fsfw b/fsfw
index c1d30aa..f3530d3 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit c1d30aad13753591b57db9e549333a596b606947
+Subproject commit f3530d3c7ede036e02a65963fcf36da4e5dc024a
-- 
2.34.1


From 804f2f244830cc25864c5338a02f02905a7b0581 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Wed, 12 May 2021 18:42:51 +0200
Subject: [PATCH 10/21] fixed linux launch file

---
 fsfw                                                   | 2 +-
 misc/eclipse/cmake/Linux/fsfw-linux-debug-cmake.launch | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fsfw b/fsfw
index f3530d3..b061139 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit f3530d3c7ede036e02a65963fcf36da4e5dc024a
+Subproject commit b06113993c4952532c39b8adbcabf2a630457a5e
diff --git a/misc/eclipse/cmake/Linux/fsfw-linux-debug-cmake.launch b/misc/eclipse/cmake/Linux/fsfw-linux-debug-cmake.launch
index e014450..c49fd65 100644
--- a/misc/eclipse/cmake/Linux/fsfw-linux-debug-cmake.launch
+++ b/misc/eclipse/cmake/Linux/fsfw-linux-debug-cmake.launch
@@ -18,11 +18,11 @@
     <booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
     <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
     <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build-Debug-Linux/fsfw_example"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="fsfw_example"/>
+    <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="fsfw_example_public"/>
     <booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="false"/>
     <stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="cdt.managedbuild.toolchain.gnu.base.450259316.1933681494"/>
     <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-        <listEntry value="/fsfw_example"/>
+        <listEntry value="/fsfw_example_public"/>
     </listAttribute>
     <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
         <listEntry value="4"/>
-- 
2.34.1


From f138950670744de2dc439cca214b2762d8358919 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Fri, 14 May 2021 11:45:35 +0200
Subject: [PATCH 11/21] updated modgen

---
 generators/modgen | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generators/modgen b/generators/modgen
index b2f7cb7..d56e04c 160000
--- a/generators/modgen
+++ b/generators/modgen
@@ -1 +1 @@
-Subproject commit b2f7cb79e9ab1f21748d84f3a7de8a0a75458531
+Subproject commit d56e04c42676ae19783a2732306a260cd679773b
-- 
2.34.1


From f655889e7f5bfcecc34475ffbd820ad04aa4525d Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Fri, 14 May 2021 11:51:52 +0200
Subject: [PATCH 12/21] updated even generator

---
 .../fsfwconfig/events/translateEvents.cpp     | 249 ++++++++++++++
 .../fsfwconfig/events/translateEvents.h       |   8 +
 generators/definitions.py                     |  16 +
 generators/events/event_parser.py             |  92 +++++
 generators/events/mib_events.py               | 223 ------------
 generators/events/translateEvents.cpp         | 323 +++++++++---------
 generators/events/translateEvents.h           |   8 +
 .../{mib_exporter.py => mod_exporter.py}      |   4 +-
 8 files changed, 537 insertions(+), 386 deletions(-)
 create mode 100644 bsp_hosted/fsfwconfig/events/translateEvents.cpp
 create mode 100644 bsp_hosted/fsfwconfig/events/translateEvents.h
 create mode 100644 generators/definitions.py
 create mode 100644 generators/events/event_parser.py
 delete mode 100644 generators/events/mib_events.py
 create mode 100644 generators/events/translateEvents.h
 rename generators/{mib_exporter.py => mod_exporter.py} (99%)

diff --git a/bsp_hosted/fsfwconfig/events/translateEvents.cpp b/bsp_hosted/fsfwconfig/events/translateEvents.cpp
new file mode 100644
index 0000000..bb26790
--- /dev/null
+++ b/bsp_hosted/fsfwconfig/events/translateEvents.cpp
@@ -0,0 +1,249 @@
+/**
+ * @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;
+}
diff --git a/bsp_hosted/fsfwconfig/events/translateEvents.h b/bsp_hosted/fsfwconfig/events/translateEvents.h
new file mode 100644
index 0000000..9034dcf
--- /dev/null
+++ b/bsp_hosted/fsfwconfig/events/translateEvents.h
@@ -0,0 +1,8 @@
+#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_ */
diff --git a/generators/definitions.py b/generators/definitions.py
new file mode 100644
index 0000000..02e728d
--- /dev/null
+++ b/generators/definitions.py
@@ -0,0 +1,16 @@
+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",
+}
diff --git a/generators/events/event_parser.py b/generators/events/event_parser.py
new file mode 100644
index 0000000..ecc599d
--- /dev/null
+++ b/generators/events/event_parser.py
@@ -0,0 +1,92 @@
+#! /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()
diff --git a/generators/events/mib_events.py b/generators/events/mib_events.py
deleted file mode 100644
index d78c9b7..0000000
--- a/generators/events/mib_events.py
+++ /dev/null
@@ -1,223 +0,0 @@
-#! /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()
diff --git a/generators/events/translateEvents.cpp b/generators/events/translateEvents.cpp
index a36f08c..bb26790 100644
--- a/generators/events/translateEvents.cpp
+++ b/generators/events/translateEvents.cpp
@@ -1,6 +1,7 @@
 /**
  * @brief    Auto-generated event translation file. Contains 78 translations.
- * Generated on: 2020-09-30 15:17:26 
+ * @details
+ * Generated on: 2021-05-14 11:51:26
  */
 #include "translateEvents.h"
 
@@ -83,166 +84,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;
 }
diff --git a/generators/events/translateEvents.h b/generators/events/translateEvents.h
new file mode 100644
index 0000000..9034dcf
--- /dev/null
+++ b/generators/events/translateEvents.h
@@ -0,0 +1,8 @@
+#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_ */
diff --git a/generators/mib_exporter.py b/generators/mod_exporter.py
similarity index 99%
rename from generators/mib_exporter.py
rename to generators/mod_exporter.py
index c47001d..f4d144b 100644
--- a/generators/mib_exporter.py
+++ b/generators/mod_exporter.py
@@ -1,7 +1,7 @@
 #! /usr/bin/python3.8
 # -*- coding: utf-8 -*-
 """
-@file   mib_exporter.py
+@file   mod_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 mib_events.py")
+    os.system("python event_parser.py")
     os.chdir("..")
     print_string = "Exported to file: MIB_Events.csv\r\n"
     return print_string
-- 
2.34.1


From a4ea0680fedfe1bb0859bf141f0c9f35515d9e8b Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Mon, 17 May 2021 14:57:23 +0200
Subject: [PATCH 13/21] update submodules

---
 fsfw         | 2 +-
 tmtc/tmtccmd | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fsfw b/fsfw
index b061139..ff6b413 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit b06113993c4952532c39b8adbcabf2a630457a5e
+Subproject commit ff6b4134a59d848ed21e7a7666e9da4f9207bca6
diff --git a/tmtc/tmtccmd b/tmtc/tmtccmd
index 75dd5d0..79be9e2 160000
--- a/tmtc/tmtccmd
+++ b/tmtc/tmtccmd
@@ -1 +1 @@
-Subproject commit 75dd5d0266b70fcdf6971ac7b692a3b78b43a772
+Subproject commit 79be9e25fb5ca4c08357ed9974d1847bfce01e8c
-- 
2.34.1


From bd35acead0ff57cf3842bc9a0ed5ec5ced823794 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Mon, 17 May 2021 15:23:54 +0200
Subject: [PATCH 14/21] update to new tmtccmd version

---
 tmtc/config/custom_mode_op.py         |  2 --
 tmtc/config/hook_base.py              | 44 ++++++++++++---------------
 tmtc/config/object_ids.py             | 15 +++++----
 tmtc/config/version.py                |  2 +-
 tmtc/pus_tc/service_200_mode.py       |  7 +++--
 tmtc/pus_tc/service_20_parameters.py  | 12 +++-----
 tmtc/pus_tc/service_2_raw_cmd.py      |  6 ++--
 tmtc/pus_tc/service_3_housekeeping.py |  8 ++---
 tmtc/pus_tc/service_8_func_cmd.py     |  7 +++--
 tmtc/pus_tc/tc_packing.py             | 21 +++++++------
 tmtc/pus_tm/factory_hook.py           |  2 +-
 tmtc/pus_tm/service_3_hk_handling.py  | 29 ++++++++++--------
 tmtc/pus_tm/service_8_handling.py     |  8 -----
 13 files changed, 75 insertions(+), 88 deletions(-)

diff --git a/tmtc/config/custom_mode_op.py b/tmtc/config/custom_mode_op.py
index d033ceb..acd322c 100644
--- a/tmtc/config/custom_mode_op.py
+++ b/tmtc/config/custom_mode_op.py
@@ -15,7 +15,5 @@ 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()
diff --git a/tmtc/config/hook_base.py b/tmtc/config/hook_base.py
index c9f47b3..c668790 100644
--- 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.core.hook_base import TmTcHookBase
-from tmtccmd.ecss.tc import PusTelecommand
+from tmtccmd.config.definitions import ServiceOpCodeDictT
+from tmtccmd.config.hook import TmTcHookBase
 from tmtccmd.pus_tm.service_3_base import Service3Base
 
 
@@ -17,19 +17,26 @@ 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.defaults.globals_setup import set_default_globals_pre_args_parsing
+        from tmtccmd.config.globals 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.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())
+        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())
 
-    def assign_communication_interface(self, com_if: int, tmtc_printer: TmTcPrinter) -> \
+    def assign_communication_interface(self, com_if_key: str, tmtc_printer: TmTcPrinter) -> \
             Union[CommunicationInterface, None]:
-        from tmtccmd.defaults.com_setup import create_communication_interface_default
+        from tmtccmd.config.com_if import create_communication_interface_default
         return create_communication_interface_default(
-            com_if=com_if, tmtc_printer=tmtc_printer, json_cfg_path=self.set_json_config_file_path()
+            com_if_key=com_if_key, tmtc_printer=tmtc_printer, json_cfg_path=self.get_json_config_file_path()
         )
 
     def perform_mode_operation(self, tmtc_backend: TmTcHandler, mode: int):
@@ -39,17 +46,13 @@ 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 set_object_ids(self) -> Dict[bytes, list]:
-        from config.object_ids import set_object_ids
-        return set_object_ids()
+    def get_object_ids(self) -> Dict[bytes, list]:
+        from config.object_ids import get_object_ids
+        return get_object_ids()
 
     @staticmethod
     def handle_service_8_telemetry(
@@ -62,18 +65,9 @@ class FsfwHookBase(TmTcHookBase):
 
     @staticmethod
     def handle_service_3_housekeeping(
-        object_id: bytearray, set_id: int, hk_data: bytearray, service3_packet: Service3Base
+        object_id: int, 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"
-
-
-
diff --git a/tmtc/config/object_ids.py b/tmtc/config/object_ids.py
index 752f9a8..cbea7e3 100644
--- a/tmtc/config/object_ids.py
+++ b/tmtc/config/object_ids.py
@@ -3,18 +3,17 @@
 @details    Template configuration file. Copy this folder to the TMTC commander root and adapt
             it to your needs.
 """
-
 from typing import Dict
 
-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])
+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])
 
 
-def set_object_ids() -> Dict[bytes, list]:
+def get_object_ids() -> Dict[bytes, list]:
     object_id_dict = {
-            SERVICE_17_OBJ_ID: ["Service 17"],
-            TEST_DEVICE_0_OBJ_ID: ["Test Device 0"],
-            TEST_DEVICE_1_OBJ_ID: ["Test Device 1"],
+            PUS_SERVICE_17_ID: ["PUS Service 17"],
+            TEST_DEVICE_0_ID: ["Test Device 0"],
+            TEST_DEVICE_1_ID: ["Test Device 1"]
     }
     return object_id_dict
diff --git a/tmtc/config/version.py b/tmtc/config/version.py
index 8423d84..2c9e6a8 100644
--- a/tmtc/config/version.py
+++ b/tmtc/config/version.py
@@ -1,4 +1,4 @@
 SW_NAME = "fsfw-tmtc"
 SW_VERSION = 1
-SW_SUBVERSION = 1
+SW_SUBVERSION = 2
 SW_SUBSUBVERSION = 0
diff --git a/tmtc/pus_tc/service_200_mode.py b/tmtc/pus_tc/service_200_mode.py
index c83f692..11a8363 100644
--- a/tmtc/pus_tc/service_200_mode.py
+++ b/tmtc/pus_tc/service_200_mode.py
@@ -5,12 +5,13 @@
 @author R. Mueller
 @date   02.05.2020
 """
-from config.object_ids import TEST_DEVICE_0_OBJ_ID, TEST_DEVICE_1_OBJ_ID
-from tmtccmd.core.definitions import QueueCommands
+from tmtccmd.config.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":
@@ -21,7 +22,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_OBJ_ID
+    object_id = TEST_DEVICE_0_ID
     # Set On Mode
     tc_queue.appendleft((QueueCommands.PRINT, "Testing Service 200: Set Mode On"))
     mode_data = pack_mode_data(object_id, 1, 0)
diff --git a/tmtc/pus_tc/service_20_parameters.py b/tmtc/pus_tc/service_20_parameters.py
index 241b501..28116b1 100644
--- a/tmtc/pus_tc/service_20_parameters.py
+++ b/tmtc/pus_tc/service_20_parameters.py
@@ -1,18 +1,16 @@
 import struct
 
-from tmtccmd.core.definitions import QueueCommands
+from tmtccmd.config.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.tmtcc_logger import get_logger
+from tmtccmd.utility.logger import get_logger
 
-
-from config.object_ids import TEST_DEVICE_0_OBJ_ID
+from config.object_ids import TEST_DEVICE_0_ID
 
 LOGGER = get_logger()
-TEST_DEVICE_0_ID = bytearray()
 
 
 def pack_service20_commands_into(tc_queue: TcQueueT, op_code: str):
@@ -23,7 +21,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_OBJ_ID
+    object_id = TEST_DEVICE_0_ID
 
     # set mode normal
     tc_queue.appendleft((QueueCommands.PRINT, "Testing Service 20: Set Normal Mode"))
@@ -40,7 +38,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_OBJ_ID
+    object_id = TEST_DEVICE_0_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"))
diff --git a/tmtc/pus_tc/service_2_raw_cmd.py b/tmtc/pus_tc/service_2_raw_cmd.py
index 9fe2d1a..f26f33e 100644
--- 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.core.definitions import QueueCommands
+from tmtccmd.config.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_OBJ_ID, TEST_DEVICE_1_OBJ_ID
+from config.object_ids import TEST_DEVICE_0_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_OBJ_ID  # dummy device
+    object_id = TEST_DEVICE_0_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)
diff --git a/tmtc/pus_tc/service_3_housekeeping.py b/tmtc/pus_tc/service_3_housekeeping.py
index 36b9bb1..a5b4f94 100644
--- a/tmtc/pus_tc/service_3_housekeeping.py
+++ b/tmtc/pus_tc/service_3_housekeeping.py
@@ -1,4 +1,4 @@
-from tmtccmd.core.definitions import QueueCommands
+from tmtccmd.config.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_OBJ_ID
+        object_id = TEST_DEVICE_0_ID
     else:
-        object_id = TEST_DEVICE_1_OBJ_ID
+        object_id = TEST_DEVICE_1_ID
 
     if op_code == "0":
         # This will pack all the tests
diff --git a/tmtc/pus_tc/service_8_func_cmd.py b/tmtc/pus_tc/service_8_func_cmd.py
index 24f3317..a53d44b 100644
--- a/tmtc/pus_tc/service_8_func_cmd.py
+++ b/tmtc/pus_tc/service_8_func_cmd.py
@@ -1,10 +1,11 @@
-from tmtccmd.core.definitions import QueueCommands
+from tmtccmd.config.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_1_OBJ_ID, TEST_DEVICE_0_OBJ_ID
+
+from config.object_ids import TEST_DEVICE_0_ID
 
 
 def pack_service_8_commands_into(tc_queue: TcQueueT, op_code: str):
@@ -16,7 +17,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_OBJ_ID
+    object_id = TEST_DEVICE_0_ID
 
     # set mode on
     tc_queue.appendleft((QueueCommands.PRINT, "Testing Service 8: Set On Mode"))
diff --git a/tmtc/pus_tc/tc_packing.py b/tmtc/pus_tc/tc_packing.py
index 389a182..757c58f 100644
--- a/tmtc/pus_tc/tc_packing.py
+++ b/tmtc/pus_tc/tc_packing.py
@@ -6,14 +6,15 @@
 
 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.tmtcc_logger import get_logger
+from tmtccmd.utility.logger import get_logger
 from tmtccmd.pus_tc.definitions import TcQueueT
-from tmtccmd.core.definitions import CoreServiceList
+from tmtccmd.config.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
@@ -21,20 +22,20 @@ from pus_tc.service_200_mode import pack_service_200_commands_into
 LOGGER = get_logger()
 
 
-def pack_service_queue_user(service: int, op_code: str, service_queue: TcQueueT):
-    if service == CoreServiceList.SERVICE_2:
+def pack_service_queue_user(service: Union[str, int], op_code: str, service_queue: TcQueueT):
+    if service == CoreServiceList.SERVICE_2.value:
         return pack_service_2_commands_into(op_code=op_code, tc_queue=service_queue)
-    if service == CoreServiceList.SERVICE_3:
+    if service == CoreServiceList.SERVICE_3.value:
         return pack_service_3_commands_into(op_code=op_code, tc_queue=service_queue)
-    if service == CoreServiceList.SERVICE_5:
+    if service == CoreServiceList.SERVICE_5.value:
         return pack_generic_service5_test_into(tc_queue=service_queue)
-    if service == CoreServiceList.SERVICE_8:
+    if service == CoreServiceList.SERVICE_8.value:
         return pack_service_8_commands_into(op_code=op_code, tc_queue=service_queue)
-    if service == CoreServiceList.SERVICE_17:
+    if service == CoreServiceList.SERVICE_17.value:
         return pack_generic_service17_test(init_ssc=1700, tc_queue=service_queue)
-    if service == CoreServiceList.SERVICE_20:
+    if service == CoreServiceList.SERVICE_20.value:
         return pack_service20_commands_into(tc_queue=service_queue, op_code=op_code)
-    if service == CoreServiceList.SERVICE_200:
+    if service == CoreServiceList.SERVICE_200.value:
         return pack_service_200_commands_into(tc_queue=service_queue, op_code=op_code)
     LOGGER.warning("Invalid Service !")
 
diff --git a/tmtc/pus_tm/factory_hook.py b/tmtc/pus_tm/factory_hook.py
index 31f196f..8e5115a 100644
--- 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.tmtcc_logger import get_logger
+from tmtccmd.utility.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
diff --git a/tmtc/pus_tm/service_3_hk_handling.py b/tmtc/pus_tm/service_3_hk_handling.py
index 33aa483..81ad9d8 100644
--- a/tmtc/pus_tm/service_3_hk_handling.py
+++ b/tmtc/pus_tm/service_3_hk_handling.py
@@ -6,34 +6,37 @@
 """
 import struct
 from typing import Tuple
+from config.object_ids import ObjectIds
 from tmtccmd.pus_tm.service_3_housekeeping import Service3Base
 from tmtccmd.utility.tmtcc_logger import get_logger
 
-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: bytearray, set_id: int, hk_data: bytearray, service3_packet: Service3Base
+        object_id: int, 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.
 
-    :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
+    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
     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 set_id:
-        pass
-    if service3_packet:
-        pass
-    if object_id == TEST_DEVICE_0_OBJ_ID or \
-            object_id == TEST_DEVICE_1_OBJ_ID:
+    if object_id == ObjectIds.TEST_DEVICE_0.value or \
+            object_id == ObjectIds.TEST_DEVICE_1.value:
         return handle_test_set_deserialization(hk_data=hk_data)
     else:
         LOGGER.info("Service3TM: Parsing for this SID has not been implemented.")
diff --git a/tmtc/pus_tm/service_8_handling.py b/tmtc/pus_tm/service_8_handling.py
index cfe04cb..259e7e4 100644
--- a/tmtc/pus_tm/service_8_handling.py
+++ b/tmtc/pus_tm/service_8_handling.py
@@ -14,14 +14,6 @@ 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
-- 
2.34.1


From 2f32a81b4726985dcb2eb4c89fdbef630542579e Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Mon, 17 May 2021 15:24:59 +0200
Subject: [PATCH 15/21] updated run configs

---
 .../runConfigurations/Event_Service_5.xml     |  2 +-
 .../Functional_Service_8.xml                  |  2 +-
 .../runConfigurations/Mode_Service_200.xml    |  2 +-
 .../runConfigurations/Ping_Service_17.xml     |  2 +-
 .../Raw_Commanding_Service_2.xml              |  2 +-
 .../runConfigurations/Single_Command.xml      | 24 -------------------
 6 files changed, 5 insertions(+), 29 deletions(-)
 delete mode 100644 tmtc/.idea/runConfigurations/Single_Command.xml

diff --git a/tmtc/.idea/runConfigurations/Event_Service_5.xml b/tmtc/.idea/runConfigurations/Event_Service_5.xml
index 665f667..f0ced89 100644
--- 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="-m seqcmd -s 5 -t 5" />
+    <option name="PARAMETERS" value="-s 5 -t 5" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />
diff --git a/tmtc/.idea/runConfigurations/Functional_Service_8.xml b/tmtc/.idea/runConfigurations/Functional_Service_8.xml
index e23afa8..7a7d237 100644
--- 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="-m seqcmd -s 8 -t 4" />
+    <option name="PARAMETERS" value="-s 8 -t 4" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />
diff --git a/tmtc/.idea/runConfigurations/Mode_Service_200.xml b/tmtc/.idea/runConfigurations/Mode_Service_200.xml
index 9123e75..2314d22 100644
--- 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="-m seqcmd -s 200 -t 4" />
+    <option name="PARAMETERS" value="-s 200 -t 4" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />
diff --git a/tmtc/.idea/runConfigurations/Ping_Service_17.xml b/tmtc/.idea/runConfigurations/Ping_Service_17.xml
index 7fef34d..2cab9f8 100644
--- 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="-m seqcmd -s 17 -t 3" />
+    <option name="PARAMETERS" value="-s 17 -t 3" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
     <option name="MODULE_MODE" value="false" />
diff --git a/tmtc/.idea/runConfigurations/Raw_Commanding_Service_2.xml b/tmtc/.idea/runConfigurations/Raw_Commanding_Service_2.xml
index bd52f57..685915e 100644
--- 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="-m seqcmd -s 2 -t 4" />
+    <option name="PARAMETERS" value="-s 2 -t 4" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
     <option name="MODULE_MODE" value="false" />
diff --git a/tmtc/.idea/runConfigurations/Single_Command.xml b/tmtc/.idea/runConfigurations/Single_Command.xml
deleted file mode 100644
index 141aafc..0000000
--- a/tmtc/.idea/runConfigurations/Single_Command.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<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>
\ No newline at end of file
-- 
2.34.1


From 0a6db776aef55b8b5b6f1e09db9ee95635d75b14 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Mon, 17 May 2021 15:27:31 +0200
Subject: [PATCH 16/21] updated service 3 run configs

---
 tmtc/.idea/runConfigurations/Service_3_All_Tests.xml  | 2 +-
 tmtc/.idea/runConfigurations/Service_3_HK_Basic.xml   | 2 +-
 tmtc/.idea/runConfigurations/Service_3_Notif_Demo.xml | 2 +-
 tmtc/.idea/runConfigurations/Service_3_One_HK.xml     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tmtc/.idea/runConfigurations/Service_3_All_Tests.xml b/tmtc/.idea/runConfigurations/Service_3_All_Tests.xml
index dbccc86..c2bf05c 100644
--- 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="-m seqcmd -s 3 -o 0 --hk -t 3" />
+    <option name="PARAMETERS" value="-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" />
diff --git a/tmtc/.idea/runConfigurations/Service_3_HK_Basic.xml b/tmtc/.idea/runConfigurations/Service_3_HK_Basic.xml
index 2812841..baf5a84 100644
--- 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="-m seqcmd -s 3 -o 2 --hk -t 3" />
+    <option name="PARAMETERS" value="-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" />
diff --git a/tmtc/.idea/runConfigurations/Service_3_Notif_Demo.xml b/tmtc/.idea/runConfigurations/Service_3_Notif_Demo.xml
index 1191544..93e6c7d 100644
--- 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="-m seqcmd -s 3 -o 3 --hk -t 3" />
+    <option name="PARAMETERS" value="-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" />
diff --git a/tmtc/.idea/runConfigurations/Service_3_One_HK.xml b/tmtc/.idea/runConfigurations/Service_3_One_HK.xml
index 984e126..a8151b7 100644
--- 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="-m seqcmd -s 3 -o 1 --hk -t 3" />
+    <option name="PARAMETERS" value="-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" />
-- 
2.34.1


From bdbd9fa3c82684fb8b6b59f46e4a1c9d967a0b5b Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Mon, 17 May 2021 15:32:51 +0200
Subject: [PATCH 17/21] updated tmtccmd

---
 tmtc/tmtc_client_cli.py | 2 +-
 tmtc/tmtc_client_gui.py | 2 +-
 tmtc/tmtccmd            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tmtc/tmtc_client_cli.py b/tmtc/tmtc_client_cli.py
index edfea69..cb844d1 100644
--- 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(False)
+    run_tmtc_commander(use_gui=False, app_name="TMTC Commander FSFW")
 
 
 if __name__ == "__main__":
diff --git a/tmtc/tmtc_client_gui.py b/tmtc/tmtc_client_gui.py
index 2a146a1..6ac7ce7 100644
--- 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(True)
+    run_tmtc_commander(use_gui=True, app_name="TMTC Commander FSFW")
 
 
 if __name__ == "__main__":
diff --git a/tmtc/tmtccmd b/tmtc/tmtccmd
index 79be9e2..ffa2d0d 160000
--- a/tmtc/tmtccmd
+++ b/tmtc/tmtccmd
@@ -1 +1 @@
-Subproject commit 79be9e25fb5ca4c08357ed9974d1847bfce01e8c
+Subproject commit ffa2d0d6f0f113ab964a703abd200d92c37f6a63
-- 
2.34.1


From fea2e77b0a494dbc5a438779e70c1f5b567fff09 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Mon, 17 May 2021 15:40:51 +0200
Subject: [PATCH 18/21] some inspector tweaks

---
 tmtc/.idea/runConfigurations/Ping_Service_17.xml | 2 +-
 tmtc/config/custom_mode_op.py                    | 2 +-
 tmtc/pus_tm/service_3_hk_handling.py             | 9 ++++-----
 tmtc/tmtccmd                                     | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/tmtc/.idea/runConfigurations/Ping_Service_17.xml b/tmtc/.idea/runConfigurations/Ping_Service_17.xml
index 2cab9f8..349b215 100644
--- 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 -t 3" />
+    <option name="PARAMETERS" value="-s 17 -o 0 -t 3" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
     <option name="MODULE_MODE" value="false" />
diff --git a/tmtc/config/custom_mode_op.py b/tmtc/config/custom_mode_op.py
index acd322c..5977c3c 100644
--- 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.tmtcc_logger import get_logger
+from tmtccmd.utility.logger import get_logger
 
 LOGGER = get_logger()
 
diff --git a/tmtc/pus_tm/service_3_hk_handling.py b/tmtc/pus_tm/service_3_hk_handling.py
index 81ad9d8..138ae00 100644
--- a/tmtc/pus_tm/service_3_hk_handling.py
+++ b/tmtc/pus_tm/service_3_hk_handling.py
@@ -6,15 +6,15 @@
 """
 import struct
 from typing import Tuple
-from config.object_ids import ObjectIds
 from tmtccmd.pus_tm.service_3_housekeeping import Service3Base
-from tmtccmd.utility.tmtcc_logger import get_logger
+from tmtccmd.utility.logger import get_logger
 
+from config.object_ids import TEST_DEVICE_0_ID, TEST_DEVICE_1_ID
 LOGGER = get_logger()
 
 
 def service_3_hk_handling(
-        object_id: int, set_id: int, hk_data: bytearray, service3_packet: Service3Base
+        object_id: bytes, 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.
@@ -35,8 +35,7 @@ def service_3_hk_handling(
     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 == ObjectIds.TEST_DEVICE_0.value or \
-            object_id == ObjectIds.TEST_DEVICE_1.value:
+    if object_id == TEST_DEVICE_0_ID or object_id == TEST_DEVICE_1_ID:
         return handle_test_set_deserialization(hk_data=hk_data)
     else:
         LOGGER.info("Service3TM: Parsing for this SID has not been implemented.")
diff --git a/tmtc/tmtccmd b/tmtc/tmtccmd
index ffa2d0d..8ca16e3 160000
--- a/tmtc/tmtccmd
+++ b/tmtc/tmtccmd
@@ -1 +1 @@
-Subproject commit ffa2d0d6f0f113ab964a703abd200d92c37f6a63
+Subproject commit 8ca16e305d18eb8df2165680676992261af99c1b
-- 
2.34.1


From 4268b29d19b421b42faf1413926d93ac72505e9a Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Mon, 17 May 2021 15:51:22 +0200
Subject: [PATCH 19/21] tmtccmd update

---
 tmtc/config/hook_base.py | 2 +-
 tmtc/tmtccmd             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tmtc/config/hook_base.py b/tmtc/config/hook_base.py
index c668790..9512857 100644
--- a/tmtc/config/hook_base.py
+++ b/tmtc/config/hook_base.py
@@ -65,7 +65,7 @@ class FsfwHookBase(TmTcHookBase):
 
     @staticmethod
     def handle_service_3_housekeeping(
-        object_id: int, set_id: int, hk_data: bytearray, service3_packet: Service3Base
+        object_id: bytes, 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(
diff --git a/tmtc/tmtccmd b/tmtc/tmtccmd
index 8ca16e3..2fe13b2 160000
--- a/tmtc/tmtccmd
+++ b/tmtc/tmtccmd
@@ -1 +1 @@
-Subproject commit 8ca16e305d18eb8df2165680676992261af99c1b
+Subproject commit 2fe13b2d7183dce67b6b7ec4b89dd7771ee46a2f
-- 
2.34.1


From e4b0ccdcc9bbea2b90ee8740a4d1b22450087df6 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Mon, 17 May 2021 15:53:41 +0200
Subject: [PATCH 20/21] updated fsfw

---
 fsfw | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fsfw b/fsfw
index ff6b413..9496ed4 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit ff6b4134a59d848ed21e7a7666e9da4f9207bca6
+Subproject commit 9496ed42e24698b826cadaae657b4641670a29d8
-- 
2.34.1


From dca08e63ab55f68fb99cff97040a38a59e8d4de5 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Mon, 17 May 2021 15:54:52 +0200
Subject: [PATCH 21/21] fsfw update

---
 fsfw | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fsfw b/fsfw
index 9496ed4..ff6b413 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 9496ed42e24698b826cadaae657b4641670a29d8
+Subproject commit ff6b4134a59d848ed21e7a7666e9da4f9207bca6
-- 
2.34.1