fsfw/fsfw
fsfw/fsfw
10
3
Fork 6
Code Issues 31 Pull Requests 4 Releases 10 Wiki Activity

commented out all new hk manager components

Browse Source
This commit is contained in:
Robin Müller 2020-07-16 12:57:29 +02:00
parent 36f7cf2caf
commit c9bc022941
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
devicehandlers/DeviceHandlerBase.cpp
View File

@ -191,14 +191,14 @@ ReturnValue_t DeviceHandlerBase::initialize() {
return result;
}
if(hkDestination == objects::NO_OBJECT) {
hkDestination = defaultHkDestination;
}
result = hkManager.initialize(commandQueue, hkDestination);
if (result != HasReturnvaluesIF::RETURN_OK) {
return result;
}
// if(hkDestination == objects::NO_OBJECT) {
// hkDestination = defaultHkDestination;
// }
//
// result = hkManager.initialize(commandQueue, hkDestination);
// if (result != HasReturnvaluesIF::RETURN_OK) {
// return result;
// }
fillCommandAndReplyMap();
@ -262,10 +262,10 @@ void DeviceHandlerBase::readCommandQueue() {
return;
}
result = hkManager.handleHousekeepingMessage(&command);
if (result == RETURN_OK) {
return;
}
// result = hkManager.handleHousekeepingMessage(&command);
// if (result == RETURN_OK) {
// return;
// }
result = handleDeviceHandlerMessage(&command);
if (result == RETURN_OK) {

16
devicehandlers/DeviceHandlerBase.h
View File

@ -17,8 +17,8 @@
#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/datapoollocal/HasLocalDataPoolIF.h>
//#include <framework/datapoollocal/LocalDataPoolManager.h>
#include <framework/devicehandlers/DeviceHandlerFailureIsolation.h>
#include <map>
@ -86,8 +86,8 @@ class DeviceHandlerBase: public DeviceHandlerIF,
public HasModesIF,
public HasHealthIF,
public HasActionsIF,
public ReceivesParameterMessagesIF,
public HasLocalDataPoolIF {
public ReceivesParameterMessagesIF
/* public HasLocalDataPoolIF */ {
friend void (Factory::setStaticFrameworkObjectIds)();
public:
/**
@ -480,11 +480,11 @@ protected:
* @param localDataPoolMap
* @return
*/
virtual ReturnValue_t initializePoolEntries(
LocalDataPool& localDataPoolMap) override;
//virtual ReturnValue_t initializePoolEntries(
// LocalDataPool& localDataPoolMap) override;
/** Get the HK manager object handle */
virtual LocalDataPoolManager* getHkManagerHandle() override;
//virtual LocalDataPoolManager* getHkManagerHandle() override;
/**
* @brief Hook function for child handlers which is called once per
@ -611,7 +611,7 @@ protected:
/** Action helper for HasActionsIF */
ActionHelper actionHelper;
/** Housekeeping Manager */
LocalDataPoolManager hkManager;
//LocalDataPoolManager hkManager;
/**
* @brief Information about commands