From 986ee977216d4f015ea572b1b61bc994777b5223 Mon Sep 17 00:00:00 2001
From: "Jakob.Meier" <meierj@irs.uni-stuttgart.de>
Date: Sun, 25 Apr 2021 15:54:48 +0200
Subject: [PATCH] added wiretapping mode check in handleDeviceTm of PlocHandler

---
 fsfw                            | 2 +-
 fsfw_hal                        | 2 +-
 mission/devices/PlocHandler.cpp | 5 +++++
 thirdparty/etl                  | 2 +-
 tmtc                            | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/fsfw b/fsfw
index 42720e6f..e7d24563 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 42720e6f7d64bdd9a1ac0cea5846c9a8cedea0ff
+Subproject commit e7d245635047439ca4b5a46d05bf58437a5aa33a
diff --git a/fsfw_hal b/fsfw_hal
index 14fe3257..a85c0146 160000
--- a/fsfw_hal
+++ b/fsfw_hal
@@ -1 +1 @@
-Subproject commit 14fe32572d62db9d19707dc1f9bb6fecb1993b73
+Subproject commit a85c01465bc8687773676f05c5e7eb8af54b25ff
diff --git a/mission/devices/PlocHandler.cpp b/mission/devices/PlocHandler.cpp
index f1444488..5b106477 100644
--- a/mission/devices/PlocHandler.cpp
+++ b/mission/devices/PlocHandler.cpp
@@ -388,6 +388,11 @@ void PlocHandler::handleDeviceTM(const uint8_t* data, size_t dataSize, DeviceCom
 
     ReturnValue_t result = RETURN_OK;
 
+    if (wiretappingMode == RAW) {
+        /* Data already sent in doGetRead() */
+        return result;
+    }
+
     DeviceReplyMap::iterator iter = deviceReplyMap.find(replyId);
     if (iter == deviceReplyMap.end()) {
         sif::debug << "PlocHandler::handleDeviceTM: Unknown reply id" << std::endl;
diff --git a/thirdparty/etl b/thirdparty/etl
index ae06e641..c308dc42 160000
--- a/thirdparty/etl
+++ b/thirdparty/etl
@@ -1 +1 @@
-Subproject commit ae06e6417702b770c49289c9e7162cb3f4a5a217
+Subproject commit c308dc427b7a34e54f33860fb2e244564b2740b4
diff --git a/tmtc b/tmtc
index 73105138..3e466f06 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 73105138050b5661a6cff76e1d64af40981f9c7f
+Subproject commit 3e466f06ef7737f2f1bab8c3d68feb633da76dbc