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

Added opCode to performControlOperation

This commit is contained in:
Mikael 2023-09-18 16:01:03 +02:00
parent cfd4b1655a
commit f28ba61b02
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fsfw/controller/ControllerBase.cpp
View File

@ -78,7 +78,7 @@ void ControllerBase::announceMode(bool recursive) { triggerEvent(MODE_INFO, mode
ReturnValue_t ControllerBase::performOperation(uint8_t opCode) { ReturnValue_t ControllerBase::performOperation(uint8_t opCode) {
handleQueue(); handleQueue();
performControlOperation(); performControlOperation(opCode);
return returnvalue::OK; return returnvalue::OK;
} }

2
src/fsfw/controller/ControllerBase.h
View File

@ -61,7 +61,7 @@ class ControllerBase : public HasModesIF,
/** /**
* Periodic helper, implemented by child class. * Periodic helper, implemented by child class.
*/ */
virtual void performControlOperation() = 0; virtual void performControlOperation(uint8_t opCode) = 0;
ReturnValue_t checkModeCommand(Mode_t mode, Submode_t submode, ReturnValue_t checkModeCommand(Mode_t mode, Submode_t submode,
uint32_t *msToReachTheMode) override = 0; uint32_t *msToReachTheMode) override = 0;

2
src/fsfw/controller/ExtendedControllerBase.cpp
View File

@ -81,7 +81,7 @@ ReturnValue_t ExtendedControllerBase::initializeAfterTaskCreation() {
ReturnValue_t ExtendedControllerBase::performOperation(uint8_t opCode) { ReturnValue_t ExtendedControllerBase::performOperation(uint8_t opCode) {
handleQueue(); handleQueue();
performControlOperation(); performControlOperation(opCode);
/* We do this after performing control operation because variables will be set changed /* We do this after performing control operation because variables will be set changed
in this function. */ in this function. */
poolManager.performHkOperation(); poolManager.performHkOperation();

2
src/fsfw/controller/ExtendedControllerBase.h
View File

@ -44,7 +44,7 @@ class ExtendedControllerBase : public ControllerBase,
/** /**
* Periodic helper from ControllerBase, implemented by child class. * Periodic helper from ControllerBase, implemented by child class.
*/ */
void performControlOperation() override = 0; void performControlOperation(uint8_t opCode) override = 0;
// Handle the four messages mentioned above // Handle the four messages mentioned above
void handleQueue() override; void handleQueue() override;

2
src/fsfw_tests/integration/controller/TestController.cpp
View File

@ -13,7 +13,7 @@ ReturnValue_t TestController::handleCommandMessage(CommandMessage *message) {
return returnvalue::OK; return returnvalue::OK;
} }
void TestController::performControlOperation() {} void TestController::performControlOperation(uint8_t opCode) {}
void TestController::handleChangedDataset(sid_t sid, store_address_t storeId, bool *clearMessage) {} void TestController::handleChangedDataset(sid_t sid, store_address_t storeId, bool *clearMessage) {}

2
src/fsfw_tests/integration/controller/TestController.h
View File

@ -13,7 +13,7 @@ class TestController : public ExtendedControllerBase {
protected: protected:
// Extended Controller Base overrides // Extended Controller Base overrides
ReturnValue_t handleCommandMessage(CommandMessage* message) override; ReturnValue_t handleCommandMessage(CommandMessage* message) override;
void performControlOperation() override; void performControlOperation(uint8_t opCode) override;
// HasLocalDatapoolIF callbacks // HasLocalDatapoolIF callbacks
virtual void handleChangedDataset(sid_t sid, store_address_t storeId, virtual void handleChangedDataset(sid_t sid, store_address_t storeId,