From 6afa3ee61b28d975c2b9812cb37656effba67e31 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 28 Jun 2021 17:49:24 +0200 Subject: [PATCH 1/3] gitmodules and tmtc update --- .gitmodules | 2 +- tmtc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 44a86d86..6bde354a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,7 +9,7 @@ url = https://egit.irs.uni-stuttgart.de/eive/fsfw.git [submodule "tmtc"] path = tmtc - url = https://egit.irs.uni-stuttgart.de/eive/eive_tmtc.git + url = https://egit.irs.uni-stuttgart.de/eive/eive-tmtc.git [submodule "thirdparty/lwgps"] path = thirdparty/lwgps url = https://github.com/rmspacefish/lwgps.git diff --git a/tmtc b/tmtc index 2a986248..98deb844 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 2a9862489d57e2ccbf8b9ca5017f5e89395acddf +Subproject commit 98deb8444f84e94dc0252ad3c51eb61574174b90 From bd1e737634c69eb5ad5f219b23ab4f168aa02697 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 29 Jun 2021 11:23:18 +0200 Subject: [PATCH 2/3] fsfw_hal and tmtc update --- fsfw_hal | 2 +- tmtc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fsfw_hal b/fsfw_hal index 2533af3b..0f0fc0c2 160000 --- a/fsfw_hal +++ b/fsfw_hal @@ -1 +1 @@ -Subproject commit 2533af3b53804bc68436236370911e013a2b8f64 +Subproject commit 0f0fc0c2a69494de78856d956b679d9ee6ec339f diff --git a/tmtc b/tmtc index 98deb844..9d98eb6b 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 98deb8444f84e94dc0252ad3c51eb61574174b90 +Subproject commit 9d98eb6b606b40fa26aad12786894d1a99cb726c From e3d38f16e032e55f5d0ae14edad60c04a471c592 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 29 Jun 2021 16:09:32 +0200 Subject: [PATCH 3/3] added event manager --- bsp_q7s/InitMission.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bsp_q7s/InitMission.cpp b/bsp_q7s/InitMission.cpp index 25cd6abf..3e655255 100644 --- a/bsp_q7s/InitMission.cpp +++ b/bsp_q7s/InitMission.cpp @@ -104,10 +104,14 @@ void initmission::initTasks() { PeriodicTaskIF* pusEvents = factory->createPeriodicTask( "PUS_EVENTS", 60, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.200, missedDeadlineFunc); - result = pusVerification->addComponent(objects::PUS_SERVICE_5_EVENT_REPORTING); + result = pusEvents->addComponent(objects::PUS_SERVICE_5_EVENT_REPORTING); if(result != HasReturnvaluesIF::RETURN_OK) { initmission::printAddObjectError("PUS_EVENTS", objects::PUS_SERVICE_5_EVENT_REPORTING); } + result = pusEvents->addComponent(objects::EVENT_MANAGER); + if(result != HasReturnvaluesIF::RETURN_OK) { + initmission::printAddObjectError("PUS_MGMT", objects::EVENT_MANAGER); + } PeriodicTaskIF* pusHighPrio = factory->createPeriodicTask( "PUS_HIGH_PRIO", 50, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.200, missedDeadlineFunc);