Merge branch 'main' into acs-ctrl-fixes

This commit is contained in:
Robin Müller 2023-01-20 10:51:22 +01:00
commit cd8fdc4865
2 changed files with 2 additions and 4 deletions

View File

@ -99,7 +99,7 @@ def pack_rtd_commands(
) )
) )
if op_code in OpCode.WRITE_CONFIG: if op_code in OpCode.WRITE_CONFIG:
command = object_id.as_bytes + struct.pack('!I', CommandId.WRITE_CONFIG) command = object_id.as_bytes + struct.pack("!I", CommandId.WRITE_CONFIG)
q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command)) q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))

View File

@ -337,9 +337,7 @@ def pack_acs_ctrl_command(p: ServiceProviderParams):
elif op_code in OpCodes.DISABLE_MEKF_HK: elif op_code in OpCodes.DISABLE_MEKF_HK:
q.add_log_cmd(Info.DISABLE_MEKF_HK) q.add_log_cmd(Info.DISABLE_MEKF_HK)
q.add_pus_tc( q.add_pus_tc(
disable_periodic_hk_command( disable_periodic_hk_command(True, make_sid(ACS_CONTROLLER, SetId.MEKF_DATA))
True, make_sid(ACS_CONTROLLER, SetId.MEKF_DATA)
)
) )
elif op_code in OpCodes.REQUEST_CTRL_VAL_HK: elif op_code in OpCodes.REQUEST_CTRL_VAL_HK:
q.add_log_cmd(Info.REQUEST_CTRL_VAL_HK) q.add_log_cmd(Info.REQUEST_CTRL_VAL_HK)