Merge branch 'master' into gaisser_small_bugfix_subsystem

This commit is contained in:
2020-08-28 13:25:34 +02:00
408 changed files with 4287 additions and 2780 deletions
action
container
controller
coordinates
datalinklayer
datapool
devicehandlers
events
fdir
fsfw.mk
globalfunctions
health
internalError
ipc
memory
modes
monitoring
objectmanager
osal
parameters
power
pus
returnvalues
rmap
serialize
serviceinterface
storagemanager
subsystem
tasks
tcdistribution
thermal
timemanager
tmstorage
tmtcpacket
tmtcservices

@ -1,5 +1,5 @@
#include <framework/objectmanager/ObjectManager.h>
#include <framework/serviceinterface/ServiceInterfaceStream.h>
#include "ObjectManager.h"
#include "../serviceinterface/ServiceInterfaceStream.h"
#include <iomanip>
#include <cstdlib>