replaced includes

tmtcc.py

@@ -4,6 +4,9 @@ import sys
 import time
 import traceback
 
+from tmtccmd.util import FileSeqCountProvider, PusFileSeqCountProvider
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
+
 try:
     import spacepackets
 except ImportError as error:
@@ -35,10 +38,8 @@ from tmtccmd.logging.pus import (
 )
 from tmtccmd.pus import VerificationWrapper
 from tmtccmd.tm import SpecificApidHandlerBase, GenericApidHandlerBase, CcsdsTmHandler
-from tmtccmd.utility.tmtc_printer import FsfwTmTcPrinter
 from tmtccmd.core import BackendRequest
 from tmtccmd.logging import get_current_time_string
-from tmtccmd.pus import FileSeqCountProvider
 from tmtccmd.tc import (
     ProcedureHelper,
     FeedWrapper,
@@ -88,23 +89,25 @@ class TcHandler(TcHandlerBase):
         pus_verificator: PusVerificator,
         file_logger: logging.Logger,
         raw_logger: RawTmtcTimedLogWrapper,
+        gui: bool
     ):
         super().__init__()
         self.seq_count_provider = seq_count_provider
         self.pus_verificator = pus_verificator
         self.file_logger = file_logger
         self.raw_logger = raw_logger
+        self.gui = gui
 
     def feed_cb(self, info: ProcedureHelper, wrapper: FeedWrapper):
         if info.proc_type == TcProcedureType.DEFAULT:
-            handle_default_procedure(info.to_def_procedure(), wrapper)
+            handle_default_procedure(info.to_def_procedure(), wrapper, self.gui)
 
     def send_cb(self, entry_helper: QueueEntryHelper, com_if: ComInterface):
         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.next_seq_count()
+                    self.seq_count_provider.get_and_increment()
                 )
                 pus_tc_wrapper.pus_tc.apid = PUS_APID
                 # Add TC after Sequence Count stamping
@@ -148,17 +151,19 @@ def setup_tmtc(
     verificator: PusVerificator,
     printer: FsfwTmTcPrinter,
     raw_logger: RawTmtcTimedLogWrapper,
+    gui: bool
 ) -> (CcsdsTmHandler, TcHandler):
     verification_wrapper = VerificationWrapper(verificator, LOGGER, printer.file_logger)
     pus_handler = PusHandler(verification_wrapper, printer, raw_logger)
     ccsds_handler = CcsdsTmHandler(generic_handler=UnknownApidHandler(None))
     ccsds_handler.add_apid_handler(pus_handler)
-    seq_count_provider = FileSeqCountProvider()
+    seq_count_provider = PusFileSeqCountProvider()
     tc_handler = TcHandler(
         seq_count_provider=seq_count_provider,
         pus_verificator=verificator,
         file_logger=printer.file_logger,
         raw_logger=raw_logger,
+        gui=gui
     )
     return ccsds_handler, tc_handler
 
@@ -185,7 +190,9 @@ def main():
     printer = FsfwTmTcPrinter(tmtc_logger.logger)
     raw_logger = RawTmtcTimedLogWrapper(when=TimedLogWhen.PER_HOUR, interval=2)
     pus_verificator = PusVerificator()
-    ccsds_handler, tc_handler = setup_tmtc(pus_verificator, printer, raw_logger)
+    ccsds_handler, tc_handler = setup_tmtc(
+        pus_verificator, printer, raw_logger, setup_wrapper.params.use_gui
+    )
 
     tmtccmd.setup(setup_wrapper)
     tmtc_backend = setup_backend(