Merge branch 'master' into mueller/defaultcfg

This commit is contained in:
Steffen Gaisser 2020-11-02 14:48:23 +01:00
commit 2761ee8109

View File

@ -1,5 +1,5 @@
#ifndef FRAMEWORK_RETURNVALUES_HASRETURNVALUESIF_H_ #ifndef FSFW_RETURNVALUES_HASRETURNVALUESIF_H_
#define FRAMEWORK_RETURNVALUES_HASRETURNVALUESIF_H_ #define FSFW_RETURNVALUES_HASRETURNVALUESIF_H_
#include "FwClassIds.h" #include "FwClassIds.h"
#include <returnvalues/classIds.h> #include <returnvalues/classIds.h>
@ -15,9 +15,17 @@ public:
static const ReturnValue_t RETURN_FAILED = 1; static const ReturnValue_t RETURN_FAILED = 1;
virtual ~HasReturnvaluesIF() {} virtual ~HasReturnvaluesIF() {}
static ReturnValue_t makeReturnCode(uint8_t interfaceId, uint8_t number) { /**
return (interfaceId << 8) + number; * It is discouraged to use the input parameters 0,0 and 0,1 as this
* will generate the RETURN_OK and RETURN_FAILED returnvalues.
* @param interfaceId
* @param number
* @return
*/
static constexpr ReturnValue_t makeReturnCode(uint8_t interfaceId,
uint8_t number) {
return (static_cast<ReturnValue_t>(interfaceId) << 8) + number;
} }
}; };
#endif /* FRAMEWORK_RETURNVALUES_HASRETURNVALUESIF_H_ */ #endif /* FSFW_RETURNVALUES_HASRETURNVALUESIF_H_ */