diff --git a/eive_tmtc/pus_tc/devs/plpcdu.py b/eive_tmtc/pus_tc/devs/plpcdu.py index dbbe017..0a0b281 100644 --- a/eive_tmtc/pus_tc/devs/plpcdu.py +++ b/eive_tmtc/pus_tc/devs/plpcdu.py @@ -19,9 +19,9 @@ from tmtccmd.tc.pus_11_tc_sched import ( create_time_tagged_cmd, ) from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode, Subservice -from tmtccmd.tc.pus_20_params import ( +from tmtccmd.tc.pus_20_fsfw_params import ( pack_scalar_double_param_app_data, - pack_fsfw_load_param_cmd, + crate_fsfw_load_param_cmd, pack_boolean_parameter_app_data, ) from tmtccmd.logging import get_console_logger @@ -427,7 +427,7 @@ def pack_wait_time_cmd(q: DefaultPusQueueHelper, param_id: int, print_str: str): unique_id=param_id, parameter=wait_time, ) - q.add_pus_tc(pack_fsfw_load_param_cmd(app_data=param_data)) + q.add_pus_tc(crate_fsfw_load_param_cmd(app_data=param_data)) def pack_failure_injection_cmd(q: DefaultPusQueueHelper, param_id: int, print_str: str): @@ -435,7 +435,7 @@ def pack_failure_injection_cmd(q: DefaultPusQueueHelper, param_id: int, print_st param_data = pack_boolean_parameter_app_data( object_id=PL_PCDU_ID, domain_id=0, unique_id=param_id, parameter=True ) - q.add_pus_tc(pack_fsfw_load_param_cmd(app_data=param_data)) + q.add_pus_tc(crate_fsfw_load_param_cmd(app_data=param_data)) def pack_pl_pcdu_mode_cmd( diff --git a/eive_tmtc/tmtc/com/syrlinks_handler.py b/eive_tmtc/tmtc/com/syrlinks_handler.py index 1e27130..d3e224f 100644 --- a/eive_tmtc/tmtc/com/syrlinks_handler.py +++ b/eive_tmtc/tmtc/com/syrlinks_handler.py @@ -23,7 +23,8 @@ from tmtccmd.tc.pus_3_fsfw_hk import ( create_disable_periodic_hk_command, ) from spacepackets.ecss.tc import PusTelecommand -from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode, create_mode_command +from tmtccmd.tc.pus_200_fsfw_modes import Mode, create_mode_command +from tmtccmd.tc.pus_20_fsfw_params import pack_scalar_u8_parameter_app_data, create_load_param_cmd from eive_tmtc.config.object_ids import SYRLINKS_HANDLER_ID import struct @@ -45,6 +46,7 @@ class OpCode: NORMAL_RX_AND_TX_CW = "nml_carrier_wave" NORMAL_RX_AND_TX_LOW_DATARATE = "nml_low_datarate" NORMAL_RX_AND_TX_HIGH_DATARATE = "nml_high_datarate" + UPDATE_DEFAULT_DATARATE = "update_default_datarate" HK_RX_REGS = "hk_rx_regs" ENABLE_HK_RX_REGS = "enable_hk_rx" DISABLE_HK_RX_REGS = "disable_hk_rx" @@ -64,6 +66,7 @@ class Info: NORMAL_RX_AND_TX_DEFAULT_DATARATE = "NORMAL RX and TX, TX with default datarate" NORMAL_RX_AND_TX_LOW_DATARATE = "NORMAL RX and TX, TX with low datarate" NORMAL_RX_AND_TX_HIGH_DATARATE = "NORMAL RX and TX, TX with high datarate" + UPDATE_DEFAULT_DATARATE = "Update default datarate" HK_RX_REGS = "Request RX register set" HK_TX_REGS = "Request TX register set" ENABLE_HK_RX_REGS = "Enable periodic RX register HK" @@ -101,8 +104,8 @@ class Submode(enum.IntEnum): RX_AND_TX_CW = 4 -class Datarate(enum.Enum): - LOW_RATE_MODULATION_BPSK = (0,) +class Datarate(enum.IntEnum): + LOW_RATE_MODULATION_BPSK = 0 HIGH_RATE_MODULATION_0QPSK = 1 @@ -116,6 +119,7 @@ def add_syrlinks_cmds(defs: TmtcDefinitionWrapper): oce.add(OpCode.NORMAL_RX_AND_TX_CW, Info.NORMAL_RX_AND_TX_CW) oce.add(OpCode.NORMAL_RX_AND_TX_LOW_DATARATE, Info.NORMAL_RX_AND_TX_LOW_DATARATE) oce.add(OpCode.NORMAL_RX_AND_TX_HIGH_DATARATE, Info.NORMAL_RX_AND_TX_HIGH_DATARATE) + oce.add(OpCode.UPDATE_DEFAULT_DATARATE, Info.UPDATE_DEFAULT_DATARATE) oce.add(OpCode.HK_RX_REGS, Info.HK_RX_REGS) oce.add(OpCode.HK_TX_REGS, Info.HK_TX_REGS) oce.add(OpCode.TX_STATUS, Info.TX_STATUS) diff --git a/setup.cfg b/setup.cfg index 28e3107..5ce408e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -27,8 +27,8 @@ classifiers = [options] install_requires = - tmtccmd @ git+https://github.com/robamu-org/tmtccmd@v4.0.0a2 - # tmtccmd @ git+https://github.com/robamu-org/tmtccmd@23fe1dff5e035#egg=tmtccmd + # tmtccmd @ git+https://github.com/robamu-org/tmtccmd@v4.0.0a2 + tmtccmd @ git+https://github.com/robamu-org/tmtccmd@c978286a856a2f3a59efc96887dd15c2c17bac6e#egg=tmtccmd packages = find: python_requires = >=3.10 include_package_data = True