eive/fsfw
eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

Update from upstream #85

Merged
meierj merged 91 commits from mueller/update-from-upstream into develop 2022-05-16 22:08:28 +02:00
Conversation 0 Commits 91 Files Changed 29 +4 -3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5a4539def4 - Show all commits

7
src/fsfw/pus/Service11TelecommandScheduling.tpp
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) {