From 97f02401fe53a45bed161440a2a18b7808c8a3c5 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Wed, 28 Sep 2022 17:01:40 +0200
Subject: [PATCH] bugfix for SCEX code

---
 bsp_q7s/fmObjectFactory.cpp      | 2 +-
 fsfw                             | 2 +-
 linux/devices/ScexUartReader.cpp | 2 --
 tmtc                             | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/bsp_q7s/fmObjectFactory.cpp b/bsp_q7s/fmObjectFactory.cpp
index 86fb8bd9..6a49f8b9 100644
--- a/bsp_q7s/fmObjectFactory.cpp
+++ b/bsp_q7s/fmObjectFactory.cpp
@@ -60,7 +60,7 @@ void ObjectFactory::produce(void* args) {
 #endif /* OBSW_USE_CCSDS_IP_CORE == 1 */
 
 #if OBSW_ADD_SCEX_DEVICE == 1
-  createScexComponents(q7s::UART_GNSS_DEV, pwrSwitcher, *SdCardManager::instance(), false,
+  createScexComponents(q7s::UART_SCEX_DEV, pwrSwitcher, *SdCardManager::instance(), false,
                        pcdu::Switches::PDU1_CH5_SOLAR_CELL_EXP_5V);
 #endif
   /* Test Task */
diff --git a/fsfw b/fsfw
index 7e0a5d5a..04122ffe 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 7e0a5d5a9e4f38c6d818bbdd5b44d34d8007eb1e
+Subproject commit 04122ffec58e0c0d5af8932f8cfd04781b3107df
diff --git a/linux/devices/ScexUartReader.cpp b/linux/devices/ScexUartReader.cpp
index ca7013c4..44c397e8 100644
--- a/linux/devices/ScexUartReader.cpp
+++ b/linux/devices/ScexUartReader.cpp
@@ -171,8 +171,6 @@ void ScexUartReader::foundDlePacketHandler(const ScexDleParser::Context &ctx) {
 }
 
 void ScexUartReader::handleFoundDlePacket(uint8_t *packet, size_t len) {
-  // TODO: insert data into IPC ring buffer here
-  // sif::info << "Detected DLE encoded packet with decoded size " << len << std::endl;
   MutexGuard mg(lock);
   ReturnValue_t result = ipcQueue.insert(len);
   if (result != OK) {
diff --git a/tmtc b/tmtc
index a7714747..6caf0624 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit a7714747bc45dfa6a9ccb41cc6eb890b21ca0481
+Subproject commit 6caf06248b73f9328c9069d627a5b387a3ac14b3