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

bool is mapped to uint8 now for pod type conversion

Browse Source
This commit is contained in:
Robin Müller 2020-10-19 00:25:03 +02:00
parent 8b8324f21c
commit ad9ac7537e
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
globalfunctions/Type.h
View File

@ -59,6 +59,10 @@ struct PodTypeConversion {
static const Type::ActualType_t type = Type::UNKNOWN_TYPE; static const Type::ActualType_t type = Type::UNKNOWN_TYPE;
}; };
template<> template<>
struct PodTypeConversion<bool> {
static const Type::ActualType_t type = Type::UINT8_T;
};
template<>
struct PodTypeConversion<uint8_t> { struct PodTypeConversion<uint8_t> {
static const Type::ActualType_t type = Type::UINT8_T; static const Type::ActualType_t type = Type::UINT8_T;
}; };

12
parameters/ParameterHelper.cpp
View File

@ -9,6 +9,10 @@ ParameterHelper::~ParameterHelper() {
} }
ReturnValue_t ParameterHelper::handleParameterMessage(CommandMessage *message) { ReturnValue_t ParameterHelper::handleParameterMessage(CommandMessage *message) {
if(storage == nullptr) {
return HasReturnvaluesIF::RETURN_FAILED;
}
ReturnValue_t result = HasReturnvaluesIF::RETURN_FAILED; ReturnValue_t result = HasReturnvaluesIF::RETURN_FAILED;
switch (message->getCommand()) { switch (message->getCommand()) {
case ParameterMessage::CMD_PARAMETER_DUMP: { case ParameterMessage::CMD_PARAMETER_DUMP: {
@ -114,13 +118,11 @@ ReturnValue_t ParameterHelper::sendParameter(MessageQueueId_t to, uint32_t id,
ReturnValue_t ParameterHelper::initialize() { ReturnValue_t ParameterHelper::initialize() {
ownerQueueId = owner->getCommandQueue(); ownerQueueId = owner->getCommandQueue();
storage = objectManager->get<StorageManagerIF>(objects::IPC_STORE); storage = objectManager->get<StorageManagerIF>(objects::IPC_STORE);
if (storage == NULL) { if (storage == nullptr) {
return HasReturnvaluesIF::RETURN_FAILED; return ObjectManagerIF::CHILD_INIT_FAILED;
} else {
return HasReturnvaluesIF::RETURN_OK;
} }
return HasReturnvaluesIF::RETURN_OK;
} }
void ParameterHelper::rejectCommand(MessageQueueId_t to, ReturnValue_t reason, void ParameterHelper::rejectCommand(MessageQueueId_t to, ReturnValue_t reason,

2
parameters/ParameterWrapper.h
View File

@ -68,7 +68,7 @@ public:
template<typename T> template<typename T>
void set(const T *readonlyData, uint8_t rows, uint8_t columns) { void set(const T *readonlyData, uint8_t rows, uint8_t columns) {
this->data = NULL; this->data = nullptr;
this->readonlyData = readonlyData; this->readonlyData = readonlyData;
this->type = PodTypeConversion<T>::type; this->type = PodTypeConversion<T>::type;
this->rows = rows; this->rows = rows;