From e302c89f7465dee400b75a43fd562b4ef1470c24 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Wed, 2 Nov 2022 15:48:13 +0100
Subject: [PATCH 1/3] health helper dtor bugfix

---
 src/fsfw/health/HealthHelper.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/fsfw/health/HealthHelper.cpp b/src/fsfw/health/HealthHelper.cpp
index bf1a92d2..f6077ea1 100644
--- a/src/fsfw/health/HealthHelper.cpp
+++ b/src/fsfw/health/HealthHelper.cpp
@@ -5,7 +5,11 @@
 HealthHelper::HealthHelper(HasHealthIF* owner, object_id_t objectId)
     : objectId(objectId), owner(owner) {}
 
-HealthHelper::~HealthHelper() { healthTable->removeObject(objectId); }
+HealthHelper::~HealthHelper() {
+  if (healthTable != nullptr) {
+    healthTable->removeObject(objectId);
+  }
+}
 
 ReturnValue_t HealthHelper::handleHealthCommand(CommandMessage* message) {
   switch (message->getCommand()) {

From e1d4209fbe06581c36dd0a1b8113dfb56e673613 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Wed, 2 Nov 2022 16:07:00 +0100
Subject: [PATCH 2/3] missing fifo pop command

---
 src/fsfw/osal/common/TcpTmTcServer.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/fsfw/osal/common/TcpTmTcServer.cpp b/src/fsfw/osal/common/TcpTmTcServer.cpp
index dff959ba..bc2cd152 100644
--- a/src/fsfw/osal/common/TcpTmTcServer.cpp
+++ b/src/fsfw/osal/common/TcpTmTcServer.cpp
@@ -274,6 +274,8 @@ ReturnValue_t TcpTmTcServer::handleTmSending(socket_t connSocket, bool& tmSent)
     ConstStorageAccessor storeAccessor(storeId);
     ReturnValue_t result = tmStore->getData(storeId, storeAccessor);
     if (result != returnvalue::OK) {
+      // Invalid entry, pop FIFO
+      tmtcBridge->tmFifo->pop();
       return result;
     }
     if (wiretappingEnabled) {

From 91ebf98c2851b0470a912c1c3279cb20e10a5490 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Wed, 2 Nov 2022 19:35:22 +0100
Subject: [PATCH 3/3] add new ping with data TC

---
 CMakeLists.txt                 | 12 +++++++++---
 src/fsfw/pus/Service17Test.cpp | 11 +++++++++++
 src/fsfw/pus/Service17Test.h   |  3 +++
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f31cd6bc..0c0d2bb4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -345,9 +345,15 @@ if(FSFW_BUILD_TESTS)
           DEPENDENCIES ${FSFW_TEST_TGT})
       else()
         setup_target_for_coverage_lcov(
-          NAME ${FSFW_TEST_TGT}_coverage EXECUTABLE ${FSFW_TEST_TGT}
-          DEPENDENCIES ${FSFW_TEST_TGT}
-          GENHTML_ARGS --html-epilog ${CMAKE_SOURCE_DIR}/unittests/lcov_epilog.html)
+          NAME
+          ${FSFW_TEST_TGT}_coverage
+          EXECUTABLE
+          ${FSFW_TEST_TGT}
+          DEPENDENCIES
+          ${FSFW_TEST_TGT}
+          GENHTML_ARGS
+          --html-epilog
+          ${CMAKE_SOURCE_DIR}/unittests/lcov_epilog.html)
       endif()
     endif()
   endif()
diff --git a/src/fsfw/pus/Service17Test.cpp b/src/fsfw/pus/Service17Test.cpp
index bea2eeb8..35fc7c9d 100644
--- a/src/fsfw/pus/Service17Test.cpp
+++ b/src/fsfw/pus/Service17Test.cpp
@@ -1,5 +1,7 @@
 #include "fsfw/pus/Service17Test.h"
 
+#include <fsfw/serialize/SerializeElement.h>
+
 #include "fsfw/FSFW.h"
 #include "fsfw/objectmanager/ObjectManager.h"
 #include "fsfw/objectmanager/SystemObject.h"
@@ -31,6 +33,15 @@ ReturnValue_t Service17Test::handleRequest(uint8_t subservice) {
       }
       return tmHelper.storeAndSendTmPacket();
     }
+    case Subservice::PING_WITH_DATA: {
+      SerializeElement<uint32_t> receivedDataLen = currentPacket.getUserDataLen();
+      ReturnValue_t result =
+          tmHelper.prepareTmPacket(Subservice::PING_WITH_DATA_REPORT_WITH_SIZE, receivedDataLen);
+      if (result != returnvalue::OK) {
+        return result;
+      }
+      return tmHelper.storeAndSendTmPacket();
+    }
     default:
       return AcceptsTelecommandsIF::INVALID_SUBSERVICE;
   }
diff --git a/src/fsfw/pus/Service17Test.h b/src/fsfw/pus/Service17Test.h
index f2ec6e4f..d3b6a6dc 100644
--- a/src/fsfw/pus/Service17Test.h
+++ b/src/fsfw/pus/Service17Test.h
@@ -32,6 +32,9 @@ class Service17Test : public PusServiceBase {
     CONNECTION_TEST_REPORT = 2,
     //!  [EXPORT] : [COMMAND] Trigger test reply and test event
     EVENT_TRIGGER_TEST = 128,
+    PING_WITH_DATA = 129,
+    //! [EXPORT] : [COMMAND] Report which reports the sent user data size
+    PING_WITH_DATA_REPORT_WITH_SIZE = 130
   };
 
   explicit Service17Test(PsbParams params);