KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity

Merge branch 'mueller_DeviceHandlerBase_API_change_CookieIF' into mueller_DeviceHandlerBase_AllRefactoring

Browse Source
This commit is contained in:
Robin Müller 2020-04-19 15:57:39 +02:00
commit f4c925e671
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
devicehandlers/DeviceHandlerBase.cpp
View File

@ -22,15 +22,14 @@ DeviceHandlerBase::DeviceHandlerBase(object_id_t setObjectId,
uint32_t thermalRequestPoolId, FailureIsolationBase* fdirInstance, uint32_t thermalRequestPoolId, FailureIsolationBase* fdirInstance,
size_t cmdQueueSize) : size_t cmdQueueSize) :
SystemObject(setObjectId), mode(MODE_OFF), submode(SUBMODE_NONE), SystemObject(setObjectId), mode(MODE_OFF), submode(SUBMODE_NONE),
maxDeviceReplyLen(maxDeviceReplyLen), wiretappingMode(OFF), wiretappingMode(OFF), storedRawData(StorageManagerIF::INVALID_ADDRESS),
storedRawData(StorageManagerIF::INVALID_ADDRESS), deviceCommunicationId( deviceCommunicationId(deviceCommunication), deviceThermalStatePoolId(
deviceCommunication), deviceThermalStatePoolId(thermalStatePoolId), thermalStatePoolId),deviceThermalRequestPoolId(thermalRequestPoolId),
deviceThermalRequestPoolId(thermalRequestPoolId), healthHelper(this, healthHelper(this,setObjectId), modeHelper(this), parameterHelper(this),
setObjectId), modeHelper(this), parameterHelper(this),
childTransitionFailure(RETURN_OK), fdirInstance(fdirInstance), childTransitionFailure(RETURN_OK), fdirInstance(fdirInstance),
hkSwitcher(this), defaultFDIRUsed(fdirInstance == nullptr), hkSwitcher(this), defaultFDIRUsed(fdirInstance == nullptr),
switchOffWasReported(false), actionHelper(this, nullptr), cookieInfo(), switchOffWasReported(false), actionHelper(this, nullptr), cookieInfo(),
ioBoardAddress(ioBoardAddress), childTransitionDelay(5000), childTransitionDelay(5000),
transitionSourceMode(_MODE_POWER_DOWN), transitionSourceSubMode( transitionSourceMode(_MODE_POWER_DOWN), transitionSourceSubMode(
SUBMODE_NONE), deviceSwitch(setDeviceSwitch) { SUBMODE_NONE), deviceSwitch(setDeviceSwitch) {
commandQueue = QueueFactory::instance()->createMessageQueue(cmdQueueSize, commandQueue = QueueFactory::instance()->createMessageQueue(cmdQueueSize,

10
devicehandlers/DeviceHandlerBase.h
View File

@ -498,11 +498,6 @@ protected:
*/ */
uint8_t pstStep = 0; uint8_t pstStep = 0;
/**
* This will be used in the RMAP getRead command as expected length, is set by the constructor, can be modiefied at will.
*/
const uint32_t maxDeviceReplyLen;
/** /**
* wiretapping flag: * wiretapping flag:
* *
@ -994,11 +989,6 @@ private:
*/ */
CookieInfo cookieInfo; CookieInfo cookieInfo;
/**
* cached from ctor for initialize()
*/
const uint32_t ioBoardAddress;
/** /**
* Used for timing out mode transitions. * Used for timing out mode transitions.
* *