From c199cbedaa4b7f6ba0b88fae26412cfa65f36739 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Wed, 6 Sep 2023 13:40:18 +0200
Subject: [PATCH] some improvements, remove debugging stuff

---
 src/fsfw/cfdp/handler/SourceHandler.cpp | 4 ----
 src/fsfw/osal/common/TcpTmTcBridge.cpp  | 2 +-
 src/fsfw/tmtcservices/TmTcBridge.cpp    | 4 ++--
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/fsfw/cfdp/handler/SourceHandler.cpp b/src/fsfw/cfdp/handler/SourceHandler.cpp
index 351359c2..60a947e3 100644
--- a/src/fsfw/cfdp/handler/SourceHandler.cpp
+++ b/src/fsfw/cfdp/handler/SourceHandler.cpp
@@ -267,20 +267,16 @@ ReturnValue_t cfdp::SourceHandler::prepareAndSendNextFileDataPdu(bool& noFileDat
     addError(result);
     return result;
   }
-  sif::debug << "sending next fd pdu, offset " << offset.value() << "" << std::endl;
   auto fileDataInfo = FileDataInfo(offset, fileBuf.data(), readLen);
   auto fileDataPdu = FileDataCreator(transactionParams.pduConf, fileDataInfo);
   result = sendGenericPdu(fileDataPdu);
   if (result != OK) {
-    sif::debug << "SENDING generic PDU failed" << std::endl;
     return result;
   }
   transactionParams.progress += readLen;
   if (transactionParams.progress >= fileSize) {
     // Advance FSM after all file data PDUs were sent.
     step = TransactionStep::SENDING_EOF;
-    sif::debug << "done" << std::endl;
-    TaskFactory::delayTask(10000);
   }
   return OK;
 }
diff --git a/src/fsfw/osal/common/TcpTmTcBridge.cpp b/src/fsfw/osal/common/TcpTmTcBridge.cpp
index 0bf3ab28..80c2ddd1 100644
--- a/src/fsfw/osal/common/TcpTmTcBridge.cpp
+++ b/src/fsfw/osal/common/TcpTmTcBridge.cpp
@@ -21,7 +21,7 @@ TcpTmTcBridge::TcpTmTcBridge(object_id_t objectId, object_id_t tcDestination,
     : TmTcBridge("TCP TMTC Bridge", objectId, tcDestination, msgQueueDepth, tmStoreId, tcStoreId) {
   mutex = MutexFactory::instance()->createMutex();
   // Connection is always up, TM is requested by connecting to server and receiving packets
-  registerCommConnect();
+  TmTcBridge::registerCommConnect();
 }
 
 ReturnValue_t TcpTmTcBridge::initialize() {
diff --git a/src/fsfw/tmtcservices/TmTcBridge.cpp b/src/fsfw/tmtcservices/TmTcBridge.cpp
index 5c819222..9801b21e 100644
--- a/src/fsfw/tmtcservices/TmTcBridge.cpp
+++ b/src/fsfw/tmtcservices/TmTcBridge.cpp
@@ -134,8 +134,8 @@ ReturnValue_t TmTcBridge::handleTmQueue() {
 #endif
 #endif /* FSFW_VERBOSE_LEVEL >= 3 */
 
-    if (communicationLinkUp == false or packetSentCounter >= sentPacketsPerCycle) {
-      ReturnValue_t result = storeDownlinkData(&message);
+    if (!communicationLinkUp or packetSentCounter >= sentPacketsPerCycle) {
+      result = storeDownlinkData(&message);
       if (result != returnvalue::OK) {
         tmStore->deleteData(message.getStorageId());
       }