From fa7443d4a9e121be5c9052d6b6ce4019f19c6ce5 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Thu, 14 Sep 2023 12:28:40 +0200
Subject: [PATCH] bump tmtc, small tweaks

---
 mission/com/LiveTmTask.cpp | 4 +---
 mission/com/LiveTmTask.h   | 1 -
 tmtc                       | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/mission/com/LiveTmTask.cpp b/mission/com/LiveTmTask.cpp
index 042104c4..74d79d4d 100644
--- a/mission/com/LiveTmTask.cpp
+++ b/mission/com/LiveTmTask.cpp
@@ -53,7 +53,7 @@ ReturnValue_t LiveTmTask::performOperation(uint8_t opCode) {
         }
       }
     }
-    if (channel.isBusy()) {
+    if (channel.isBusy() and not signals::CFDP_CHANNEL_THROTTLE_SIGNAL) {
       // Throttle CFDP packet creator. It is by far the most relevant data creator, so throttling
       // it is the easiest way to handle back pressure for now in a sensible way. It is cleared
       // by the data creator.
@@ -80,8 +80,6 @@ ReturnValue_t LiveTmTask::performOperation(uint8_t opCode) {
       }
       // 40 ms IDLE delay. Might tweak this in the future.
       TaskFactory::delayTask(40);
-    } else {
-      packetCounter++;
     }
   }
 }
diff --git a/mission/com/LiveTmTask.h b/mission/com/LiveTmTask.h
index a271b327..63831158 100644
--- a/mission/com/LiveTmTask.h
+++ b/mission/com/LiveTmTask.h
@@ -38,7 +38,6 @@ class LiveTmTask : public SystemObject,
   PusTmFunnel& pusFunnel;
   CfdpTmFunnel& cfdpFunnel;
   VirtualChannel& channel;
-  uint32_t packetCounter = 0;
   const std::atomic_bool& ptmeLocked;
 
   void readCommandQueue(void);
diff --git a/tmtc b/tmtc
index 8d28b321..bf399c3d 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 8d28b321d4a1fa4ba7f375bbb0cb36d843c7dcf5
+Subproject commit bf399c3d910a034112121f3bfb08494f40d46bf2