diff --git a/deps/tmtccmd b/deps/tmtccmd index acaea6d..77c940a 160000 --- a/deps/tmtccmd +++ b/deps/tmtccmd @@ -1 +1 @@ -Subproject commit acaea6d9b6fe1d31283604e44c0977365c97040e +Subproject commit 77c940a5a71e57aabc341e77e5b5d415043e9c9b diff --git a/pus_tc/devs/heater.py b/pus_tc/devs/heater.py index be3e5bb..b7e9cde 100644 --- a/pus_tc/devs/heater.py +++ b/pus_tc/devs/heater.py @@ -201,5 +201,5 @@ def pack_switch_heater_command( command.append(switch_action) command.append(COMMAND_SOURCE_PARAM_EXTERNAL) return make_fsfw_action_cmd( - object_id=object_id, action_id=ActionIds.SWITCH_HEATER, app_data=command + object_id=object_id, action_id=ActionIds.SWITCH_HEATER, user_data=command ) diff --git a/pus_tc/system/core.py b/pus_tc/system/core.py index 21c4b77..30a93c2 100644 --- a/pus_tc/system/core.py +++ b/pus_tc/system/core.py @@ -159,7 +159,7 @@ def pack_core_commands(q: DefaultPusQueueHelper, op_code: str): make_fsfw_action_cmd( object_id=CORE_CONTROLLER_ID, action_id=ActionIds.SWITCH_REBOOT_FILE_HANDLING, - app_data=app_data, + user_data=app_data, ) if op_code in OpCodes.ENABLE_REBOOT_FILE_HANDLING: q.add_log_cmd("Enabling reboot file handling") @@ -167,7 +167,7 @@ def pack_core_commands(q: DefaultPusQueueHelper, op_code: str): make_fsfw_action_cmd( object_id=CORE_CONTROLLER_ID, action_id=ActionIds.SWITCH_REBOOT_FILE_HANDLING, - app_data=app_data, + user_data=app_data, ) if op_code in OpCodes.RESET_ALL_REBOOT_COUNTERS: q.add_log_cmd("Resetting all reboot counters") @@ -250,7 +250,6 @@ def perform_reboot_cmd( make_fsfw_action_cmd( object_id=CORE_CONTROLLER_ID, action_id=ActionIds.XSC_REBOOT, - app_data=tc_data, - ssc=0, + user_data=tc_data ) ) diff --git a/pus_tm/action_reply_handler.py b/pus_tm/action_reply_handler.py index dbded5d..b7077b3 100644 --- a/pus_tm/action_reply_handler.py +++ b/pus_tm/action_reply_handler.py @@ -6,7 +6,6 @@ from pus_tm.defs import PrintWrapper from tmtc.ploc_mpsoc import PlocReplyIds from tmtc.ploc_supervisor import SupvActionIds from pus_tc.devs.star_tracker import StarTrackerActionIds -from gomspace.gomspace_common import GomspaceDeviceActionIds from tmtccmd.logging import get_console_logger from tmtccmd.tm import Service8FsfwTm from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter