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

v1.9.0 #175

Merged
muellerr merged 623 commits from develop into main 2022-03-08 10:32:41 +01:00
Conversation 0 Commits 623 Files Changed 417 +42511 -26430
417 changed files with 42511 additions and 26430 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 10a2973dc7 - Show all commits

2
fsfw

Submodule fsfw updated: 8b1c277c58...84f95e8d76

2
linux/devices/startracker/StarTrackerHandler.cpp
View File

@@ -672,7 +672,7 @@ ReturnValue_t StarTrackerHandler::isModeCombinationValid(Mode_t mode, Submode_t
return INVALID_SUBMODE; return INVALID_SUBMODE;
} }
default: default:
return HasModesIF::MOVE_IS_INVALID; return HasModesIF::INVALID_MODE;
} }
} }

2
mission/controller/ThermalController.cpp
View File

@@ -42,7 +42,7 @@ ReturnValue_t ThermalController::checkModeCommand(Mode_t mode, Submode_t submode
return INVALID_SUBMODE; return INVALID_SUBMODE;
} }
if ((mode != MODE_OFF) && (mode != MODE_ON) && (mode != MODE_NORMAL)) { if ((mode != MODE_OFF) && (mode != MODE_ON) && (mode != MODE_NORMAL)) {
return MOVE_IS_INVALID; return INVALID_MODE;
} }
return RETURN_OK; return RETURN_OK;
} }