From 7b0c8fa25a7d5fa66b4dac2531662ad65afbc8aa Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Thu, 15 Sep 2022 16:28:58 +0200
Subject: [PATCH] separate function for cfdp setup

---
 common.py | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/common.py b/common.py
index 92219bf..04b8d20 100644
--- a/common.py
+++ b/common.py
@@ -7,7 +7,9 @@ from spacepackets import SpacePacket, SpacePacketHeader
 from spacepackets.cfdp import (
     TransmissionModes,
     ChecksumTypes,
-    ConditionCode, PduHolder, DirectiveTypes,
+    ConditionCode,
+    PduHolder,
+    DirectiveTypes,
 )
 from spacepackets.cfdp.pdu import MetadataPdu, FileDataPdu
 from tmtccmd.cfdp import (
@@ -260,8 +262,9 @@ class TcHandler(TcHandlerBase):
                                 f"{metadata.file_size}"
                             )
                         elif pdu.pdu_directive_type == DirectiveTypes.EOF_PDU:
-                            eof = pdu.to_eof_pdu()
-                            self.queue_helper.add_log_cmd(f"CFDP Source: Sending EOF PDU")
+                            self.queue_helper.add_log_cmd(
+                                f"CFDP Source: Sending EOF PDU"
+                            )
                     else:
                         fd_pdu = pdu.to_file_data_pdu()
                         self.queue_helper.add_log_cmd(
@@ -336,12 +339,7 @@ def setup_params(hook_obj: TmTcCfgHookBase) -> SetupWrapper:
     return setup_wrapper
 
 
-def setup_tmtc_handlers(
-    verif_wrapper: VerificationWrapper,
-    printer: FsfwTmTcPrinter,
-    raw_logger: RawTmtcTimedLogWrapper,
-) -> (CcsdsTmHandler, TcHandler):
-
+def setup_cfdp_handler() -> CfdpInCcsdsWrapper:
     fh_base = ExampleCfdpFaultHandler()
     cfdp_cfg = LocalEntityCfg(
         local_entity_id=CFDP_LOCAL_ENTITY_ID,
@@ -372,13 +370,21 @@ def setup_tmtc_handlers(
         cfdp_seq_cnt_provider=cfdp_seq_count_provider,
         user=cfdp_user,
     )
-    cfdp_in_ccsds_wrapper = CfdpInCcsdsWrapper(cfdp_in_ccsds_handler)
+    return CfdpInCcsdsWrapper(cfdp_in_ccsds_handler)
 
+
+def setup_tmtc_handlers(
+    verif_wrapper: VerificationWrapper,
+    printer: FsfwTmTcPrinter,
+    raw_logger: RawTmtcTimedLogWrapper,
+) -> (CcsdsTmHandler, TcHandler):
+    cfdp_in_ccsds_wrapper = setup_cfdp_handler()
     pus_handler = PusHandler(
         printer=printer, raw_logger=raw_logger, wrapper=verif_wrapper
     )
     ccsds_handler = CcsdsTmHandler(None)
     ccsds_handler.add_apid_handler(pus_handler)
+    ccsds_handler.add_apid_handler(cfdp_in_ccsds_wrapper)
     tc_handler = TcHandler(
         file_logger=printer.file_logger,
         raw_logger=raw_logger,