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

v1.9.0 #53

Merged
muellerr merged 354 commits from develop into master 2022-04-07 17:39:42 +02:00
Conversation 0 Commits 354 Files Changed 125 +5 -2
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5d9f008320 - Show all commits

2
pus_tc/devs/plpcdu.py
View File

@ -172,7 +172,7 @@ def pack_pl_pcdu_commands(tc_queue: TcQueueT, op_code: str):
| (1 << NormalSubmodesMask.X8_ON) | (1 << NormalSubmodesMask.X8_ON)
| (1 << NormalSubmodesMask.TX_ON) | (1 << NormalSubmodesMask.TX_ON)
| (1 << NormalSubmodesMask.MPA_ON) | (1 << NormalSubmodesMask.MPA_ON)
| (1 << NormalSubmodesMask.MPA_ON) | (1 << NormalSubmodesMask.HPA_ON)
), ),
) )
if op_code in OpCodes.UPDATE_DRO_TO_X8_WAIT: if op_code in OpCodes.UPDATE_DRO_TO_X8_WAIT:

3
pus_tm/hk_handling.py
View File

@ -23,6 +23,7 @@ from config.object_ids import (
BPX_HANDLER_ID, BPX_HANDLER_ID,
CORE_CONTROLLER_ID, CORE_CONTROLLER_ID,
P60_DOCK_HANDLER, P60_DOCK_HANDLER,
PL_PCDU_ID
) )
LOGGER = get_console_logger() LOGGER = get_console_logger()
@ -86,6 +87,8 @@ def handle_regular_hk_print(
return handle_core_hk_data(printer=printer, hk_data=hk_data) return handle_core_hk_data(printer=printer, hk_data=hk_data)
elif object_id == P60_DOCK_HANDLER: elif object_id == P60_DOCK_HANDLER:
handle_p60_hk_data(printer=printer, hk_data=hk_data) handle_p60_hk_data(printer=printer, hk_data=hk_data)
elif object_id == PL_PCDU_ID:
log_to_both(printer, "Received PL PCDU HK data")
else: else:
LOGGER.info("Service 3 TM: Parsing for this SID has not been implemented.") LOGGER.info("Service 3 TM: Parsing for this SID has not been implemented.")
return HkReplyUnpacked() return HkReplyUnpacked()

2
spacepackets

@ -1 +1 @@
Subproject commit 0501a26b6f347cf48e0875658ac4eaca8cc7d819 Subproject commit f31bf25eb9f3618973bf76f8d137eefa67c6cf4c