Merge branch 'hotfix/fsfwconfig' into meier/pcduhandler

2020-12-27 16:48:34 +01:00 · 2020-12-27 16:48:34 +01:00 · 86b36352dc
commit 86b36352dc
parent 6dbafec3ad d359222b45
3 changed files with 1 additions and 3 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 086cbe1e3950cf6c904609352408a7fa48cc83ef
+Subproject commit dcc111e4facf39137fe52d8234361b7d99bdde06
--- a/fsfwconfig/FSFWConfig.h
+++ b/fsfwconfig/FSFWConfig.h
@ -1,7 +1,6 @@
 #ifndef FSFWCONFIG_FSFWCONFIG_H_
 #define FSFWCONFIG_FSFWCONFIG_H_

-#include <FSFWVersion.h>
 #include <cstddef>

 //! Used to determine whether C++ ostreams are used
--- a/fsfwconfig/objects/systemObjectList.h
+++ b/fsfwconfig/objects/systemObjectList.h
@ -19,7 +19,6 @@ namespace objects {
 		PUS_SERVICE_23 = 0x51002300,
 		PUS_SERVICE_201 = 0x51020100,

-		TIME_STAMPER = 0x52000001,
 		TM_FUNNEL = 0x52000002,

 		/* Test Task */