From 1e395dc402e2f0f5ff328ec0b89b92fcfdd17f33 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Mon, 5 Sep 2022 16:25:02 +0200
Subject: [PATCH] set buffer expects const pointer now

---
 src/fsfw/serialize/SerialBufferAdapter.cpp  | 9 +--------
 src/fsfw/serialize/SerialBufferAdapter.h    | 3 +--
 src/fsfw/tmtcpacket/pus/tc/PusTcCreator.cpp | 2 +-
 src/fsfw/tmtcpacket/pus/tc/PusTcCreator.h   | 2 +-
 src/fsfw/tmtcpacket/pus/tm/PusTmCreator.cpp | 2 +-
 5 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/fsfw/serialize/SerialBufferAdapter.cpp b/src/fsfw/serialize/SerialBufferAdapter.cpp
index 0293191e..f387a1fc 100644
--- a/src/fsfw/serialize/SerialBufferAdapter.cpp
+++ b/src/fsfw/serialize/SerialBufferAdapter.cpp
@@ -119,14 +119,7 @@ const uint8_t* SerialBufferAdapter<count_t>::getConstBuffer() const {
 }
 
 template <typename count_t>
-void SerialBufferAdapter<count_t>::setBuffer(uint8_t* buffer, count_t bufferLength) {
-  this->buffer = buffer;
-  this->constBuffer = buffer;
-  this->bufferLength = bufferLength;
-}
-
-template <typename count_t>
-void SerialBufferAdapter<count_t>::setConstBuffer(const uint8_t* buf, count_t bufLen) {
+void SerialBufferAdapter<count_t>::setBuffer(const uint8_t* buf, count_t bufLen) {
   this->buffer = nullptr;
   this->bufferLength = bufLen;
   this->constBuffer = buf;
diff --git a/src/fsfw/serialize/SerialBufferAdapter.h b/src/fsfw/serialize/SerialBufferAdapter.h
index 395f93d2..45ac5f0f 100644
--- a/src/fsfw/serialize/SerialBufferAdapter.h
+++ b/src/fsfw/serialize/SerialBufferAdapter.h
@@ -65,8 +65,7 @@ class SerialBufferAdapter : public SerializeIF {
 
   uint8_t* getBuffer();
   [[nodiscard]] const uint8_t* getConstBuffer() const;
-  void setBuffer(uint8_t* buffer, count_t bufferLength);
-  void setConstBuffer(const uint8_t* buf, count_t bufLen);
+  void setBuffer(const uint8_t* buf, count_t bufLen);
 
  private:
   bool serializeLength = false;
diff --git a/src/fsfw/tmtcpacket/pus/tc/PusTcCreator.cpp b/src/fsfw/tmtcpacket/pus/tc/PusTcCreator.cpp
index 34d8396d..50e75d80 100644
--- a/src/fsfw/tmtcpacket/pus/tc/PusTcCreator.cpp
+++ b/src/fsfw/tmtcpacket/pus/tc/PusTcCreator.cpp
@@ -84,7 +84,7 @@ SpacePacketParams &PusTcCreator::getSpParams() { return spCreator.getParams(); }
 
 ReturnValue_t PusTcCreator::setRawUserData(const uint8_t *data, size_t len) {
   // TODO: Check length field?
-  pusParams.bufAdapter.setConstBuffer(data, len);
+  pusParams.bufAdapter.setBuffer(data, len);
   pusParams.appData = &pusParams.bufAdapter;
   updateSpLengthField();
   return returnvalue::OK;
diff --git a/src/fsfw/tmtcpacket/pus/tc/PusTcCreator.h b/src/fsfw/tmtcpacket/pus/tc/PusTcCreator.h
index abccef8d..0bd210b0 100644
--- a/src/fsfw/tmtcpacket/pus/tc/PusTcCreator.h
+++ b/src/fsfw/tmtcpacket/pus/tc/PusTcCreator.h
@@ -13,7 +13,7 @@ struct PusTcParams {
   PusTcParams(uint8_t service_, uint8_t subservice_) : service(service_), subservice(subservice_) {}
 
   void setRawAppData(const uint8_t *data, size_t len) {
-    bufAdapter.setConstBuffer(data, len);
+    bufAdapter.setBuffer(data, len);
     appData = &bufAdapter;
   }
 
diff --git a/src/fsfw/tmtcpacket/pus/tm/PusTmCreator.cpp b/src/fsfw/tmtcpacket/pus/tm/PusTmCreator.cpp
index 41512c07..02955ffe 100644
--- a/src/fsfw/tmtcpacket/pus/tm/PusTmCreator.cpp
+++ b/src/fsfw/tmtcpacket/pus/tm/PusTmCreator.cpp
@@ -131,7 +131,7 @@ ReturnValue_t PusTmCreator::setRawUserData(const uint8_t* data, size_t len) {
   if (data == nullptr or len == 0) {
     pusParams.sourceData = nullptr;
   } else {
-    pusParams.adapter.setConstBuffer(data, len);
+    pusParams.adapter.setBuffer(data, len);
     pusParams.sourceData = &pusParams.adapter;
   }
   updateSpLengthField();