fsfw/fsfw
fsfw/fsfw
10
3
Fork 6
Code Issues 32 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 +3 -13
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7f08bb3506 - Show all commits

6
devicehandlers/DeviceHandlerBase.cpp
View File

@ -22,8 +22,8 @@ DeviceHandlerBase::DeviceHandlerBase(object_id_t setObjectId,
uint32_t thermalRequestPoolId, FailureIsolationBase* fdirInstance, uint32_t thermalRequestPoolId, FailureIsolationBase* fdirInstance,
size_t cmdQueueSize) : size_t cmdQueueSize) :
SystemObject(setObjectId), rawPacket(0), rawPacketLen(0), mode(MODE_OFF), SystemObject(setObjectId), rawPacket(0), rawPacketLen(0), mode(MODE_OFF),
submode(SUBMODE_NONE), pstStep(0), maxDeviceReplyLen(maxDeviceReplyLen), submode(SUBMODE_NONE), pstStep(0), wiretappingMode(OFF),
wiretappingMode(OFF), defaultRawReceiver(0), storedRawData(StorageManagerIF::INVALID_ADDRESS), defaultRawReceiver(0), storedRawData(StorageManagerIF::INVALID_ADDRESS),
requestedRawTraffic(0), powerSwitcher(NULL), IPCStore(NULL), requestedRawTraffic(0), powerSwitcher(NULL), IPCStore(NULL),
deviceCommunicationId(deviceCommunication), communicationInterface(NULL), deviceCommunicationId(deviceCommunication), communicationInterface(NULL),
comCookie(comCookie), commandQueue(NULL), deviceThermalStatePoolId(thermalStatePoolId), comCookie(comCookie), commandQueue(NULL), deviceThermalStatePoolId(thermalStatePoolId),
@ -31,7 +31,7 @@ DeviceHandlerBase::DeviceHandlerBase(object_id_t setObjectId,
modeHelper(this), parameterHelper(this), childTransitionFailure(RETURN_OK), modeHelper(this), parameterHelper(this), childTransitionFailure(RETURN_OK),
ignoreMissedRepliesCount(0), fdirInstance(fdirInstance), hkSwitcher(this), ignoreMissedRepliesCount(0), fdirInstance(fdirInstance), hkSwitcher(this),
defaultFDIRUsed(fdirInstance == NULL), switchOffWasReported(false), defaultFDIRUsed(fdirInstance == NULL), switchOffWasReported(false),
executingTask(NULL), actionHelper(this, NULL), cookieInfo(), ioBoardAddress(ioBoardAddress), executingTask(NULL), actionHelper(this, NULL), cookieInfo(),
timeoutStart(0), childTransitionDelay(5000), transitionSourceMode(_MODE_POWER_DOWN), timeoutStart(0), childTransitionDelay(5000), transitionSourceMode(_MODE_POWER_DOWN),
transitionSourceSubMode(SUBMODE_NONE), deviceSwitch(setDeviceSwitch) { transitionSourceSubMode(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; uint8_t pstStep;
/**
* 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.
* *