From fc87e36c2e492092efd4418942734661b901887d Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sat, 12 Jun 2021 13:48:31 +0200 Subject: [PATCH] this should fix srv3 issues --- .gitignore | 6 +++++- config/hook_implementations.py | 2 +- pus_tm/hk_handling.py | 5 +++-- tmtccmd | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 0fe4197..ab65048 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,8 @@ log .idea/* !.idea/runConfigurations -*.json \ No newline at end of file +*.json + +/Lib +/Scripts +/pyvenv.cfg \ No newline at end of file diff --git a/config/hook_implementations.py b/config/hook_implementations.py index 498f921..a5b3b97 100644 --- a/config/hook_implementations.py +++ b/config/hook_implementations.py @@ -113,7 +113,7 @@ class EiveHookObject(TmTcHookBase): @staticmethod def handle_service_3_housekeeping( - 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]: from pus_tm.hk_handling import handle_user_hk_packet return handle_user_hk_packet( diff --git a/pus_tm/hk_handling.py b/pus_tm/hk_handling.py index b3d2595..f38f1e4 100644 --- a/pus_tm/hk_handling.py +++ b/pus_tm/hk_handling.py @@ -12,8 +12,9 @@ from tmtccmd.utility.logger import get_logger LOGGER = get_logger() -def handle_user_hk_packet(object_id: int, set_id: int, hk_data: bytearray, - service3_packet: Service3Base) -> Tuple[list, list, bytearray, int]: +def handle_user_hk_packet( + 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. diff --git a/tmtccmd b/tmtccmd index 3f39a1f..39697ed 160000 --- a/tmtccmd +++ b/tmtccmd @@ -1 +1 @@ -Subproject commit 3f39a1ffa17e8c74cadc789b3f4714c4bbd5f75f +Subproject commit 39697eda495d1b7f3d39e6c0bb9079856e93d006