Merge branch 'mueller/add-tc-scheduler-pus-11' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/add-tc-scheduler-pus-11

This commit is contained in:
Robin Müller 2022-05-13 11:58:45 +02:00
commit 5a4539def4

View File

@ -303,14 +303,15 @@ inline ReturnValue_t Service11TelecommandScheduling<MAX_NUM_TCS>::doTimeshiftAct
return result; return result;
} }
if (relativeTime == 0) { if (relativeTime == 0) {
return RETURN_FAILED; return INVALID_RELATIVE_TIME;
} }
// TODO further check sanity of the relative time? // TODO further check sanity of the relative time?
// Get request ID // Get request ID
uint64_t requestId; uint64_t requestId;
if (getRequestIdFromData(data, size, requestId) != RETURN_OK) { result = getRequestIdFromData(data, size, requestId);
return RETURN_FAILED; if (result != RETURN_OK) {
return result;
} }
if (debugMode) { if (debugMode) {