From 634ed99a54fc9c8d491804e661529abab58c3c64 Mon Sep 17 00:00:00 2001
From: "Jakob.Meier" <meierj@irs.uni-stuttgart.de>
Date: Sat, 24 Apr 2021 22:55:26 +0200
Subject: [PATCH 1/3] issue with poolManager.subscribe in max handler

---
 bsp_q7s/ObjectFactory.cpp | 11 +++++------
 fsfw                      |  2 +-
 fsfw_hal                  |  2 +-
 fsfwconfig/FSFWConfig.h   |  2 ++
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/bsp_q7s/ObjectFactory.cpp b/bsp_q7s/ObjectFactory.cpp
index 4be4fce5..fc9a199f 100644
--- a/bsp_q7s/ObjectFactory.cpp
+++ b/bsp_q7s/ObjectFactory.cpp
@@ -42,14 +42,14 @@
 #include <fsfw/tmtcservices/PusServiceBase.h>
 #include <fsfw/osal/linux/TmTcUnixUdpBridge.h>
 #include <fsfw/tmtcpacket/pus/TmPacketStored.h>
-#include <fsfw/osal/linux/TcUnixUdpPollingTask.h>
+#include <fsfw/osal/linux/TmTcUnixUdpBridge.h>
+#include <fsfw/osal/common/UdpTcPollingTask.h>
 
 #include <fsfw/datapoollocal/LocalDataPoolManager.h>
 #include <fsfw/tmtcservices/CommandingServiceBase.h>
 #include <fsfw/tmtcservices/PusServiceBase.h>
 #include <fsfw/osal/linux/TmTcUnixUdpBridge.h>
 #include <fsfw/tmtcpacket/pus/TmPacketStored.h>
-#include <fsfw/osal/linux/TcUnixUdpPollingTask.h>
 
 #if TEST_LIBGPIOD == 1
 #include <linux/boardtest/LibgpiodTest.h>
@@ -328,10 +328,9 @@ void ObjectFactory::produce(){
 
 #endif
 
-    new TmTcUnixUdpBridge(objects::UDP_BRIDGE,
-            objects::CCSDS_PACKET_DISTRIBUTOR,
-            objects::TM_STORE, objects::TC_STORE);
-    new TcUnixUdpPollingTask(objects::UDP_POLLING_TASK, objects::UDP_BRIDGE);
+    new UdpTmTcBridge(objects::UDP_BRIDGE, objects::CCSDS_PACKET_DISTRIBUTOR, objects::TM_STORE,
+            objects::TC_STORE);
+    new UdpTcPollingTask(objects::UDP_POLLING_TASK, objects::UDP_BRIDGE);
 
 #if TE0720 == 1 && TEST_LIBGPIOD == 1
     /* Configure MIO0 as input */
diff --git a/fsfw b/fsfw
index 18a9729c..52b549b9 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 18a9729c75875f8bee674f03dd93a5eeeb657a66
+Subproject commit 52b549b97c36350a0c43b9fb3563802e670440da
diff --git a/fsfw_hal b/fsfw_hal
index 7a3190e5..14fe3257 160000
--- a/fsfw_hal
+++ b/fsfw_hal
@@ -1 +1 @@
-Subproject commit 7a3190e5b6980ad2addc5e8a76d21994b542f0e0
+Subproject commit 14fe32572d62db9d19707dc1f9bb6fecb1993b73
diff --git a/fsfwconfig/FSFWConfig.h b/fsfwconfig/FSFWConfig.h
index e3def8fe..1d82a733 100644
--- a/fsfwconfig/FSFWConfig.h
+++ b/fsfwconfig/FSFWConfig.h
@@ -43,6 +43,8 @@
 //! Specify whether a special mode store is used for Subsystem components.
 #define FSFW_USE_MODESTORE          0
 
+#define FSFW_USE_REALTIME_FOR_LINUX 1
+
 namespace fsfwconfig {
 //! Default timestamp size. The default timestamp will be an eight byte CDC
 //! short timestamp.

From edfebc8e06b942248cf5c14e772e1a47b93de91a Mon Sep 17 00:00:00 2001
From: "Jakob.Meier" <meierj@irs.uni-stuttgart.de>
Date: Sun, 25 Apr 2021 09:24:41 +0200
Subject: [PATCH 2/3] deleted faulty header includes

---
 bsp_q7s/ObjectFactory.cpp | 3 ---
 fsfw                      | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/bsp_q7s/ObjectFactory.cpp b/bsp_q7s/ObjectFactory.cpp
index fc9a199f..4b4c12d9 100644
--- a/bsp_q7s/ObjectFactory.cpp
+++ b/bsp_q7s/ObjectFactory.cpp
@@ -40,15 +40,12 @@
 #include <fsfw/datapoollocal/LocalDataPoolManager.h>
 #include <fsfw/tmtcservices/CommandingServiceBase.h>
 #include <fsfw/tmtcservices/PusServiceBase.h>
-#include <fsfw/osal/linux/TmTcUnixUdpBridge.h>
 #include <fsfw/tmtcpacket/pus/TmPacketStored.h>
-#include <fsfw/osal/linux/TmTcUnixUdpBridge.h>
 #include <fsfw/osal/common/UdpTcPollingTask.h>
 
 #include <fsfw/datapoollocal/LocalDataPoolManager.h>
 #include <fsfw/tmtcservices/CommandingServiceBase.h>
 #include <fsfw/tmtcservices/PusServiceBase.h>
-#include <fsfw/osal/linux/TmTcUnixUdpBridge.h>
 #include <fsfw/tmtcpacket/pus/TmPacketStored.h>
 
 #if TEST_LIBGPIOD == 1
diff --git a/fsfw b/fsfw
index 52b549b9..ff33a127 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 52b549b97c36350a0c43b9fb3563802e670440da
+Subproject commit ff33a1274daf1af83832501036f2adbb807ba690

From a49638724a702892f9253b74901ebc761999f995 Mon Sep 17 00:00:00 2001
From: "Jakob.Meier" <meierj@irs.uni-stuttgart.de>
Date: Sun, 25 Apr 2021 12:23:34 +0200
Subject: [PATCH 3/3] tmtc update

---
 tmtc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tmtc b/tmtc
index 2e84c822..986f88e2 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 2e84c822c8ce5c589793b7ec784c9860f527a2f4
+Subproject commit 986f88e2908c6bc555a279b53f11e82d9a8a851c