KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity

Merge remote-tracking branch 'upstream/mueller/refactor-tmtc-stack' into mueller/tmtc-stack-refactoring

Browse Source
This commit is contained in:
Robin Müller 2022-08-16 17:25:22 +02:00
commit e3648b6e30
7 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG.md
View File

@ -8,10 +8,19 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
# [unreleased] # [unreleased]
# [v6.0.0]
## Added ## Added
- Add new `UnsignedByteField` class - Add new `UnsignedByteField` class
## Changes
- Overhaul of the TMTC stack, including various changes and improvements
for other modules
PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/655
which also includes a migration guide
# [v5.0.0] 25.07.2022 # [v5.0.0] 25.07.2022
## Changes ## Changes

2
src/fsfw/objectmanager/frameworkObjects.h
View File

@ -33,7 +33,7 @@ enum framework_objects : object_id_t {
TC_STORE = 0x534f0100, TC_STORE = 0x534f0100,
TM_STORE = 0x534f0200, TM_STORE = 0x534f0200,
TIME_STAMPER = 0x53500010, TIME_STAMPER = 0x53500010,
TC_VERIFICATOR = 0x53500020, VERIFICATION_REPORTER = 0x53500020,
FSFW_OBJECTS_END = 0x53ffffff, FSFW_OBJECTS_END = 0x53ffffff,
NO_OBJECT = 0xFFFFFFFF NO_OBJECT = 0xFFFFFFFF

2
src/fsfw/tcdistribution/PusDistributor.cpp
View File

@ -137,7 +137,7 @@ ReturnValue_t PusDistributor::initialize() {
return ObjectManagerIF::CHILD_INIT_FAILED; return ObjectManagerIF::CHILD_INIT_FAILED;
} }
if (verifyChannel == nullptr) { if (verifyChannel == nullptr) {
verifyChannel = ObjectManager::instance()->get<VerificationReporterIF>(objects::TC_VERIFICATOR); verifyChannel = ObjectManager::instance()->get<VerificationReporterIF>(objects::VERIFICATION_REPORTER);
if (verifyChannel == nullptr) { if (verifyChannel == nullptr) {
return ObjectManagerIF::CHILD_INIT_FAILED; return ObjectManagerIF::CHILD_INIT_FAILED;
} }

2
src/fsfw/tmtcservices/CommandingServiceBase.cpp
View File

@ -126,7 +126,7 @@ ReturnValue_t CommandingServiceBase::initialize() {
if (verificationReporter == nullptr) { if (verificationReporter == nullptr) {
verificationReporter = verificationReporter =
ObjectManager::instance()->get<VerificationReporterIF>(objects::TC_VERIFICATOR); ObjectManager::instance()->get<VerificationReporterIF>(objects::VERIFICATION_REPORTER);
if (verificationReporter == nullptr) { if (verificationReporter == nullptr) {
return ObjectManagerIF::CHILD_INIT_FAILED; return ObjectManagerIF::CHILD_INIT_FAILED;
} }

2
src/fsfw/tmtcservices/PusServiceBase.cpp
View File

@ -126,7 +126,7 @@ ReturnValue_t PusServiceBase::initialize() {
if (psbParams.verifReporter == nullptr) { if (psbParams.verifReporter == nullptr) {
psbParams.verifReporter = psbParams.verifReporter =
ObjectManager::instance()->get<VerificationReporterIF>(objects::TC_VERIFICATOR); ObjectManager::instance()->get<VerificationReporterIF>(objects::VERIFICATION_REPORTER);
if (psbParams.verifReporter == nullptr) { if (psbParams.verifReporter == nullptr) {
return ObjectManagerIF::CHILD_INIT_FAILED; return ObjectManagerIF::CHILD_INIT_FAILED;
} }

2
src/fsfw/tmtcservices/VerificationReporter.cpp
View File

@ -5,7 +5,7 @@
#include "fsfw/tmtcservices/PusVerificationReport.h" #include "fsfw/tmtcservices/PusVerificationReport.h"
object_id_t VerificationReporter::DEFAULT_RECEIVER = objects::PUS_SERVICE_1_VERIFICATION; object_id_t VerificationReporter::DEFAULT_RECEIVER = objects::PUS_SERVICE_1_VERIFICATION;
object_id_t VerificationReporter::DEFAULT_REPORTER = objects::TC_VERIFICATOR; object_id_t VerificationReporter::DEFAULT_REPORTER = objects::VERIFICATION_REPORTER;
VerificationReporter::VerificationReporter(object_id_t objectId, AcceptsVerifyMessageIF* receiver) VerificationReporter::VerificationReporter(object_id_t objectId, AcceptsVerifyMessageIF* receiver)
: SystemObject(objectId) { : SystemObject(objectId) {

2
unittests/tmtcservices/testPsb.cpp
View File

@ -211,7 +211,7 @@ TEST_CASE("Pus Service Base", "[pus-service-base]") {
SECTION("Auto Initialize Verification Reporter") { SECTION("Auto Initialize Verification Reporter") {
psbParams.verifReporter = nullptr; psbParams.verifReporter = nullptr;
psbParams.objectId = 1; psbParams.objectId = 1;
object_id_t reporterId = objects::TC_VERIFICATOR; object_id_t reporterId = objects::VERIFICATION_REPORTER;
PusVerificationReporterMock otherReporter(reporterId); PusVerificationReporterMock otherReporter(reporterId);
auto psb2 = PsbMock(psbParams); auto psb2 = PsbMock(psbParams);
REQUIRE(psb2.initialize() == result::OK); REQUIRE(psb2.initialize() == result::OK);