Merge branch 'mueller/master' into meier/imtq
This commit is contained in:
commit
fe1e6a2877
4
.gitignore
vendored
4
.gitignore
vendored
@ -5,3 +5,7 @@ log
|
||||
!.idea/runConfigurations
|
||||
|
||||
*.json
|
||||
|
||||
/Lib
|
||||
/Scripts
|
||||
/pyvenv.cfg
|
@ -120,7 +120,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(
|
||||
|
@ -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.
|
||||
|
||||
|
2
tmtccmd
2
tmtccmd
@ -1 +1 @@
|
||||
Subproject commit 3f39a1ffa17e8c74cadc789b3f4714c4bbd5f75f
|
||||
Subproject commit 39697eda495d1b7f3d39e6c0bb9079856e93d006
|
Loading…
Reference in New Issue
Block a user