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

v4.0.0-dev #197

Merged
muellerr merged 18 commits from v4.0.0-dev into main 2023-06-10 14:10:43 +02:00
Conversation 0 Commits 18 Files Changed 26 +8 -9
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a969481698 - Show all commits

17
eive_tmtc/tmtc/acs/imtq.py
View File

@ -432,17 +432,17 @@ def handle_imtq_hk(pw: PrintWrapper, hk_data: bytes, set_id: int):
elif set_id == ImtqSetId.ENG_HK_NO_TORQUE: elif set_id == ImtqSetId.ENG_HK_NO_TORQUE:
return handle_eng_set(pw, hk_data, False) return handle_eng_set(pw, hk_data, False)
elif set_id == ImtqSetId.ENG_HK_SET_WITH_TORQUE: elif set_id == ImtqSetId.ENG_HK_SET_WITH_TORQUE:
return handle_eng_set(printer, hk_data, True) return handle_eng_set(pw, hk_data, True)
elif set_id == ImtqSetId.CAL_MTM_SET: elif set_id == ImtqSetId.CAL_MTM_SET:
return handle_calibrated_mtm_measurement(printer, hk_data) return handle_calibrated_mtm_measurement(pw, hk_data)
elif set_id == ImtqSetId.RAW_MTM_NO_TORQUE: elif set_id == ImtqSetId.RAW_MTM_NO_TORQUE:
return handle_raw_mtm_measurement(printer, hk_data, False) return handle_raw_mtm_measurement(pw, hk_data, False)
elif set_id == ImtqSetId.RAW_MTM_WITH_TORQUE: elif set_id == ImtqSetId.RAW_MTM_WITH_TORQUE:
return handle_raw_mtm_measurement(printer, hk_data, True) return handle_raw_mtm_measurement(pw, hk_data, True)
elif set_id == ImtqSetId.DIPOLES: elif set_id == ImtqSetId.DIPOLES:
return handle_dipole_set(printer, hk_data) return handle_dipole_set(pw, hk_data)
elif set_id == ImtqSetId.STATUS_SET: elif set_id == ImtqSetId.STATUS_SET:
return handle_status_set(printer, hk_data) return handle_status_set(pw, hk_data)
else: else:
pw.wlog( pw.wlog(
_LOGGER, _LOGGER,
@ -458,8 +458,7 @@ def unpack_status_set(hk_data: bytes) -> List:
return [status_mode, status_error, status_conf, status_uptime] return [status_mode, status_error, status_conf, status_uptime]
def handle_dipole_set(printer: FsfwTmTcPrinter, hk_data: bytes): def handle_dipole_set(pw: PrintWrapper, hk_data: bytes):
pw = PrintWrapper(printer)
pw.dlog("Received iMTQ dipole set") pw.dlog("Received iMTQ dipole set")
fmt_str = "!hhhH" fmt_str = "!hhhH"
fmt_len = struct.calcsize(fmt_str) fmt_len = struct.calcsize(fmt_str)
@ -470,7 +469,7 @@ def handle_dipole_set(printer: FsfwTmTcPrinter, hk_data: bytes):
pw.dlog(f"Dipole Y: {dipole_y}") pw.dlog(f"Dipole Y: {dipole_y}")
pw.dlog(f"Dipole Z: {dipole_z}") pw.dlog(f"Dipole Z: {dipole_z}")
pw.dlog(f"Current torque duration: {current_torque_duration}") pw.dlog(f"Current torque duration: {current_torque_duration}")
pw.printer.get_validity_buffer(hk_data[fmt_len:], 2) FsfwTmTcPrinter.get_validity_buffer(hk_data[fmt_len:], 2)
def unpack_eng_hk(hk_data: bytes) -> List: def unpack_eng_hk(hk_data: bytes) -> List: