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

Merge remote-tracking branch 'origin/develop' into periodic_hk_helper_simplification

Browse Source
This commit is contained in:
Robin Müller 2023-03-14 18:23:57 +01:00
commit afbe5e1f65
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- Rename FW subsystem ID from `PCDU_2` to `POWER_SYSTEM_IF`. - Rename FW subsystem ID from `PCDU_2` to `POWER_SYSTEM_IF`.
- Add new `SWITCH_UNKNOWN` returnvalue in `PowerSwitchIF`. - Add new `SWITCH_UNKNOWN` returnvalue in `PowerSwitchIF`.
- Simplify `PeriodicHousekeepingHelper`: No non-diagnostic handling - Simplify `PeriodicHousekeepingHelper`: No non-diagnostic handling
- Pool Manager now allows enabling the `spillToHigherPools` option.
# [v6.0.0] # [v6.0.0]

4
src/fsfw/storagemanager/PoolManager.cpp
View File

@ -2,8 +2,8 @@
#include "fsfw/FSFW.h" #include "fsfw/FSFW.h"
PoolManager::PoolManager(object_id_t setObjectId, const LocalPoolConfig& localPoolConfig) PoolManager::PoolManager(object_id_t setObjectId, const LocalPoolConfig& localPoolConfig, bool spillToHigherPools)
: LocalPool(setObjectId, localPoolConfig, true) { : LocalPool(setObjectId, localPoolConfig, true, spillToHigherPools) {
mutex = MutexFactory::instance()->createMutex(); mutex = MutexFactory::instance()->createMutex();
} }

2
src/fsfw/storagemanager/PoolManager.h
View File

@ -21,7 +21,7 @@
*/ */
class PoolManager : public LocalPool { class PoolManager : public LocalPool {
public: public:
PoolManager(object_id_t setObjectId, const LocalPoolConfig& poolConfig); PoolManager(object_id_t setObjectId, const LocalPoolConfig& poolConfig, bool spillToHigherPools);
/** /**
* @brief In the PoolManager's destructor all allocated memory * @brief In the PoolManager's destructor all allocated memory