From c4a444b319ccfc0d0504ce46051217efdbb3316d Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 2 Dec 2022 18:03:10 +0100 Subject: [PATCH] extended acs ctrl HK handling --- eive_tmtc/pus_tm/hk_handling.py | 4 +-- eive_tmtc/tmtc/acs/acs_ctrl.py | 57 ++++++++++++++++++++++++++------- 2 files changed, 47 insertions(+), 14 deletions(-) diff --git a/eive_tmtc/pus_tm/hk_handling.py b/eive_tmtc/pus_tm/hk_handling.py index 3aacd32..11d635d 100644 --- a/eive_tmtc/pus_tm/hk_handling.py +++ b/eive_tmtc/pus_tm/hk_handling.py @@ -1,6 +1,6 @@ """HK Handling for EIVE OBSW""" # from pus_tm.tcp_server_objects import TCP_SEVER_SENSOR_TEMPERATURES -from eive_tmtc.tmtc.acs.acs_ctrl import handle_acs_ctrl_mgm_data +from eive_tmtc.tmtc.acs.acs_ctrl import handle_raw_mgm_data, handle_acs_ctrl_hk_data from eive_tmtc.pus_tm.devs.plpcdu import handle_plpcdu_hk from eive_tmtc.pus_tm.devs.rad_sensor import handle_rad_sensor_data from eive_tmtc.pus_tm.devs.sus import handle_sus_hk @@ -175,7 +175,7 @@ def handle_regular_hk_print( elif objb == obj_ids.PLOC_SUPV_ID: handle_supv_hk_data(set_id=set_id, hk_data=hk_data, printer=printer) elif objb == obj_ids.ACS_CONTROLLER: - handle_acs_ctrl_mgm_data(printer, hk_data) + handle_acs_ctrl_hk_data(printer, set_id, hk_data) else: LOGGER.info( f"Service 3 TM: Parsing for object {object_id} and set ID {set_id} " diff --git a/eive_tmtc/tmtc/acs/acs_ctrl.py b/eive_tmtc/tmtc/acs/acs_ctrl.py index af406e5..4ee92d0 100644 --- a/eive_tmtc/tmtc/acs/acs_ctrl.py +++ b/eive_tmtc/tmtc/acs/acs_ctrl.py @@ -23,23 +23,43 @@ from tmtccmd.tc.pus_3_fsfw_hk import ( ) from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter + LOGGER = get_console_logger() class SetIds(enum.IntEnum): - MGM_SET = 0 + MGM_RAW_SET = 0 + MGM_PROC_SET = 1 + SUS_RAW_SET = 2 + SUS_PROC_SET = 3 + GYR_RAW_SET = 4 + GYR_PROC_SET = 5 + GPS_PROC_SET = 6 + MEKF_DATA = 7 + CTRL_VAL_DATA = 8 + ACTUATOR_CMD_DATA = 9 class OpCodes: - REQUEST_MGM_HK = ["0", "req-mgm-hk"] - ENABLE_MGM_HK = ["1", "enable-mgm-hk"] - DISABLE_MGM_HK = ["1", "disable-mgm-hk"] + REQUEST_MGM_HK = ["0", "mgm_raw_hk"] + ENABLE_MGM_HK = ["1", "enable_raw_hk"] + DISABLE_MGM_HK = ["1", "disable_raw_hk"] + REQUEST_PROC_MGM_HK = ["mgm_proc_hk"] + REQUEST_RAW_GYRO_HK = ["gyro_raw_hk"] + REQUEST_PROC_GYRO_HK = ["gyro_proc_hk"] + REQUEST_RAW_SUS_HK = ["sus_raw_hk"] + REQUEST_PROC_SUS_HK = ["sus_proc_hk"] class Info: REQUEST_MGM_HK = "Request MGM HK once" ENABLE_MGM_HK = "Enable MGM HK data generation" DISABLE_MGM_HK = "Disable MGM HK data generation" + REQUEST_PROC_MGM_HK = "Request Processed MGM HK" + REQUEST_RAW_GYRO_HK = "Request Raw Gyro HK" + REQUEST_PROC_GYRO_HK = "Request Processed Gyro HK" + REQUEST_RAW_SUS_HK = "Request Raw SUS HK" + REQUEST_PROC_SUS_HK = "Request Processed SUS HK" PERFORM_MGM_CALIBRATION = False @@ -69,7 +89,7 @@ def acs_cmd_defs(defs: TmtcDefinitionWrapper): def pack_acs_ctrl_command(p: ServiceProviderParams): op_code = p.op_code q = p.queue_helper - sid = make_sid(ACS_CONTROLLER, SetIds.MGM_SET) + sid = make_sid(ACS_CONTROLLER, SetIds.MGM_RAW_SET) if op_code in OpCodes.REQUEST_MGM_HK: q.add_log_cmd(Info.REQUEST_MGM_HK) q.add_pus_tc(generate_one_hk_command(sid)) @@ -85,8 +105,23 @@ def pack_acs_ctrl_command(p: ServiceProviderParams): LOGGER.info(f"Unknown op code {op_code}") -def handle_acs_ctrl_sus_raw_data(printer: FsfwTmTcPrinter, hk_data: bytes): +def handle_acs_ctrl_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes): pw = PrintWrapper(printer) + if set_id == SetIds.MGM_RAW_SET: + handle_raw_mgm_data(pw, hk_data) + elif set_id == SetIds.MGM_PROC_SET: + handle_mgm_data_processed(pw, hk_data) + elif set_id == SetIds.GYR_RAW_SET: + handle_gyr_data_raw(pw, hk_data) + elif set_id == SetIds.GYR_PROC_SET: + handle_gyr_data_processed(pw, hk_data) + elif set_id == SetIds.SUS_RAW_SET: + handle_acs_ctrl_sus_raw_data(pw, hk_data) + elif set_id == SetIds.SUS_PROC_SET: + handle_acs_ctrl_sus_processed_data(pw, hk_data) + + +def handle_acs_ctrl_sus_raw_data(pw: PrintWrapper, hk_data: bytes): if len(hk_data) < 6 * 2 * 12: pw.dlog( f"SUS Raw dataset with size {len(hk_data)} does not have expected size" @@ -101,11 +136,10 @@ def handle_acs_ctrl_sus_raw_data(printer: FsfwTmTcPrinter, hk_data: bytes): sus_list_formatted = [f"{val:#04x}" for val in sus_list] current_idx += length pw.dlog(f"SUS {idx} RAW: {sus_list_formatted}") - printer.print_validity_buffer(hk_data[current_idx:], num_vars=12) + pw.printer.print_validity_buffer(hk_data[current_idx:], num_vars=12) -def handle_acs_ctrl_sus_processed_data(printer: FsfwTmTcPrinter, hk_data: bytes): - pw = PrintWrapper(printer) +def handle_acs_ctrl_sus_processed_data(pw: PrintWrapper, hk_data: bytes): if len(hk_data) < 3 * 4 * 12: pw.dlog( f"SUS Raw dataset with size {len(hk_data)} does not have expected size" @@ -140,12 +174,11 @@ def handle_acs_ctrl_sus_processed_data(printer: FsfwTmTcPrinter, hk_data: bytes) sun_ijk_model = [f"{val:8.3f}" for val in {sun_ijk_model}] current_idx += inc_len pw.dlog(f"SUS ijk Model: {sun_ijk_model}") - printer.print_validity_buffer(hk_data[current_idx:], num_vars=12) + pw.printer.print_validity_buffer(hk_data[current_idx:], num_vars=12) -def handle_acs_ctrl_mgm_data(printer: FsfwTmTcPrinter, hk_data: bytes): +def handle_raw_mgm_data(pw: PrintWrapper, hk_data: bytes): current_idx = 0 - pw = PrintWrapper(printer) if len(hk_data) < 61: pw.dlog(