From 9c36898dcd376062e619914d1c1179d8e44bce15 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 5 Sep 2023 16:05:28 +0200 Subject: [PATCH] increase TM store size a bit --- fsfw | 2 +- mission/genericFactory.cpp | 7 ++++--- tmtc | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/fsfw b/fsfw index 470f589b..448fbd0d 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 470f589bde405c39f5a7fbf191b11b8b48058128 +Subproject commit 448fbd0d388fe0b19de9b65ee7853681306fd546 diff --git a/mission/genericFactory.cpp b/mission/genericFactory.cpp index e2c4511e..9d2778f3 100644 --- a/mission/genericFactory.cpp +++ b/mission/genericFactory.cpp @@ -112,19 +112,19 @@ void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_, PusTmFun StorageManagerIF* tcStore; { PoolManager::LocalPoolConfig poolCfg = {{250, 16}, {250, 32}, {250, 64}, - {150, 128}, {120, 1024}, {120, 2048}}; + {150, 128}, {120, 1200}, {120, 2048}}; tcStore = new PoolManager(objects::TC_STORE, poolCfg); } { PoolManager::LocalPoolConfig poolCfg = {{600, 32}, {400, 64}, {400, 128}, - {300, 512}, {250, 1024}, {150, 2048}}; + {300, 512}, {300, 1200}, {120, 2048}}; *tmStore = new PoolManager(objects::TM_STORE, poolCfg); } { PoolManager::LocalPoolConfig poolCfg = {{300, 16}, {250, 32}, {150, 64}, {150, 128}, - {100, 256}, {50, 512}, {50, 1024}, {10, 2048}}; + {100, 256}, {50, 512}, {50, 1200}, {10, 2048}}; *ipcStore = new PoolManager(objects::IPC_STORE, poolCfg); } PoolManager::LocalPoolConfig poolCfg = {{300, 32}, {400, 64}, {250, 128}, @@ -284,6 +284,7 @@ void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_, PusTmFun UnsignedByteField apid(config::EIVE_LOCAL_CFDP_ENTITY_ID); cfdp::EntityId localId(apid); GROUND_REMOTE_CFG.defaultChecksum = cfdp::ChecksumType::CRC_32; + GROUND_REMOTE_CFG.maxFileSegmentLen = 990; CfdpHandlerCfg cfdpCfg(localId, indicationCfg, *eiveUserHandler, EIVE_FAULT_HANDLER, PACKET_LIST, LOST_SEGMENTS, REMOTE_CFG_PROVIDER); auto* cfdpHandler = new CfdpHandler(params, cfdpCfg); diff --git a/tmtc b/tmtc index 25377ccf..1b0a7aea 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 25377ccfa227fb77f4cab3d593f7953516b88bf9 +Subproject commit 1b0a7aeabda128cb6ae1092541f100df288d38b1