bsp_q7s/core/InitMission.cpp

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

mission/system/tree/payloadModeTree.cpp

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

mission/system/tree/util.cpp

@@ -3,7 +3,7 @@
 #include "fsfw/serviceinterface.h"
 
 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;
   }
 }

mission/system/tree/util.h

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