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

mueller/master #37

Closed
muellerr wants to merge 126 commits from mueller/master into eive/develop
pull from: mueller/master
merge into: eive:eive/develop
Conversation 0 Commits 126 Files Changed 42 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b6e243b8b3 - Show all commits

4
src/fsfw/returnvalues/HasReturnvaluesIF.h
View File

@ -22,9 +22,9 @@ public:
* @param number * @param number
* @return * @return
*/ */
static constexpr ReturnValue_t makeReturnCode(uint8_t interfaceId, static constexpr ReturnValue_t makeReturnCode(uint8_t classId,
uint8_t number) { uint8_t number) {
return (static_cast<ReturnValue_t>(interfaceId) << 8) + number; return (static_cast<ReturnValue_t>(classId) << 8) + number;
} }
}; };