diff --git a/eive_tmtc/tmtc/acs/acs_ctrl.py b/eive_tmtc/tmtc/acs/acs_ctrl.py index a4e8d17..0511ce2 100644 --- a/eive_tmtc/tmtc/acs/acs_ctrl.py +++ b/eive_tmtc/tmtc/acs/acs_ctrl.py @@ -13,7 +13,6 @@ from tmtccmd.config.tmtc import ( TmtcDefinitionWrapper, OpCodeEntry, ) -from tmtccmd.tc.pus_20_params import pack_scalar_boolean_parameter_app_data from tmtccmd.tc import service_provider from tmtccmd.tc.pus_200_fsfw_modes import Mode, pack_mode_command from tmtccmd.tc.decorator import ServiceProviderParams @@ -188,7 +187,7 @@ def pack_acs_ctrl_command(p: ServiceProviderParams): q.add_pus_tc(pack_mode_command(ACS_CONTROLLER, Mode.NORMAL, Submode.SAFE)) elif op_code in OpCodes.DTBL: q.add_log_cmd(f"{Info.DTBL}") - q.add_pus_tc(pack_mode_command(ACS_CONTROLLER, Mode.NORMAL, Submode.DTBL)) + q.add_pus_tc(pack_mode_command(ACS_CONTROLLER, Mode.NORMAL, Submode.DETUMBLE)) elif op_code in OpCodes.IDLE: q.add_log_cmd(f"{Info.IDLE}") q.add_pus_tc(pack_mode_command(ACS_CONTROLLER, Mode.NORMAL, Submode.IDLE)) diff --git a/eive_tmtc/tmtc/syrlinks_hk_handler.py b/eive_tmtc/tmtc/syrlinks_hk_handler.py index fe259e4..d9ffb77 100644 --- a/eive_tmtc/tmtc/syrlinks_hk_handler.py +++ b/eive_tmtc/tmtc/syrlinks_hk_handler.py @@ -230,7 +230,9 @@ def handle_syrlinks_rx_registers_dataset(printer: FsfwTmTcPrinter, hk_data: byte ] rx_status = hk_data[0] rx_sensitivity = struct.unpack("!I", hk_data[1:5])[0] - rx_frequency_shift = struct.unpack("!I", hk_data[5:9])[0] + rx_frequency_shift = struct.unpack("!i", hk_data[5:9])[0] + freq_shift_hz = rx_frequency_shift / 8.0 + freq_shift_printout = f"Raw: {rx_frequency_shift}, Eng: {freq_shift_hz} Hz" rx_iq_power = struct.unpack("!H", hk_data[9:11])[0] rx_agc_value = struct.unpack("!H", hk_data[11:13])[0] rx_demod_eb = struct.unpack("!I", hk_data[13:17])[0] @@ -239,7 +241,7 @@ def handle_syrlinks_rx_registers_dataset(printer: FsfwTmTcPrinter, hk_data: byte content_list = [ rx_status, rx_sensitivity, - rx_frequency_shift, + freq_shift_printout, rx_iq_power, rx_agc_value, rx_demod_eb,