From 8a6d292a488f0a70cf8180060034d1e81e47f16f Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Tue, 14 Mar 2023 18:29:21 +0100
Subject: [PATCH] bump fsfw, tmtc and allow spilling for pools

---
 CHANGELOG.md                    |  4 ++++
 fsfw                            |  2 +-
 mission/core/GenericFactory.cpp | 12 ++++++------
 tmtc                            |  2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15c9f891..f1fbad7d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,10 @@ will consitute of a breaking change warranting a new major release:
 - Store more TCP und UDP packets.
 - Bump fsfw for small tweak in local datapool manager: Re-enable or re-disabling dataset
   generation will not fail anymore.
+- Bump FSFW to simplify HK helpers: Was previously buggy and did not allow to use
+  minmum sampling frequency. Now both diagnostics and HK can use minimum
+  sampling frequency for requesting HK
+- Bump FSFW to allow the TC/TM/IPC pools to spill to higher pools/pool pages.
 
 ## Changed
 
diff --git a/fsfw b/fsfw
index b6b9d1d7..522bd41d 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit b6b9d1d7901c794f771771c1c3b6ac6d5fa2a08f
+Subproject commit 522bd41d6e760a9905a0346908cb8d891a506285
diff --git a/mission/core/GenericFactory.cpp b/mission/core/GenericFactory.cpp
index 76024784..3cbb727c 100644
--- a/mission/core/GenericFactory.cpp
+++ b/mission/core/GenericFactory.cpp
@@ -108,23 +108,23 @@ void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_, PusTmFun
   {
     PoolManager::LocalPoolConfig poolCfg = {{250, 16},  {250, 32},   {250, 64},
                                             {150, 128}, {120, 1024}, {120, 2048}};
-    tcStore = new PoolManager(objects::TC_STORE, poolCfg);
+    tcStore = new PoolManager(objects::TC_STORE, poolCfg, true);
   }
 
   {
-    PoolManager::LocalPoolConfig poolCfg = {{300, 32},  {300, 32},   {400, 64},   {250, 128},
-                                            {150, 512}, {150, 1024}, {150, 1024}, {150, 2048}};
-    *tmStore = new PoolManager(objects::TM_STORE, poolCfg);
+    PoolManager::LocalPoolConfig poolCfg = {{600, 32},   {400, 64},   {400, 128}, {300, 512},
+                                            {150, 1024}, {150, 1024}, {150, 2048}};
+    *tmStore = new PoolManager(objects::TM_STORE, poolCfg, true);
   }
 
   {
     PoolManager::LocalPoolConfig poolCfg = {{300, 16},  {200, 32}, {150, 64},  {150, 128},
                                             {100, 256}, {50, 512}, {50, 1024}, {10, 2048}};
-    *ipcStore = new PoolManager(objects::IPC_STORE, poolCfg);
+    *ipcStore = new PoolManager(objects::IPC_STORE, poolCfg, true);
   }
   PoolManager::LocalPoolConfig poolCfg = {{300, 32},  {400, 64},   {250, 128},
                                           {150, 512}, {150, 1024}, {150, 2048}};
-  auto* ramToFileStore = new PoolManager(objects::DOWNLINK_RAM_STORE, poolCfg);
+  auto* ramToFileStore = new PoolManager(objects::DOWNLINK_RAM_STORE, poolCfg, true);
 
 #if OBSW_ADD_TCPIP_SERVERS == 1
 #if OBSW_ADD_TMTC_UDP_SERVER == 1
diff --git a/tmtc b/tmtc
index fe6390fa..4f48c25b 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit fe6390fab3638d46913134534905b1927513be8f
+Subproject commit 4f48c25bf757b6c056072049fe5965da890b4f5b