From fea2e77b0a494dbc5a438779e70c1f5b567fff09 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Mon, 17 May 2021 15:40:51 +0200
Subject: [PATCH] some inspector tweaks

---
 tmtc/.idea/runConfigurations/Ping_Service_17.xml | 2 +-
 tmtc/config/custom_mode_op.py                    | 2 +-
 tmtc/pus_tm/service_3_hk_handling.py             | 9 ++++-----
 tmtc/tmtccmd                                     | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/tmtc/.idea/runConfigurations/Ping_Service_17.xml b/tmtc/.idea/runConfigurations/Ping_Service_17.xml
index 2cab9f8..349b215 100644
--- a/tmtc/.idea/runConfigurations/Ping_Service_17.xml
+++ b/tmtc/.idea/runConfigurations/Ping_Service_17.xml
@@ -13,7 +13,7 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-s 17 -t 3" />
+    <option name="PARAMETERS" value="-s 17 -o 0 -t 3" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
     <option name="MODULE_MODE" value="false" />
diff --git a/tmtc/config/custom_mode_op.py b/tmtc/config/custom_mode_op.py
index acd322c..5977c3c 100644
--- a/tmtc/config/custom_mode_op.py
+++ b/tmtc/config/custom_mode_op.py
@@ -6,7 +6,7 @@
 import sys
 
 from tmtccmd.core.backend import TmTcHandler
-from tmtccmd.utility.tmtcc_logger import get_logger
+from tmtccmd.utility.logger import get_logger
 
 LOGGER = get_logger()
 
diff --git a/tmtc/pus_tm/service_3_hk_handling.py b/tmtc/pus_tm/service_3_hk_handling.py
index 81ad9d8..138ae00 100644
--- a/tmtc/pus_tm/service_3_hk_handling.py
+++ b/tmtc/pus_tm/service_3_hk_handling.py
@@ -6,15 +6,15 @@
 """
 import struct
 from typing import Tuple
-from config.object_ids import ObjectIds
 from tmtccmd.pus_tm.service_3_housekeeping import Service3Base
-from tmtccmd.utility.tmtcc_logger import get_logger
+from tmtccmd.utility.logger import get_logger
 
+from config.object_ids import TEST_DEVICE_0_ID, TEST_DEVICE_1_ID
 LOGGER = get_logger()
 
 
 def service_3_hk_handling(
-        object_id: int, set_id: int, hk_data: bytearray, service3_packet: Service3Base
+        object_id: bytes, set_id: int, hk_data: bytearray, service3_packet: Service3Base
 ) -> Tuple[list, list, bytearray, int]:
     """
     This function is called when a Service 3 Housekeeping packet is received.
@@ -35,8 +35,7 @@ def service_3_hk_handling(
     the corresponding values. The bytearray is the validity buffer, which is usually appended
     at the end of the housekeeping packet. The last value is the number of parameters.
     """
-    if object_id == ObjectIds.TEST_DEVICE_0.value or \
-            object_id == ObjectIds.TEST_DEVICE_1.value:
+    if object_id == TEST_DEVICE_0_ID or object_id == TEST_DEVICE_1_ID:
         return handle_test_set_deserialization(hk_data=hk_data)
     else:
         LOGGER.info("Service3TM: Parsing for this SID has not been implemented.")
diff --git a/tmtc/tmtccmd b/tmtc/tmtccmd
index ffa2d0d..8ca16e3 160000
--- a/tmtc/tmtccmd
+++ b/tmtc/tmtccmd
@@ -1 +1 @@
-Subproject commit ffa2d0d6f0f113ab964a703abd200d92c37f6a63
+Subproject commit 8ca16e305d18eb8df2165680676992261af99c1b