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

removed counter, will be implemented in childclass

Browse Source
This commit is contained in:
Robin Müller 2020-03-06 19:01:31 +01:00
parent 68cda479d6
commit 6579200f55
2 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
devicehandlers/DeviceHandlerBase.cpp
View File

@ -32,9 +32,8 @@ DeviceHandlerBase::DeviceHandlerBase(uint32_t logicalAddress_,
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(), logicalAddress(logicalAddress_), executingTask(NULL), actionHelper(this, NULL), cookieInfo(), logicalAddress(logicalAddress_),
pollingFrequency(1), pollingCounter(1), timeoutStart(0), childTransitionDelay(5000), timeoutStart(0), childTransitionDelay(5000), transitionSourceMode(_MODE_POWER_DOWN),
transitionSourceMode(_MODE_POWER_DOWN), transitionSourceSubMode(SUBMODE_NONE), transitionSourceSubMode(SUBMODE_NONE), deviceSwitch(setDeviceSwitch)
deviceSwitch(setDeviceSwitch)
{ {
commandQueue = QueueFactory::instance()-> commandQueue = QueueFactory::instance()->
createMessageQueue(cmdQueueSize, CommandMessage::MAX_MESSAGE_SIZE); createMessageQueue(cmdQueueSize, CommandMessage::MAX_MESSAGE_SIZE);
@ -70,14 +69,6 @@ ReturnValue_t DeviceHandlerBase::performOperation(uint8_t counter) {
return RETURN_OK; return RETURN_OK;
} }
if (pollingCounter != pollingFrequency) {
pollingCounter ++;
return RETURN_OK;
}
else {
pollingCounter = 1;
}
switch (getRmapAction()) { switch (getRmapAction()) {
case SEND_WRITE: case SEND_WRITE:
if ((cookieInfo.state == COOKIE_UNUSED)) { if ((cookieInfo.state == COOKIE_UNUSED)) {

15
devicehandlers/DeviceHandlerBase.h
View File

@ -668,6 +668,8 @@ protected:
* @param maxDelayCycles The maximum number of delay cycles the command waits until it times out. * @param maxDelayCycles The maximum number of delay cycles the command waits until it times out.
* @param periodic Indicates if the command is periodic (i.e. it is sent by the device repeatedly without request) or not. * @param periodic Indicates if the command is periodic (i.e. it is sent by the device repeatedly without request) or not.
* Default is aperiodic (0) * Default is aperiodic (0)
* @param hasDifferentReplyId
* @param replyId
* @return RETURN_OK when the command was successfully inserted, COMMAND_MAP_ERROR else. * @return RETURN_OK when the command was successfully inserted, COMMAND_MAP_ERROR else.
*/ */
ReturnValue_t insertInCommandAndReplyMap(DeviceCommandId_t deviceCommand, ReturnValue_t insertInCommandAndReplyMap(DeviceCommandId_t deviceCommand,
@ -940,19 +942,6 @@ private:
*/ */
const uint32_t logicalAddress; const uint32_t logicalAddress;
/**
* Polling Frequency which specifies how often the communication functions
* and functionalities are called.
*
* This is not a time value. The time value depends on the
* respective period time of the polling sequence table.
* The actual time frequency can be calculated by multiplying that period
* with the polling frequency value. Defaults to 1 (communication operations called
* in each performOperation()).
*/
uint32_t pollingFrequency;
uint32_t pollingCounter;
/** /**
* Used for timing out mode transitions. * Used for timing out mode transitions.
* *