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

Merge branch 'mueller/data-wrapper' into mueller/dhb-handle-device-tm

Browse Source
This commit is contained in:
Robin Müller
2022-08-30 14:03:45 +02:00
parent 3a47062f2a 192255df1c
commit 093052604a
4 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/fsfw/util/dataWrapper.h
View File

@ -10,6 +10,7 @@
namespace util {
struct RawData {
RawData() = default;
const uint8_t* data = nullptr;
size_t len = 0;
};
@ -17,8 +18,8 @@ struct RawData {
enum DataTypes { NONE, RAW, SERIALIZABLE };
union DataUnion {
RawData raw;
SerializeIF* serializable = nullptr;
RawData raw{};
SerializeIF* serializable;
};
struct DataWrapper {
@ -36,9 +37,8 @@ struct DataWrapper {
}
[[nodiscard]] bool isNull() const {
if (type == DataTypes::RAW and dataUnion.raw.data == nullptr or
(type == DataTypes::SERIALIZABLE and dataUnion.serializable == nullptr) or
(type == DataTypes::NONE)) {
if ((type == DataTypes::NONE) or (type == DataTypes::RAW and dataUnion.raw.data == nullptr) or
(type == DataTypes::SERIALIZABLE and dataUnion.serializable == nullptr)) {
return true;
}
return false;