eive/eive-tmtc
eive/eive-tmtc
14
0
Fork 0
Code Issues Pull Requests 2 Projects Releases 97 Wiki Activity

Merge branch 'mueller/master' into meier/imtq

Browse Source
This commit is contained in:
Jakob Meier 2021-06-12 13:50:26 +02:00
commit fe1e6a2877
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -4,4 +4,8 @@ log
.idea/* .idea/*
!.idea/runConfigurations !.idea/runConfigurations
*.json *.json
/Lib
/Scripts
/pyvenv.cfg

2
config/hook_implementations.py
View File

@ -120,7 +120,7 @@ class EiveHookObject(TmTcHookBase):
@staticmethod @staticmethod
def handle_service_3_housekeeping( 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]: ) -> Tuple[list, list, bytearray, int]:
from pus_tm.hk_handling import handle_user_hk_packet from pus_tm.hk_handling import handle_user_hk_packet
return handle_user_hk_packet( return handle_user_hk_packet(

5
pus_tm/hk_handling.py
View File

@ -12,8 +12,9 @@ from tmtccmd.utility.logger import get_logger
LOGGER = get_logger() LOGGER = get_logger()
def handle_user_hk_packet(object_id: int, set_id: int, hk_data: bytearray, def handle_user_hk_packet(
service3_packet: Service3Base) -> Tuple[list, list, bytearray, int]: 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. This function is called when a Service 3 Housekeeping packet is received.

2
tmtccmd

@ -1 +1 @@
Subproject commit 3f39a1ffa17e8c74cadc789b3f4714c4bbd5f75f Subproject commit 39697eda495d1b7f3d39e6c0bb9079856e93d006