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

DeviceHandlerBase: All Refactoring #44

Merged
mohr merged 56 commits from KSat/fsfw:mueller_DeviceHandlerBase_AllRefactoring into master 2020-07-03 11:48:56 +02:00
Conversation 0 Commits 56 Files Changed 12 +6 -4
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fb0834ffe1 - Show all commits

6
devicehandlers/DeviceHandlerBase.cpp
View File

@ -23,8 +23,9 @@ DeviceHandlerBase::DeviceHandlerBase(object_id_t setObjectId,
size_t cmdQueueSize) :
SystemObject(setObjectId), mode(MODE_OFF), submode(SUBMODE_NONE),
wiretappingMode(OFF), storedRawData(StorageManagerIF::INVALID_ADDRESS),
deviceCommunicationId(deviceCommunication), deviceThermalStatePoolId(
thermalStatePoolId),deviceThermalRequestPoolId(thermalRequestPoolId),
deviceCommunicationId(deviceCommunication), comCookie(comCookie),
deviceThermalStatePoolId(thermalStatePoolId),
deviceThermalRequestPoolId(thermalRequestPoolId),
healthHelper(this,setObjectId), modeHelper(this), parameterHelper(this),
childTransitionFailure(RETURN_OK), fdirInstance(fdirInstance),
hkSwitcher(this), defaultFDIRUsed(fdirInstance == nullptr),
@ -44,6 +45,7 @@ DeviceHandlerBase::DeviceHandlerBase(object_id_t setObjectId,
DeviceHandlerBase::~DeviceHandlerBase() {
//communicationInterface->close(cookie);
delete comCookie;
if (defaultFDIRUsed) {
delete fdirInstance;
}

4
devicehandlers/DeviceHandlerBase.h
View File

@ -606,12 +606,12 @@ protected:
/**
* Communication object used for device communication
*/
DeviceCommunicationIF *communicationInterface = nullptr;
DeviceCommunicationIF * communicationInterface = nullptr;
/**
* Cookie used for communication
*/
CookieIF * comCookie = nullptr;
CookieIF * comCookie;
struct DeviceCommandInfo {
bool isExecuting; //!< Indicates if the command is already executing.