From 20d42add0348941baba7b079f03ba0ff57bfd083 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Tue, 30 Aug 2022 12:07:09 +0200
Subject: [PATCH 1/3] add new data wrapper helper type

---
 src/fsfw/util/dataWrapper.h | 52 +++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 src/fsfw/util/dataWrapper.h

diff --git a/src/fsfw/util/dataWrapper.h b/src/fsfw/util/dataWrapper.h
new file mode 100644
index 00000000..f5dab447
--- /dev/null
+++ b/src/fsfw/util/dataWrapper.h
@@ -0,0 +1,52 @@
+#ifndef FSFW_UTIL_DATAWRAPPER_H
+#define FSFW_UTIL_DATAWRAPPER_H
+
+#include <cstddef>
+#include <cstdint>
+#include <utility>
+
+#include "fsfw/serialize.h"
+
+namespace util {
+
+struct RawData {
+  const uint8_t* data;
+  size_t len;
+};
+
+enum DataTypes { RAW, SERIALIZABLE };
+
+union DataUnion {
+  RawData raw;
+  SerializeIF* serializable;
+};
+
+struct DataWrapper {
+  DataTypes type;
+  DataUnion dataUnion;
+  using BufPairT = std::pair<const uint8_t*, size_t>;
+
+  [[nodiscard]] size_t getLength() const {
+    if (type == DataTypes::RAW) {
+      return dataUnion.raw.len;
+    } else if (type == DataTypes::SERIALIZABLE and dataUnion.serializable != nullptr) {
+      return dataUnion.serializable->getSerializedSize();
+    }
+    return 0;
+  }
+
+  void setRawData(BufPairT bufPair) {
+    type = DataTypes::RAW;
+    dataUnion.raw.data = bufPair.first;
+    dataUnion.raw.len = bufPair.second;
+  }
+
+  void setSerializable(SerializeIF& serializable) {
+    type = DataTypes::SERIALIZABLE;
+    dataUnion.serializable = &serializable;
+  }
+};
+
+}  // namespace util
+
+#endif  // FSFW_UTIL_DATAWRAPPER_H

From 0f27c7e7e707fd3c901a43ac6de4ce072758d918 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Tue, 30 Aug 2022 13:24:29 +0200
Subject: [PATCH 2/3] extend data wrapper

---
 src/fsfw/util/dataWrapper.h | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/fsfw/util/dataWrapper.h b/src/fsfw/util/dataWrapper.h
index f5dab447..5ae2c043 100644
--- a/src/fsfw/util/dataWrapper.h
+++ b/src/fsfw/util/dataWrapper.h
@@ -10,19 +10,19 @@
 namespace util {
 
 struct RawData {
-  const uint8_t* data;
-  size_t len;
+  const uint8_t* data = nullptr;
+  size_t len = 0;
 };
 
-enum DataTypes { RAW, SERIALIZABLE };
+enum DataTypes { NONE, RAW, SERIALIZABLE };
 
 union DataUnion {
   RawData raw;
-  SerializeIF* serializable;
+  SerializeIF* serializable = nullptr;
 };
 
 struct DataWrapper {
-  DataTypes type;
+  DataTypes type = DataTypes::NONE;
   DataUnion dataUnion;
   using BufPairT = std::pair<const uint8_t*, size_t>;
 
@@ -35,6 +35,14 @@ struct DataWrapper {
     return 0;
   }
 
+  [[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)) {
+      return true;
+    }
+    return false;
+  }
   void setRawData(BufPairT bufPair) {
     type = DataTypes::RAW;
     dataUnion.raw.data = bufPair.first;

From c756297e5c1ece6a2e22aa036c9a8c1d5a2e435b Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Tue, 30 Aug 2022 13:39:44 +0200
Subject: [PATCH 3/3] data wrapper update

---
 src/fsfw/util/dataWrapper.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/fsfw/util/dataWrapper.h b/src/fsfw/util/dataWrapper.h
index 5ae2c043..8bb373e6 100644
--- a/src/fsfw/util/dataWrapper.h
+++ b/src/fsfw/util/dataWrapper.h
@@ -36,9 +36,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;