eive/eive-tmtc
eive/eive-tmtc
14
0
Fork 0
Code Issues Pull Requests 1 Projects Releases 98 Wiki Activity

Power Commands Update #108

Merged
meierj merged 7 commits from mueller/power-cmds-update into main 2022-08-25 14:48:42 +02:00
Conversation 1 Commits 7 Files Changed 10 +5 -7
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 254f980d53 - Show all commits

2
deps/tmtccmd vendored

@ -1 +1 @@
Subproject commit acaea6d9b6fe1d31283604e44c0977365c97040e
Subproject commit 77c940a5a71e57aabc341e77e5b5d415043e9c9b

2
pus_tc/devs/heater.py
View File

@ -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
)

7
pus_tc/system/core.py
View File

@ -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
)
)

1
pus_tm/action_reply_handler.py
View File

@ -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