From dc31358d525a9a8aed2eed855a68176c288c36dd Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Wed, 27 Jul 2022 21:31:09 +0200
Subject: [PATCH] adaption for SerializeIF

- Returns serialized and deserialized size now
---
 src/fsfw/serialize/SerializeIF.h | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/fsfw/serialize/SerializeIF.h b/src/fsfw/serialize/SerializeIF.h
index 47212ab1..5e7a2fb9 100644
--- a/src/fsfw/serialize/SerializeIF.h
+++ b/src/fsfw/serialize/SerializeIF.h
@@ -125,22 +125,26 @@ class SerializeIF {
    * @param streamEndianness
    * @return
    */
-  [[nodiscard]] virtual ReturnValue_t serialize(uint8_t *buffer, size_t maxSize,
+  [[nodiscard]] virtual ReturnValue_t serialize(uint8_t *buffer, size_t &serLen, size_t maxSize,
                                                 Endianness streamEndianness) const {
     size_t tmpSize = 0;
-    return serialize(&buffer, &tmpSize, maxSize, streamEndianness);
+    ReturnValue_t result = serialize(&buffer, &tmpSize, maxSize, streamEndianness);
+    serLen = tmpSize;
+    return result;
   }
   /**
    * Forwards to regular @serialize call with big (network) endianness
    */
-  [[nodiscard]] virtual ReturnValue_t serializeBe(uint8_t *buffer, size_t maxSize) const {
-    return serialize(buffer, maxSize, SerializeIF::Endianness::NETWORK);
+  [[nodiscard]] virtual ReturnValue_t serializeBe(uint8_t *buffer, size_t &serLen,
+                                                  size_t maxSize) const {
+    return serialize(buffer, serLen, maxSize, SerializeIF::Endianness::NETWORK);
   }
   /**
    * If endianness is not explicitly specified, use machine endianness
    */
-  [[nodiscard]] virtual ReturnValue_t serialize(uint8_t *buffer, size_t maxSize) const {
-    return serialize(buffer, maxSize, SerializeIF::Endianness::MACHINE);
+  [[nodiscard]] virtual ReturnValue_t serialize(uint8_t *buffer, size_t &serLen,
+                                                size_t maxSize) const {
+    return serialize(buffer, serLen, maxSize, SerializeIF::Endianness::MACHINE);
   }
 
   /**
@@ -151,21 +155,24 @@ class SerializeIF {
    * @param streamEndianness
    * @return
    */
-  virtual ReturnValue_t deSerialize(const uint8_t *buffer, size_t maxSize,
+  virtual ReturnValue_t deSerialize(const uint8_t *buffer, size_t &deserSize, size_t maxSize,
                                     Endianness streamEndianness) {
-    return deSerialize(&buffer, &maxSize, streamEndianness);
+    size_t deserLen = maxSize;
+    ReturnValue_t result = deSerialize(&buffer, &deserLen, streamEndianness);
+    deserSize = maxSize - deserLen;
+    return result;
   }
   /**
    * Forwards to regular @serialize call with big (network) endianness
    */
-  virtual ReturnValue_t deSerializeBe(const uint8_t *buffer, size_t maxSize) {
-    return deSerialize(buffer, maxSize, SerializeIF::Endianness::NETWORK);
+  virtual ReturnValue_t deSerializeBe(const uint8_t *buffer, size_t &deserSize, size_t maxSize) {
+    return deSerialize(buffer, deserSize, maxSize, SerializeIF::Endianness::NETWORK);
   }
   /**
    * If endianness is not explicitly specified, use machine endianness
    */
-  virtual ReturnValue_t deSerialize(const uint8_t *buffer, size_t maxSize) {
-    return deSerialize(buffer, maxSize, SerializeIF::Endianness::MACHINE);
+  virtual ReturnValue_t deSerialize(const uint8_t *buffer, size_t &deserSize, size_t maxSize) {
+    return deSerialize(buffer, deserSize, maxSize, SerializeIF::Endianness::MACHINE);
   }
 };