Merge remote-tracking branch 'origin/main' into mueller/update-ploc-supv-cmds

This commit is contained in:
Robin Müller 2022-08-22 17:15:57 +02:00
commit f58806c88c
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814

View File

@ -723,6 +723,7 @@ def get_event_buffer_path() -> str:
def handle_supv_hk_data(set_id: int, hk_data: bytes, printer: FsfwTmTcPrinter):
pw = PrintWrapper(printer)
<<<<<<< HEAD
current_idx = 0
if set_id == SetIds.HK_REPORT:
pass
@ -753,3 +754,15 @@ def handle_supv_hk_data(set_id: int, hk_data: bytes, printer: FsfwTmTcPrinter):
pw.printer.print_validity_buffer(hk_data[current_idx:], 10)
else:
pass
=======
if set_id == SetIds.HK_REPORT:
# TODO: Implement
pass
elif set_id == SetIds.BOOT_STATUS_REPORT:
# TODO: Implement
pass
else:
pw.dlog(f"PLOC SUPV: HK handling not implemented for set ID {set_id}")
pw.dlog(f"Raw Data: 0x[{hk_data.hex(sep=',')}]")
pass
>>>>>>> origin/main