mohr/fsfw
1
0
Fork 0
forked from fsfw/fsfw
Code Pull Requests Activity

Merge branch 'mueller_devel_distribDatapool' into mueller_framework

Browse Source
This commit is contained in:
Robin Müller
2020-07-09 16:47:39 +02:00
parent a5d3d9ea80 ac9e6e1337
commit 0cdce6e327
11 changed files with 97 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
devicehandlers/DeviceHandlerBase.h
View File

@ -17,10 +17,9 @@
#include <framework/health/HealthHelper.h>
#include <framework/parameters/ParameterHelper.h>
#include <framework/datapool/HkSwitchHelper.h>
#include <framework/datapoollocal/HasLocalDataPoolIF.h>
#include <framework/datapoollocal/LocalDataPoolManager.h>
#include <framework/devicehandlers/DeviceHandlerFailureIsolation.h>
#include <framework/datapoollocal/OwnsLocalDataPoolIF.h>
#include <map>
namespace Factory{
@ -88,7 +87,7 @@ class DeviceHandlerBase: public DeviceHandlerIF,
public HasHealthIF,
public HasActionsIF,
public ReceivesParameterMessagesIF,
public OwnsLocalDataPoolIF {
public HasLocalDataPoolIF {
friend void (Factory::setStaticFrameworkObjectIds)();
public:
/**