mohr/fsfw
1
0
Fork 0
forked from fsfw/fsfw
Code Pull Requests Activity

Merge remote-tracking branch 'origin/mueller/expand-retval-if' into mueller/refactor-tmtc-stack

Browse Source
This commit is contained in:
Robin Müller
2022-07-28 12:55:42 +02:00
parent 72bc5d4d60 5355e63711
commit fb4ba487b5
17 changed files with 166 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,19 +10,19 @@
#define MAKE_RETURN_CODE(number) ((INTERFACE_ID << 8) + (number))
typedef uint16_t ReturnValue_t;
namespace retval {
namespace result {
static constexpr ReturnValue_t OK = 0;
static constexpr ReturnValue_t FAILED = 1;
static constexpr ReturnValue_t makeCode(uint8_t classId, uint8_t number) {
return (static_cast<ReturnValue_t>(classId) << 8) + number;
}
} // namespace retval
} // namespace result
class HasReturnvaluesIF {
public:
static const ReturnValue_t RETURN_OK = retval::OK;
static const ReturnValue_t RETURN_FAILED = retval::FAILED;
static const ReturnValue_t RETURN_OK = result::OK;
static const ReturnValue_t RETURN_FAILED = result::FAILED;
virtual ~HasReturnvaluesIF() = default;
@ -33,8 +33,9 @@ class HasReturnvaluesIF {
* @param number
* @return
*/
static constexpr ReturnValue_t makeReturnCode(uint8_t classId, uint8_t number) {
return retval::makeCode(classId, number);
static constexpr ReturnValue_t makeReturnCode(
uint8_t classId, uint8_t number) {
return result::makeCode(classId, number);
}
};