From 813f92f3d4d301b6545533d65fa622ade7d3aa3c Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Thu, 25 Jan 2024 13:27:10 +0100
Subject: [PATCH] some cleaning up and some bugfixes

---
 eive_tmtc/pus_tm/hk_handler.py |  2 +-
 tmtcc.py                       | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/eive_tmtc/pus_tm/hk_handler.py b/eive_tmtc/pus_tm/hk_handler.py
index 9122091..84d6016 100644
--- a/eive_tmtc/pus_tm/hk_handler.py
+++ b/eive_tmtc/pus_tm/hk_handler.py
@@ -75,9 +75,9 @@ def handle_hk_packet(
         if named_obj_id in hk_filter.object_ids:
             handle_regular_hk_print(
                 printer=printer,
+                packet_uuid=packet_uuid,
                 object_id=named_obj_id,
                 hk_packet=tm_packet,
-                tm_packet=tm_packet.pus_tm,
                 hk_data=hk_data,
                 db=db_con,
             )
diff --git a/tmtcc.py b/tmtcc.py
index 2ed7c7d..21bb912 100755
--- a/tmtcc.py
+++ b/tmtcc.py
@@ -7,19 +7,20 @@ from pathlib import Path
 from typing import Tuple
 
 import tmtccmd
-from spacepackets.cfdp import (
-    ChecksumType,
-    TransmissionMode,
-)
-from spacepackets.ecss import PusVerificator
-from spacepackets.version import get_version as get_sp_version
-from tmtccmd import BackendBase
 from cfdppy.handler import RemoteEntityCfgTable
 from cfdppy.mib import (
     IndicationCfg,
     LocalEntityCfg,
     RemoteEntityCfg,
 )
+from spacepackets.cfdp import (
+    ChecksumType,
+    TransmissionMode,
+)
+from spacepackets.ecss import PusVerificator
+from spacepackets.seqcount import FileSeqCountProvider, PusFileSeqCountProvider
+from spacepackets.version import get_version as get_sp_version
+from tmtccmd import BackendBase
 from tmtccmd.config import (
     SetupWrapper,
     default_json_path,
@@ -41,10 +42,8 @@ from tmtccmd.logging.pus import (
 )
 from tmtccmd.pus import VerificationWrapper
 from tmtccmd.tmtc import CcsdsTmHandler
-from spacepackets.seqcount import FileSeqCountProvider, PusFileSeqCountProvider
 
 from eive_tmtc import APP_LOGGER
-from eive_tmtc.pus_tm.pus_handler import PusHandler, UnknownApidHandler
 from eive_tmtc.cfdp.fault_handler import EiveCfdpFaultHandler
 from eive_tmtc.cfdp.handler import CfdpInCcsdsHandler
 from eive_tmtc.cfdp.tm import CfdpInCcsdsWrapper
@@ -57,6 +56,7 @@ from eive_tmtc.config.definitions import (
 )
 from eive_tmtc.config.hook import EiveHookObject
 from eive_tmtc.pus_tc.tc_handler import TcHandler
+from eive_tmtc.pus_tm.pus_handler import PusHandler, UnknownApidHandler
 
 _LOGGER = APP_LOGGER
 _LOG_LEVEL = logging.INFO
@@ -172,6 +172,7 @@ def setup_tmtc_handlers(
     ccsds_handler.add_apid_handler(pus_handler)
     ccsds_handler.add_apid_handler(cfdp_in_ccsds_wrapper)
     seq_count_provider = PusFileSeqCountProvider()
+    assert printer.file_logger is not None
     tc_handler = TcHandler(
         seq_count_provider=seq_count_provider,
         pus_verificator=verificator,