Merge branch 'mueller/refactor-tmtc-stack' into mueller/cfdp-routers
This commit is contained in:
@ -1,41 +1,8 @@
|
||||
#ifndef FSFW_RETURNVALUES_HASRETURNVALUESIF_H_
|
||||
#define FSFW_RETURNVALUES_HASRETURNVALUESIF_H_
|
||||
#ifndef FSFW_RETURNVALUES_HASRETURNVALUES_IF_H_
|
||||
#define FSFW_RETURNVALUES_HASRETURNVALUES_IF_H_
|
||||
|
||||
#include <returnvalues/classIds.h>
|
||||
#warning "This header is deprecated, please include returnvalue.h"
|
||||
|
||||
#include <cstdint>
|
||||
#include "returnvalue.h"
|
||||
|
||||
#include "FwClassIds.h"
|
||||
|
||||
#define MAKE_RETURN_CODE(number) ((INTERFACE_ID << 8) + (number))
|
||||
typedef uint16_t ReturnValue_t;
|
||||
|
||||
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 result
|
||||
|
||||
class HasReturnvaluesIF {
|
||||
public:
|
||||
static const ReturnValue_t RETURN_OK = result::OK;
|
||||
static const ReturnValue_t RETURN_FAILED = result::FAILED;
|
||||
|
||||
virtual ~HasReturnvaluesIF() = default;
|
||||
|
||||
/**
|
||||
* 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 classId, uint8_t number) {
|
||||
return result::makeCode(classId, number);
|
||||
}
|
||||
};
|
||||
|
||||
#endif /* FSFW_RETURNVALUES_HASRETURNVALUESIF_H_ */
|
||||
#endif /* FSFW_RETURNVALUES_HASRETURNVALUES_IF_H_ */
|
||||
|
31
src/fsfw/returnvalues/returnvalue.h
Normal file
31
src/fsfw/returnvalues/returnvalue.h
Normal file
@ -0,0 +1,31 @@
|
||||
#ifndef FSFW_RETURNVALUES_RETURNVALUE_H_
|
||||
#define FSFW_RETURNVALUES_RETURNVALUE_H_
|
||||
|
||||
#include <returnvalues/classIds.h>
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
#include "FwClassIds.h"
|
||||
|
||||
#define MAKE_RETURN_CODE(number) ((INTERFACE_ID << 8) + (number))
|
||||
|
||||
typedef uint16_t ReturnValue_t;
|
||||
|
||||
namespace returnvalue {
|
||||
static const ReturnValue_t OK = 0;
|
||||
static const ReturnValue_t FAILED = 1;
|
||||
|
||||
/**
|
||||
* It is discouraged to use the input parameters 0,0 and 0,1 as this
|
||||
* will generate the returnvalue::OK and returnvalue::FAILED returnvalues.
|
||||
* @param interfaceId
|
||||
* @param number
|
||||
* @return
|
||||
*/
|
||||
static constexpr ReturnValue_t makeCode(uint8_t classId, uint8_t number) {
|
||||
return (static_cast<ReturnValue_t>(classId) << 8) + number;
|
||||
}
|
||||
|
||||
} // namespace returnvalue
|
||||
|
||||
#endif /* FSFW_RETURNVALUES_RETURNVALUE_H_ */
|
Reference in New Issue
Block a user