esbo_ds/fsfw
3
0
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'one shot flag not static anymore' (#560) from eive/fsfw:mueller/test-task-one-shot-flag-not-static into development

Browse Source 
Reviewed-on: fsfw/fsfw#560
This commit is contained in:
Steffen Gaisser 2022-02-28 15:50:06 +01:00
commit 8920255565
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -10,6 +10,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
# [v5.0.0] # [v5.0.0]
## Changes
- `oneShotAction` flag in the `TestTask` class is not static anymore
## Removed ## Removed
- Removed the `HkSwitchHelper`. This module should not be needed anymore, now that the local - Removed the `HkSwitchHelper`. This module should not be needed anymore, now that the local

1
tests/src/fsfw_tests/integration/task/TestTask.cpp
View File

@ -3,7 +3,6 @@
#include <fsfw/objectmanager/ObjectManager.h> #include <fsfw/objectmanager/ObjectManager.h>
#include <fsfw/serviceinterface/ServiceInterface.h> #include <fsfw/serviceinterface/ServiceInterface.h>
bool TestTask::oneShotAction = true;
MutexIF* TestTask::testLock = nullptr; MutexIF* TestTask::testLock = nullptr;
TestTask::TestTask(object_id_t objectId) : SystemObject(objectId), testMode(testModes::A) { TestTask::TestTask(object_id_t objectId) : SystemObject(objectId), testMode(testModes::A) {

2
tests/src/fsfw_tests/integration/task/TestTask.h
View File

@ -29,7 +29,7 @@ class TestTask : public SystemObject, public ExecutableObjectIF, public HasRetur
bool testFlag = false; bool testFlag = false;
private: private:
static bool oneShotAction; bool oneShotAction = true;
static MutexIF* testLock; static MutexIF* testLock;
StorageManagerIF* IPCStore; StorageManagerIF* IPCStore;
}; };