From 38d180f2582ba1968afda0a54b22ee79f35fba36 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Thu, 27 Oct 2022 15:32:50 +0200
Subject: [PATCH] some renaming

---
 tmtcc.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/tmtcc.py b/tmtcc.py
index 3167a0e..fd80d87 100755
--- a/tmtcc.py
+++ b/tmtcc.py
@@ -207,7 +207,7 @@ class TcHandler(TcHandlerBase):
         cfdp_in_ccsds_wrapper: CfdpInCcsdsWrapper,
         pus_verificator: PusVerificator,
         file_logger: logging.Logger,
-        raw_logger: RawTmtcTimedLogWrapper,
+        raw_pus_logger: RawTmtcTimedLogWrapper,
         gui: bool,
     ):
         super().__init__()
@@ -215,8 +215,8 @@ class TcHandler(TcHandlerBase):
         self.cfdp_dest_id = CFDP_REMOTE_ENTITY_ID
         self.seq_count_provider = seq_count_provider
         self.pus_verificator = pus_verificator
-        self.file_logger = file_logger
-        self.raw_logger = raw_logger
+        self.pus_file_logger = file_logger
+        self.pus_raw_logger = raw_pus_logger
         self.gui = gui
         self.queue_helper = DefaultPusQueueHelper(
             queue_wrapper=None,
@@ -249,10 +249,10 @@ class TcHandler(TcHandlerBase):
                 # Add TC after Sequence Count stamping
                 self.pus_verificator.add_tc(pus_tc_wrapper.pus_tc)
                 raw_tc = pus_tc_wrapper.pus_tc.pack()
-                self.raw_logger.log_tc(pus_tc_wrapper.pus_tc)
+                self.pus_raw_logger.log_tc(pus_tc_wrapper.pus_tc)
                 tc_info_string = f"Sent {pus_tc_wrapper.pus_tc}"
                 LOGGER.info(tc_info_string)
-                self.file_logger.info(
+                self.pus_file_logger.info(
                     f"{get_current_time_string(True)}: {tc_info_string}"
                 )
                 send_params.com_if.send(raw_tc)
@@ -262,6 +262,7 @@ class TcHandler(TcHandlerBase):
                 # TODO: Log raw CFDP packets similarly to how PUS packets are logged.
                 #        - Log full raw format including space packet wrapper
                 #        - Log context information: Transaction ID, and PDU type and directive
+                # Could re-use file logger. Should probably do that
                 # print(f"sending packet: [{cfdp_packet_in_ccsds.space_packet.pack()}]")
                 # with open(f"cfdp_packet_{self.cfdp_counter}", "wb") as of:
                 # of.write(cfdp_packet_in_ccsds.space_packet.pack())
@@ -269,7 +270,7 @@ class TcHandler(TcHandlerBase):
         elif entry_helper.entry_type == TcQueueEntryType.LOG:
             log_entry = entry_helper.to_log_entry()
             LOGGER.info(log_entry.log_str)
-            self.file_logger.info(log_entry.log_str)
+            self.pus_file_logger.info(log_entry.log_str)
 
     def handle_cfdp_procedure(self, info: ProcedureWrapper):
         cfdp_procedure = info.to_cfdp_procedure()
@@ -396,7 +397,7 @@ def setup_tmtc_handlers(
         seq_count_provider=seq_count_provider,
         pus_verificator=verificator,
         file_logger=printer.file_logger,
-        raw_logger=raw_logger,
+        raw_pus_logger=raw_logger,
         gui=gui,
         cfdp_in_ccsds_wrapper=cfdp_in_ccsds_wrapper,
     )