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

v1.16.0 #323

Merged
muellerr merged 223 commits from develop into main 2022-11-18 14:23:24 +01:00
Conversation 0 Commits 223 Files Changed 152 +4 -4
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit aa86bc722f - Show all commits

2
bsp_q7s/core/InitMission.cpp
View File

@ -160,7 +160,7 @@ void initmission::initTasks() {
} }
#endif #endif
result = sysTask->addComponent(objects::ACS_SUBSYSTEM); result = sysTask->addComponent(objects::ACS_SUBSYSTEM);
if (result != HasReturnvaluesIF::RETURN_OK) { if (result != returnvalue::OK) {
initmission::printAddObjectError("ACS_SUBSYSTEM", objects::ACS_SUBSYSTEM); initmission::printAddObjectError("ACS_SUBSYSTEM", objects::ACS_SUBSYSTEM);
} }

2
mission/system/tree/payloadModeTree.cpp
View File

@ -3,7 +3,7 @@
#include <commonObjects.h> #include <commonObjects.h>
#include <fsfw/devicehandlers/DeviceHandlerIF.h> #include <fsfw/devicehandlers/DeviceHandlerIF.h>
#include <fsfw/modes/HasModesIF.h> #include <fsfw/modes/HasModesIF.h>
#include <fsfw/returnvalues/HasReturnvaluesIF.h> #include <fsfw/retval.h>
#include <fsfw/subsystem/Subsystem.h> #include <fsfw/subsystem/Subsystem.h>
#include "mission/devices/devicedefinitions/payloadPcduDefinitions.h" #include "mission/devices/devicedefinitions/payloadPcduDefinitions.h"

2
mission/system/tree/util.cpp
View File

@ -3,7 +3,7 @@
#include "fsfw/serviceinterface.h" #include "fsfw/serviceinterface.h"
void subsystem::checkInsert(ReturnValue_t result, const char* ctx) { void subsystem::checkInsert(ReturnValue_t result, const char* ctx) {
if (result != HasReturnvaluesIF::RETURN_OK) { if (result != returnvalue::OK) {
sif::warning << "satsystem::checkInsert: Insertion failed at " << ctx << std::endl; sif::warning << "satsystem::checkInsert: Insertion failed at " << ctx << std::endl;
} }
} }

2
mission/system/tree/util.h
View File

@ -1,7 +1,7 @@
#ifndef MISSION_SYSTEM_TREE_UTIL_H_ #ifndef MISSION_SYSTEM_TREE_UTIL_H_
#define MISSION_SYSTEM_TREE_UTIL_H_ #define MISSION_SYSTEM_TREE_UTIL_H_
#include <fsfw/returnvalues/HasReturnvaluesIF.h> #include <fsfw/retval.h>
namespace subsystem { namespace subsystem {