eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

Merge branch 'hotfix/fsfwconfig' into meier/pcduhandler

Browse Source
This commit is contained in:
Jakob Meier 2020-12-27 16:48:34 +01:00
commit c9e1db9373
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fsfw

@ -1 +1 @@
Subproject commit 086cbe1e3950cf6c904609352408a7fa48cc83ef Subproject commit dcc111e4facf39137fe52d8234361b7d99bdde06

1
fsfwconfig/FSFWConfig.h
View File

@ -1,7 +1,6 @@
#ifndef FSFWCONFIG_FSFWCONFIG_H_ #ifndef FSFWCONFIG_FSFWCONFIG_H_
#define FSFWCONFIG_FSFWCONFIG_H_ #define FSFWCONFIG_FSFWCONFIG_H_
#include <FSFWVersion.h>
#include <cstddef> #include <cstddef>
//! Used to determine whether C++ ostreams are used //! Used to determine whether C++ ostreams are used

1
fsfwconfig/objects/systemObjectList.h
View File

@ -19,7 +19,6 @@ namespace objects {
PUS_SERVICE_23 = 0x51002300, PUS_SERVICE_23 = 0x51002300,
PUS_SERVICE_201 = 0x51020100, PUS_SERVICE_201 = 0x51020100,
TIME_STAMPER = 0x52000001,
TM_FUNNEL = 0x52000002, TM_FUNNEL = 0x52000002,
/* Test Task */ /* Test Task */