From 6579200f5551f93349ce018127b249ab7cdb3739 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 6 Mar 2020 19:01:31 +0100 Subject: [PATCH] removed counter, will be implemented in childclass --- devicehandlers/DeviceHandlerBase.cpp | 13 ++----------- devicehandlers/DeviceHandlerBase.h | 15 ++------------- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/devicehandlers/DeviceHandlerBase.cpp b/devicehandlers/DeviceHandlerBase.cpp index 1252d61f..e7b4c684 100644 --- a/devicehandlers/DeviceHandlerBase.cpp +++ b/devicehandlers/DeviceHandlerBase.cpp @@ -32,9 +32,8 @@ DeviceHandlerBase::DeviceHandlerBase(uint32_t logicalAddress_, ignoreMissedRepliesCount(0), fdirInstance(fdirInstance), hkSwitcher(this), defaultFDIRUsed(fdirInstance == NULL), switchOffWasReported(false), executingTask(NULL), actionHelper(this, NULL), cookieInfo(), logicalAddress(logicalAddress_), - pollingFrequency(1), pollingCounter(1), timeoutStart(0), childTransitionDelay(5000), - transitionSourceMode(_MODE_POWER_DOWN), transitionSourceSubMode(SUBMODE_NONE), - deviceSwitch(setDeviceSwitch) + timeoutStart(0), childTransitionDelay(5000), transitionSourceMode(_MODE_POWER_DOWN), + transitionSourceSubMode(SUBMODE_NONE), deviceSwitch(setDeviceSwitch) { commandQueue = QueueFactory::instance()-> createMessageQueue(cmdQueueSize, CommandMessage::MAX_MESSAGE_SIZE); @@ -70,14 +69,6 @@ ReturnValue_t DeviceHandlerBase::performOperation(uint8_t counter) { return RETURN_OK; } - if (pollingCounter != pollingFrequency) { - pollingCounter ++; - return RETURN_OK; - } - else { - pollingCounter = 1; - } - switch (getRmapAction()) { case SEND_WRITE: if ((cookieInfo.state == COOKIE_UNUSED)) { diff --git a/devicehandlers/DeviceHandlerBase.h b/devicehandlers/DeviceHandlerBase.h index 130aedb9..7586cc0f 100644 --- a/devicehandlers/DeviceHandlerBase.h +++ b/devicehandlers/DeviceHandlerBase.h @@ -668,6 +668,8 @@ protected: * @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. * Default is aperiodic (0) + * @param hasDifferentReplyId + * @param replyId * @return RETURN_OK when the command was successfully inserted, COMMAND_MAP_ERROR else. */ ReturnValue_t insertInCommandAndReplyMap(DeviceCommandId_t deviceCommand, @@ -940,19 +942,6 @@ private: */ 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. *