Update to v1.1.0 #29

Merged
muellerr merged 427 commits from develop into master 2021-04-25 12:43:23 +02:00
3 changed files with 1 additions and 3 deletions
Showing only changes of commit 86b36352dc - Show all commits

2
fsfw

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

View File

@ -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

View File

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