From df68ec141bf5c7d6d7cba36c619fe37576161101 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Fri, 20 May 2022 08:59:25 +0200
Subject: [PATCH] more storage, bumped submodules

---
 CMakeLists.txt                    |  2 ++
 bsp_hosted/core/InitMission.cpp   |  4 ++++
 bsp_hosted/core/ObjectFactory.cpp | 27 +++++++++++++--------------
 example_common                    |  2 +-
 fsfw                              |  2 +-
 tmtc/tmtccmd                      |  2 +-
 6 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0f9fe92..312f3a1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,6 +15,8 @@ cmake_minimum_required(VERSION 3.13)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
+set(OBSW_MAX_SCHEDULED_TCS 200)
+
 if(NOT FSFW_OSAL)
   set(FSFW_OSAL
       host
diff --git a/bsp_hosted/core/InitMission.cpp b/bsp_hosted/core/InitMission.cpp
index 177dffe..a58e86a 100644
--- a/bsp_hosted/core/InitMission.cpp
+++ b/bsp_hosted/core/InitMission.cpp
@@ -164,6 +164,10 @@ void InitMission::createTasks() {
   if (result != HasReturnvaluesIF::RETURN_OK) {
     task::printInitError("PUS 200", objects::PUS_SERVICE_200_MODE_MGMT);
   }
+  result = pusMedPrio->addComponent(objects::PUS_SERVICE_11_TC_SCHEDULER);
+  if (result != HasReturnvaluesIF::RETURN_OK) {
+    task::printInitError("PUS 11", objects::PUS_SERVICE_11_TC_SCHEDULER);
+  }
 
 #ifdef __unix__
   currPrio = 30;
diff --git a/bsp_hosted/core/ObjectFactory.cpp b/bsp_hosted/core/ObjectFactory.cpp
index 6900a18..ce7e7e5 100644
--- a/bsp_hosted/core/ObjectFactory.cpp
+++ b/bsp_hosted/core/ObjectFactory.cpp
@@ -1,18 +1,14 @@
 #include "ObjectFactory.h"
 
-#include <bsp_hosted/fsfwconfig/objects/systemObjectList.h>
-#include <bsp_hosted/fsfwconfig/tmtc/apid.h>
-#include <fsfw/datapoollocal/LocalDataPoolManager.h>
-#include <fsfw/monitoring/MonitoringMessageContent.h>
-#include <fsfw/storagemanager/PoolManager.h>
-#include <fsfw/tmtcpacket/pus/tm.h>
-#include <fsfw/tmtcservices/CommandingServiceBase.h>
-#include <fsfw/tmtcservices/PusServiceBase.h>
-
 #include "OBSWConfig.h"
+#include "bsp_hosted/fsfwconfig/objects/systemObjectList.h"
+#include "bsp_hosted/fsfwconfig/tmtc/apid.h"
+#include "commonConfig.h"
 #include "example/core/GenericFactory.h"
 #include "example/test/FsfwTestTask.h"
 #include "example/utility/TmFunnel.h"
+#include "fsfw/storagemanager/PoolManager.h"
+#include "fsfw/tmtcservices/CommandingServiceBase.h"
 
 #if OBSW_USE_TCP_SERVER == 0
 #include <fsfw/osal/common/UdpTcPollingTask.h>
@@ -24,23 +20,26 @@
 
 void ObjectFactory::produce(void* args) {
   Factory::setStaticFrameworkObjectIds();
-  ObjectFactory::produceGenericObjects();
+
 #if OBSW_ADD_CORE_COMPONENTS == 1
   {
-    LocalPool::LocalPoolConfig poolCfg = {{16, 100}, {32, 50}, {64, 25}, {128, 15}, {1024, 5}};
+    LocalPool::LocalPoolConfig poolCfg = {{16, 100}, {32, 50},   {64, 40},
+                                          {128, 30}, {1024, 20}, {2048, 10}};
     new PoolManager(objects::TC_STORE, poolCfg);
   }
 
   {
-    LocalPool::LocalPoolConfig poolCfg = {{16, 100}, {32, 50}, {64, 25}, {128, 15}, {1024, 5}};
+    LocalPool::LocalPoolConfig poolCfg = {{16, 100}, {32, 50},   {64, 40},
+                                          {128, 30}, {1024, 20}, {2048, 10}};
     new PoolManager(objects::TM_STORE, poolCfg);
   }
 
   {
-    LocalPool::LocalPoolConfig poolCfg = {{16, 100}, {32, 50}, {64, 25}, {128, 15}, {1024, 5}};
+    LocalPool::LocalPoolConfig poolCfg = {{16, 100}, {32, 50},   {64, 40},
+                                          {128, 30}, {1024, 20}, {2048, 10}};
     new PoolManager(objects::IPC_STORE, poolCfg);
   }
-
+  ObjectFactory::produceGenericObjects();
   // TMTC Reception via TCP/IP socket
 #if OBSW_USE_TCP_SERVER == 0
   auto tmtcBridge = new UdpTmTcBridge(objects::TCPIP_TMTC_BRIDGE, objects::CCSDS_DISTRIBUTOR);
diff --git a/example_common b/example_common
index f17612b..4896003 160000
--- a/example_common
+++ b/example_common
@@ -1 +1 @@
-Subproject commit f17612bd0e2fe00d86002ce29453ef2d1fe82d86
+Subproject commit 4896003e3f14862f664b73190806558daf924d49
diff --git a/fsfw b/fsfw
index d0fc360..dac700b 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit d0fc360697e0fae7ccb4b827b8bc3d0398c342bc
+Subproject commit dac700b80a98d9bfb5a9153c47589ce72c9381fc
diff --git a/tmtc/tmtccmd b/tmtc/tmtccmd
index e81e6db..264ca3e 160000
--- a/tmtc/tmtccmd
+++ b/tmtc/tmtccmd
@@ -1 +1 @@
-Subproject commit e81e6dbd594c1cdf51cd355a724cbd267d9dee38
+Subproject commit 264ca3ec0c7210944fdd9d0d6b792de9d1e52394