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

Merge remote-tracking branch 'upstream/mueller/data-wrapper' into develop

Browse Source
This commit is contained in:
Robin Müller
2022-08-30 16:05:02 +02:00
parent 21ac86619e 8d1777fa0c
commit 6ebd6a965b
2 changed files with 44 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,8 @@
namespace util {
using BufPair = std::pair<const uint8_t*, size_t>;
struct RawData {
RawData() = default;
const uint8_t* data = nullptr;
@ -23,7 +25,6 @@ union DataUnion {
};
struct DataWrapper {
using BufPairT = std::pair<const uint8_t*, size_t>;
DataWrapper() = default;
@ -31,7 +32,7 @@ struct DataWrapper {
setRawData({data, size});
}
explicit DataWrapper(BufPairT raw): type(DataTypes::RAW) {
explicit DataWrapper(BufPair raw): type(DataTypes::RAW) {
setRawData(raw);
}
@ -42,7 +43,6 @@ struct DataWrapper {
DataTypes type = DataTypes::NONE;
DataUnion dataUnion;
[[nodiscard]] size_t getLength() const {
if (type == DataTypes::RAW) {
return dataUnion.raw.len;
@ -59,8 +59,12 @@ struct DataWrapper {
}
return false;
}
<<<<<<< HEAD
void setRawData(BufPairT bufPair) {
=======
void setRawData(BufPair bufPair) {
>>>>>>> upstream/mueller/data-wrapper
type = DataTypes::RAW;
dataUnion.raw.data = bufPair.first;
dataUnion.raw.len = bufPair.second;