diff --git a/eive_tmtc/tmtc/acs/acs_ctrl.py b/eive_tmtc/tmtc/acs/acs_ctrl.py index 3206056..441e898 100644 --- a/eive_tmtc/tmtc/acs/acs_ctrl.py +++ b/eive_tmtc/tmtc/acs/acs_ctrl.py @@ -1018,7 +1018,7 @@ def handle_gps_data_processed(pw: PrintWrapper, hk_data: bytes): inc_len_source = struct.calcsize(fmt_source) inc_len_scalar = struct.calcsize(fmt_scalar) inc_len_vec = struct.calcsize(fmt_vec) - if len(hk_data) < 2 * inc_len_scalar + 2 * inc_len_vec + inc_len_source: + if len(hk_data) < 3 * inc_len_scalar + 2 * inc_len_vec + inc_len_source: pw.dlog("Received HK set too small") return current_idx = 0 diff --git a/eive_tmtc/tmtc/acs/gps.py b/eive_tmtc/tmtc/acs/gps.py index 41a8a7f..da90ce1 100644 --- a/eive_tmtc/tmtc/acs/gps.py +++ b/eive_tmtc/tmtc/acs/gps.py @@ -72,9 +72,7 @@ def add_gps_cmds(defs: TmtcDefinitionWrapper): ) -def pack_gps_command( # noqa: C901 - object_id: bytes, q: DefaultPusQueueHelper, op_code: str -): # noqa: C901 +def pack_gps_command(object_id: bytes, q: DefaultPusQueueHelper, op_code: str): if op_code in OpCode.RESET_GNSS: # TODO: This needs to be re-implemented _LOGGER.warning("Reset pin handling needs to be re-implemented") @@ -84,52 +82,34 @@ def pack_gps_command( # noqa: C901 raise ValueError("invalid interval") q.add_log_cmd(f"GPS: {Info.ENABLE_CORE_HK}") cmds = create_enable_periodic_hk_command_with_interval( - diag=False, - sid=make_sid(object_id=object_id, set_id=SetId.CORE_HK), - interval_seconds=interval, + diag=False, sid=make_sid(object_id=object_id, set_id=SetId.CORE_HK), interval_seconds=interval ) for cmd in cmds: q.add_pus_tc(cmd) if op_code in OpCode.DISABLE_CORE_HK: q.add_log_cmd(f"gps: {Info.DISABLE_CORE_HK}") - q.add_pus_tc( - create_disable_periodic_hk_command( - diag=False, sid=make_sid(object_id=object_id, set_id=SetId.CORE_HK) - ) - ) + q.add_pus_tc(create_disable_periodic_hk_command(diag=False, sid=make_sid(object_id=object_id, + set_id=SetId.CORE_HK))) if op_code in OpCode.REQ_CORE_HK: q.add_log_cmd(f"GPS: {Info.REQ_CORE_HK}") - q.add_pus_tc( - create_request_one_hk_command( - sid=make_sid(object_id=object_id, set_id=SetId.CORE_HK) - ) - ) + q.add_pus_tc(create_request_one_hk_command(sid=make_sid(object_id=object_id, set_id=SetId.CORE_HK))) if op_code in OpCode.ENABLE_SKYVIEW_HK: interval = float(input("Please specify interval in floating point seconds: ")) if interval <= 0: raise ValueError("invalid interval") q.add_log_cmd(f"GPS: {Info.ENABLE_SKYVIEW_HK}") cmds = create_enable_periodic_hk_command_with_interval( - diag=False, - sid=make_sid(object_id=object_id, set_id=SetId.SKYVIEW_HK), - interval_seconds=interval, + diag=False, sid=make_sid(object_id=object_id, set_id=SetId.SKYVIEW_HK), interval_seconds=interval ) for cmd in cmds: q.add_pus_tc(cmd) if op_code in OpCode.DISABLE_SKYVIEW_HK: q.add_log_cmd(f"gps: {Info.DISABLE_SKYVIEW_HK}") - q.add_pus_tc( - create_disable_periodic_hk_command( - diag=False, sid=make_sid(object_id=object_id, set_id=SetId.SKYVIEW_HK) - ) - ) + q.add_pus_tc(create_disable_periodic_hk_command(diag=False, sid=make_sid(object_id=object_id, + set_id=SetId.SKYVIEW_HK))) if op_code in OpCode.REQ_SKYVIEW_HK: q.add_log_cmd(f"GPS: {Info.REQ_SKYVIEW_HK}") - q.add_pus_tc( - create_request_one_hk_command( - sid=make_sid(object_id=object_id, set_id=SetId.SKYVIEW_HK) - ) - ) + q.add_pus_tc(create_request_one_hk_command(sid=make_sid(object_id=object_id, set_id=SetId.SKYVIEW_HK))) if op_code in OpCode.ON: q.add_log_cmd(f"GPS: {Info.ON}") q.add_pus_tc(create_mode_command(object_id, Mode.ON, 0)) @@ -153,7 +133,7 @@ def handle_gps_data( def handle_core_data(pw: PrintWrapper, hk_data: bytes): - if len(hk_data) < 4 * 8 + 4 + 2 + 8: + if len(hk_data) < 4*8+4+2+8: pw.dlog( f"GPS Core dataset with size {len(hk_data)} does not have expected size" f" of {4*8+4+2+8} bytes" @@ -199,7 +179,7 @@ def handle_core_data(pw: PrintWrapper, hk_data: bytes): def handle_skyview_data(pw: PrintWrapper, hk_data: bytes): - data_length = 8 + GpsInfo.MAX_SATELLITES * (8 + 3 * 2 + 1) + data_length = 8+GpsInfo.MAX_SATELLITES*(8+3*2+1) if len(hk_data) < data_length: pw.dlog( f"GPS Skyview dataset with size {len(hk_data)} does not have expected size" @@ -215,46 +195,24 @@ def handle_skyview_data(pw: PrintWrapper, hk_data: bytes): inc_len_int16 = struct.calcsize(fmt_str_int16) inc_len_double = struct.calcsize(fmt_str_double) inc_len_uint8 = struct.calcsize(fmt_str_uint8) - unix = struct.unpack( - fmt_str_unix, hk_data[current_idx : current_idx + inc_len_unix] - ) + unix = struct.unpack(fmt_str_unix, hk_data[current_idx: current_idx + inc_len_unix])[0] current_idx += inc_len_unix - prn_id = struct.unpack( - fmt_str_int16, hk_data[current_idx : current_idx + inc_len_int16] - ) + prn_id = struct.unpack(fmt_str_int16, hk_data[current_idx: current_idx + inc_len_int16]) current_idx += inc_len_int16 - azimuth = struct.unpack( - fmt_str_int16, hk_data[current_idx : current_idx + inc_len_int16] - ) + azimuth = struct.unpack(fmt_str_int16, hk_data[current_idx: current_idx + inc_len_int16]) current_idx += inc_len_int16 - elevation = struct.unpack( - fmt_str_int16, hk_data[current_idx : current_idx + inc_len_int16] - ) + elevation = struct.unpack(fmt_str_int16, hk_data[current_idx: current_idx + inc_len_int16]) current_idx += inc_len_int16 - signal_to_noise = struct.unpack( - fmt_str_double, hk_data[current_idx : current_idx + inc_len_double] - ) + signal_to_noise = struct.unpack(fmt_str_double, hk_data[current_idx: current_idx + inc_len_double]) current_idx += inc_len_double - used = struct.unpack( - fmt_str_uint8, hk_data[current_idx : current_idx + inc_len_uint8] - ) + used = struct.unpack(fmt_str_uint8, hk_data[current_idx: current_idx + inc_len_uint8]) current_idx += inc_len_uint8 pw.dlog(f"Skyview Time: {unix} unix-sec") - pw.dlog( - "{:<8} {:<8} {:<8} {:<8} {:<8}".format( - "PRN_ID", "AZ [°]", "EL [°]", "S2N [dBW]", "USED" - ) - ) + pw.dlog("{:<8} {:<8} {:<8} {:<8} {:<8}".format('PRN_ID', 'AZ [°]', 'EL [°]', 'S2N [dBW]', 'USED')) for idx in range(GpsInfo.MAX_SATELLITES): - pw.dlog( - "{:<8} {:<8} {:<8} {:<8} {:<8}".format( - prn_id[idx], - azimuth[idx], - elevation[idx], - signal_to_noise[idx], - used[idx], - ) - ) + pw.dlog("{:<8} {:<8} {:<8} {:<8} {:<8}".format(prn_id[idx], azimuth[idx], elevation[idx], signal_to_noise[idx], + used[idx])) FsfwTmTcPrinter.get_validity_buffer( validity_buffer=hk_data[current_idx:], num_vars=6 ) +