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

Update FSFW from upstream #71

Closed
muellerr wants to merge 1112 commits from development into eive/develop
pull from: development
merge into: eive:eive/develop
Conversation 0 Commits 1112 Files Changed 1041 +12604 -7022
660 changed files with 12604 additions and 7022 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 356d778743 - Show all commits

4
src/fsfw/pus/Service1TelecommandVerification.cpp
View File

@@ -120,9 +120,9 @@ ReturnValue_t Service1TelecommandVerification::initialize() {
} }
storeHelper.setTmStore(*tmStore); storeHelper.setTmStore(*tmStore);
} }
if(timeStamper == nullptr) { if (timeStamper == nullptr) {
timeStamper = ObjectManager::instance()->get<TimeStamperIF>(objects::TIME_STAMPER); timeStamper = ObjectManager::instance()->get<TimeStamperIF>(objects::TIME_STAMPER);
if(timeStamper == nullptr) { if (timeStamper == nullptr) {
return ObjectManagerIF::CHILD_INIT_FAILED; return ObjectManagerIF::CHILD_INIT_FAILED;
} }
} else { } else {