merge muller/master
This commit is contained in:
commit
868dc17651
2
.gitmodules
vendored
2
.gitmodules
vendored
@ -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
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user