eive/eive-tmtc
eive/eive-tmtc
14
0
Fork 0
Code Issues Pull Requests 2 Projects Releases 97 Wiki Activity

Heater Commands Update #67

Merged
meierj merged 4 commits from mueller/heater-health-if into develop 2022-05-13 14:58:29 +02:00
Conversation 0 Commits 4 Files Changed 6 +6 -1
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8e20c2ab08 - Show all commits

5
pus_tc/devs/heater.py
View File

@ -46,6 +46,10 @@ class Info:
HEATER_HEALTHY_CMD = "Set to healthy" HEATER_HEALTHY_CMD = "Set to healthy"
# Needed in OBSW to differentiate between external and internal heater commands
COMMAND_SOURCE_PARAM_EXTERNAL = 1
class ActionIds(enum.IntEnum): class ActionIds(enum.IntEnum):
SWITCH_HEATER = 0 SWITCH_HEATER = 0
@ -214,6 +218,7 @@ def pack_switch_heater_command(
command = bytearray() command = bytearray()
command.append(switch_nr) command.append(switch_nr)
command.append(switch_action) command.append(switch_action)
command.append(COMMAND_SOURCE_PARAM_EXTERNAL)
return generate_action_command( return generate_action_command(
object_id=object_id, action_id=ActionIds.SWITCH_HEATER, app_data=command object_id=object_id, action_id=ActionIds.SWITCH_HEATER, app_data=command
) )

2
pus_tm/verification_handler.py
View File

@ -23,7 +23,7 @@ def handle_service_1_packet(printer: FsfwTmTcPrinter, raw_tm: bytes):
) )
else: else:
retval_string = ( retval_string = (
f"Error Code information for code {srv1_packet.error_code}| " f"Error Code information for code {srv1_packet.error_code} | "
f"Name: {retval_info.name} | Info: {retval_info.info}" f"Name: {retval_info.name} | Info: {retval_info.info}"
) )
LOGGER.info(retval_string) LOGGER.info(retval_string)