From beb99d53f74f646dc6514c835b31a4ee557c2ef6 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 2 Nov 2022 19:35:35 +0100 Subject: [PATCH] pus test service has higher prio now --- bsp_q7s/core/InitMission.cpp | 12 +++++++----- fsfw | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/bsp_q7s/core/InitMission.cpp b/bsp_q7s/core/InitMission.cpp index 96b2fdfc..4423a8fe 100644 --- a/bsp_q7s/core/InitMission.cpp +++ b/bsp_q7s/core/InitMission.cpp @@ -467,7 +467,7 @@ void initmission::createPusTasks(TaskFactory& factory, taskVec.push_back(pusEvents); PeriodicTaskIF* pusHighPrio = factory.createPeriodicTask( - "PUS_HIGH_PRIO", 50, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.200, missedDeadlineFunc); + "PUS_HIGH_PRIO", 50, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.2, missedDeadlineFunc); result = pusHighPrio->addComponent(objects::PUS_SERVICE_2_DEVICE_ACCESS); if (result != returnvalue::OK) { initmission::printAddObjectError("PUS_2", objects::PUS_SERVICE_2_DEVICE_ACCESS); @@ -476,6 +476,7 @@ void initmission::createPusTasks(TaskFactory& factory, if (result != returnvalue::OK) { initmission::printAddObjectError("PUS_9", objects::PUS_SERVICE_9_TIME_MGMT); } + taskVec.push_back(pusHighPrio); PeriodicTaskIF* pusMedPrio = factory.createPeriodicTask( @@ -505,14 +506,15 @@ void initmission::createPusTasks(TaskFactory& factory, if (result != returnvalue::OK) { initmission::printAddObjectError("PUS_201", objects::PUS_SERVICE_201_HEALTH); } + // Used for connection tests, therefore use higher priority + result = pusMedPrio->addComponent(objects::PUS_SERVICE_17_TEST); + if (result != returnvalue::OK) { + initmission::printAddObjectError("PUS_17", objects::PUS_SERVICE_17_TEST); + } taskVec.push_back(pusMedPrio); PeriodicTaskIF* pusLowPrio = factory.createPeriodicTask( "PUS_LOW_PRIO", 30, PeriodicTaskIF::MINIMUM_STACK_SIZE, 1.6, missedDeadlineFunc); - result = pusLowPrio->addComponent(objects::PUS_SERVICE_17_TEST); - if (result != returnvalue::OK) { - initmission::printAddObjectError("PUS_17", objects::PUS_SERVICE_17_TEST); - } result = pusLowPrio->addComponent(objects::INTERNAL_ERROR_REPORTER); if (result != returnvalue::OK) { initmission::printAddObjectError("ERROR_REPORTER", objects::INTERNAL_ERROR_REPORTER); diff --git a/fsfw b/fsfw index e1d4209f..91ebf98c 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit e1d4209fbe06581c36dd0a1b8113dfb56e673613 +Subproject commit 91ebf98c2851b0470a912c1c3279cb20e10a5490