From ece20bf177e154287eaed8d6674b936c90c3aae7 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Mon, 30 Jan 2023 14:31:38 +0100
Subject: [PATCH] bump tmtccmd

---
 eive_tmtc/config/definitions.py |  4 ++--
 eive_tmtc/config/hook.py        |  2 +-
 setup.cfg                       |  2 +-
 tmtcc.py                        | 14 +++++---------
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/eive_tmtc/config/definitions.py b/eive_tmtc/config/definitions.py
index d5c3bc3..570b6fa 100644
--- a/eive_tmtc/config/definitions.py
+++ b/eive_tmtc/config/definitions.py
@@ -17,8 +17,8 @@ CFDP_APID = 0x66
 PUS_PACKET_ID = PacketId(PacketType.TM, True, PUS_APID)
 CFDP_PACKET_ID = PacketId(PacketType.TM, False, CFDP_APID)
 SPACE_PACKET_IDS = (
-    PUS_PACKET_ID.raw(),
-    CFDP_PACKET_ID.raw(),
+    PUS_PACKET_ID,
+    CFDP_PACKET_ID,
 )
 
 CFDP_LOCAL_ENTITY_ID = UnsignedByteField(byte_len=2, val=1)
diff --git a/eive_tmtc/config/hook.py b/eive_tmtc/config/hook.py
index bee9a59..8880569 100644
--- a/eive_tmtc/config/hook.py
+++ b/eive_tmtc/config/hook.py
@@ -18,7 +18,7 @@ class EiveHookObject(TmTcCfgHookBase):
         return get_eive_service_op_code_dict()
 
     def assign_communication_interface(self, com_if_key: str) -> Optional[ComInterface]:
-        from tmtccmd.config.com_if import (
+        from tmtccmd.config.com import (
             create_com_interface_default,
             create_com_interface_cfg_default,
         )
diff --git a/setup.cfg b/setup.cfg
index a1018b6..5aa5843 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -28,7 +28,7 @@ classifiers =
 [options]
 install_requires =
 	# tmtccmd @ git+https://github.com/robamu-org/tmtccmd@v4.0.0a2
-	tmtccmd @ git+https://github.com/robamu-org/tmtccmd@ad526b915b58d4decdc3868be28edf0bdc12a50c#egg=tmtccmd
+	tmtccmd @ git+https://github.com/robamu-org/tmtccmd@97e5e51101a08b21472b3ddecc2063359f7e307a#egg=tmtccmd
 packages = find:
 python_requires = >=3.10
 include_package_data = True
diff --git a/tmtcc.py b/tmtcc.py
index 2323247..d8e079c 100755
--- a/tmtcc.py
+++ b/tmtcc.py
@@ -72,7 +72,7 @@ from tmtccmd.tc import (
     FeedWrapper,
     TcProcedureType,
     TcQueueEntryType,
-    DefaultPusQueueHelper,
+    DefaultPusQueueHelper, QueueWrapper,
 )
 from tmtccmd.config import (
     default_json_path,
@@ -221,8 +221,9 @@ class TcHandler(TcHandlerBase):
         self.pus_raw_logger = raw_pus_logger
         self.gui = gui
         self.queue_helper = DefaultPusQueueHelper(
-            queue_wrapper=None,
-            pus_apid=PUS_APID,
+            queue_wrapper=QueueWrapper.empty(),
+            tc_sched_timestamp_len=4,
+            default_pus_apid=PUS_APID,
             seq_cnt_provider=seq_count_provider,
             pus_verificator=pus_verificator,
         )
@@ -247,12 +248,7 @@ class TcHandler(TcHandlerBase):
         if entry_helper.is_tc:
             if entry_helper.entry_type == TcQueueEntryType.PUS_TC:
                 pus_tc_wrapper = entry_helper.to_pus_tc_entry()
-                pus_tc_wrapper.pus_tc.seq_count = (
-                    self.seq_count_provider.get_and_increment()
-                )
-                pus_tc_wrapper.pus_tc.apid = PUS_APID
-                # Add TC after Sequence Count stamping
-                self.pus_verificator.add_tc(pus_tc_wrapper.pus_tc)
+                # pus_tc_wrapper.pus_tc.apid = PUS_APID
                 raw_tc = pus_tc_wrapper.pus_tc.pack()
                 self.pus_raw_logger.log_tc(pus_tc_wrapper.pus_tc)
                 tc_info_string = f"Sent {pus_tc_wrapper.pus_tc}"