eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

PLOC Handler Update #234

Merged
muellerr merged 98 commits from meier/plocSupv into develop 2022-05-08 12:32:48 +02:00
Conversation 2 Commits 98 Files Changed 52 +3 -3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f8addd9365 - Show all commits

4
bsp_q7s/core/InitMission.cpp
View File

@ -120,9 +120,11 @@ void initmission::initTasks() {
if (result != HasReturnvaluesIF::RETURN_OK) {
initmission::printAddObjectError("GPS_CTRL", objects::GPS_CONTROLLER);
}
#endif /* OBSW_ADD_ACS_HANDLERS */
PeriodicTaskIF* sysTask = factory->createPeriodicTask(
"SYS_TASK", 40, PeriodicTaskIF::MINIMUM_STACK_SIZE * 2, 0.4, missedDeadlineFunc);
#if OBSW_ADD_ACS_HANDLERS == 1
result = sysTask->addComponent(objects::ACS_BOARD_ASS);
if (result != HasReturnvaluesIF::RETURN_OK) {
initmission::printAddObjectError("ACS_BOARD_ASS", objects::ACS_BOARD_ASS);
meierj marked this conversation as resolved Outdated
muellerr commented 2022-05-07 13:03:41 +02:00
Outdated
Review
Copy Link

This #endif needs to be moved above result = sysTask->addComponent(objects:: ACS_BOARD_ASS) I think.
Otherwise, there will be compile errors for certain preprocessor combinations (sysTask should always be created)

This `#endif` needs to be moved above `result = sysTask->addComponent(objects:: ACS_BOARD_ASS)` I think. Otherwise, there will be compile errors for certain preprocessor combinations (sysTask should always be created)
@ -240,7 +242,7 @@ void initmission::initTasks() {
#if OBSW_ADD_ACS_HANDLERS == 1
acsTask->startTask();
meierj marked this conversation as resolved Outdated
muellerr commented 2022-05-07 13:01:55 +02:00
Outdated
Review
Copy Link

I think the second part is not necessary

I think the second part is not necessary
#endif
#if OBSW_ADD_RTD_DEVICES == 1 || OBSW_ADD_RTD_DEVICES == 1
#if OBSW_ADD_RTD_DEVICES == 1
sysTask->startTask();
#endif
#if OBSW_ADD_PLOC_SUPERVISOR == 1

1
bsp_q7s/em/emObjectFactory.cpp
View File

@ -82,7 +82,6 @@
#include "mission/devices/RadiationSensorHandler.h"
#include "mission/devices/RwHandler.h"
#include "mission/devices/SolarArrayDeploymentHandler.h"
#include "mission/devices/SusHandler.h"
#include "mission/devices/SyrlinksHkHandler.h"
#include "mission/devices/Tmp1075Handler.h"
#include "mission/devices/devicedefinitions/GomspaceDefinitions.h"

1
bsp_q7s/fm/fmObjectFactory.cpp
View File

@ -81,7 +81,6 @@
#include "mission/devices/RadiationSensorHandler.h"
#include "mission/devices/RwHandler.h"
#include "mission/devices/SolarArrayDeploymentHandler.h"
#include "mission/devices/SusHandler.h"
#include "mission/devices/SyrlinksHkHandler.h"
#include "mission/devices/Tmp1075Handler.h"
#include "mission/devices/devicedefinitions/GomspaceDefinitions.h"