From 025337227cb0730b3bc06d189cccf4cdb7a31388 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 27 Dec 2020 16:45:37 +0100 Subject: [PATCH 1/2] fsfwconfig fix --- fsfw | 2 +- fsfwconfig/FSFWConfig.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/fsfw b/fsfw index 086cbe1e..dcc111e4 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 086cbe1e3950cf6c904609352408a7fa48cc83ef +Subproject commit dcc111e4facf39137fe52d8234361b7d99bdde06 diff --git a/fsfwconfig/FSFWConfig.h b/fsfwconfig/FSFWConfig.h index fe97ee6e..5df83705 100644 --- a/fsfwconfig/FSFWConfig.h +++ b/fsfwconfig/FSFWConfig.h @@ -1,7 +1,6 @@ #ifndef FSFWCONFIG_FSFWCONFIG_H_ #define FSFWCONFIG_FSFWCONFIG_H_ -#include #include //! Used to determine whether C++ ostreams are used From d359222b457ddf821af9e604312c0abf6aed0502 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 27 Dec 2020 16:46:01 +0100 Subject: [PATCH 2/2] another fix --- fsfwconfig/objects/systemObjectList.h | 1 - 1 file changed, 1 deletion(-) diff --git a/fsfwconfig/objects/systemObjectList.h b/fsfwconfig/objects/systemObjectList.h index 3b5717fb..05ed2c52 100644 --- 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 */