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

Update FSFW from Upstream #27

Merged
muellerr merged 523 commits from mueller/update-from-upstream into develop 2022-05-17 10:06:59 +02:00
Conversation 0 Commits 523 Files Changed 936 +7 -2
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b8cfb36426 - Show all commits

5
src/fsfw/pus/Service11TelecommandScheduling.h
View File

@ -39,6 +39,11 @@ class Service11TelecommandScheduling final : public PusServiceBase {
static constexpr ReturnValue_t INVALID_TYPE_TIME_WINDOW = static constexpr ReturnValue_t INVALID_TYPE_TIME_WINDOW =
HasReturnvaluesIF::makeReturnCode(CLASS_ID, 1); HasReturnvaluesIF::makeReturnCode(CLASS_ID, 1);
static constexpr ReturnValue_t TIMESHIFTING_NOT_POSSIBLE =
HasReturnvaluesIF::makeReturnCode(CLASS_ID, 2);
static constexpr ReturnValue_t INVALID_RELATIVE_TIME =
HasReturnvaluesIF::makeReturnCode(CLASS_ID, 3);
// The types of PUS-11 subservices // The types of PUS-11 subservices
enum Subservice : uint8_t { enum Subservice : uint8_t {
ENABLE_SCHEDULING = 1, ENABLE_SCHEDULING = 1,

4
src/fsfw/pus/Service11TelecommandScheduling.tpp
View File

@ -345,7 +345,7 @@ inline ReturnValue_t Service11TelecommandScheduling<MAX_NUM_TCS>::doTimeshiftAct
"Service11TelecommandScheduling::doTimeshiftActivity: Either 0 or more than 1 TCs found. " "Service11TelecommandScheduling::doTimeshiftActivity: Either 0 or more than 1 TCs found. "
"No explicit timeshifting possible\n"); "No explicit timeshifting possible\n");
#endif #endif
return RETURN_FAILED; return TIMESHIFTING_NOT_POSSIBLE;
} }
// temporarily hold the item // temporarily hold the item
@ -380,7 +380,7 @@ inline ReturnValue_t Service11TelecommandScheduling<MAX_NUM_TCS>::doFilterTimesh
return result; return result;
} }
if (relativeTime == 0) { if (relativeTime == 0) {
return RETURN_FAILED; return INVALID_RELATIVE_TIME;
} }
// Do time window // Do time window