v1.10.0 #220

Merged
meierj merged 592 commits from develop into main 2022-04-22 07:42:20 +02:00
3 changed files with 3 additions and 3 deletions
Showing only changes of commit e2ad666d07 - Show all commits

2
fsfw

@ -1 +1 @@
Subproject commit 82a645debaa43231ecb3d7e2c40cffc22546c348
Subproject commit 84f95e8d7641be7a83faf1cbee718c6cc5de152d

View File

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

View File

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