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

v1.10.0 #65

Merged
muellerr merged 89 commits from develop into master 2022-05-05 14:35:04 +02:00
Conversation 0 Commits 89 Files Changed 79 +8 -2
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0cb9dbefca - Show all commits

1
pus_tc/cmd_definitions.py
View File

@ -639,6 +639,7 @@ def add_ploc_supv_cmds(cmd_dict: ServiceOpCodeDictT):
"52": ("PLOC Supervisor: Logging clear counters", {OpCodeDictKeys.TIMEOUT: 2.0}), "52": ("PLOC Supervisor: Logging clear counters", {OpCodeDictKeys.TIMEOUT: 2.0}),
"53": ("PLOC Supervisor: Logging set topic", {OpCodeDictKeys.TIMEOUT: 2.0}), "53": ("PLOC Supervisor: Logging set topic", {OpCodeDictKeys.TIMEOUT: 2.0}),
"54": ("PLOC Supervisor: Logging request counters", {OpCodeDictKeys.TIMEOUT: 2.0}), "54": ("PLOC Supervisor: Logging request counters", {OpCodeDictKeys.TIMEOUT: 2.0}),
"55": ("PLOC Supervisor: Request ADC Report", {OpCodeDictKeys.TIMEOUT: 2.0}),
} }
service_ploc_supv_tuple = ("PLOC Supervisor", op_code_dict_srv_ploc_supv) service_ploc_supv_tuple = ("PLOC Supervisor", op_code_dict_srv_ploc_supv)

7
pus_tc/devs/ploc_supervisor.py
View File

@ -94,7 +94,7 @@ class SupvActionIds:
LOGGING_REQUEST_EVENT_BUFFERS = 54 LOGGING_REQUEST_EVENT_BUFFERS = 54
LOGGING_CLEAR_COUNTERS = 55 LOGGING_CLEAR_COUNTERS = 55
LOGGING_SET_TOPIC = 56 LOGGING_SET_TOPIC = 56
REQUEST_ADC_REPORT = 57
class SupvHkIds: class SupvHkIds:
@ -459,6 +459,11 @@ def pack_ploc_supv_commands(
command = object_id + struct.pack('!I', SupvActionIds.LOGGING_REQUEST_COUNTERS) command = object_id + struct.pack('!I', SupvActionIds.LOGGING_REQUEST_COUNTERS)
command = PusTelecommand(service=8, subservice=128, ssc=69, app_data=command) command = PusTelecommand(service=8, subservice=128, ssc=69, app_data=command)
tc_queue.appendleft(command.pack_command_tuple()) tc_queue.appendleft(command.pack_command_tuple())
elif op_code == "55":
tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Request ADC report"))
command = object_id + struct.pack('!I', SupvActionIds.REQUEST_ADC_REPORT)
command = PusTelecommand(service=8, subservice=128, ssc=70, app_data=command)
tc_queue.appendleft(command.pack_command_tuple())
return tc_queue return tc_queue

2
tmtccmd

@ -1 +1 @@
Subproject commit 48b6b8396eb3ea5ec4527ccb96f5909a29cd95f6 Subproject commit 5d6db96ffccab2fb64670875bab81fdd1ddd3816