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

v1.7.0 #8

Merged
meierj merged 40 commits from develop into master 2021-07-26 18:17:09 +02:00
Conversation 0 Commits 40 Files Changed 51 +3 -3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ec0ef1a4f7 - Show all commits

2
config/object_ids.py
View File

@ -18,7 +18,7 @@ PCDU_HANDLER_ID = bytes([0x44, 0x20, 0x00, 0xA1])
SOLAR_ARRAY_DEPLOYMENT_ID = bytes([0x44, 0x41, 0x10, 0xA2])
SYRLINKS_HANDLER = bytes([0x44, 0x53, 0x00, 0xA3])
IMTQ_HANDLER_ID = bytearray([0x44, 0x14, 0x00, 0x14])
PLOC_ID = bytearray([0x44, 0x33, 0x00, 0x15])
PLOC_MPSOC_ID = bytearray([0x44, 0x33, 0x00, 0x15])
RW1_ID = bytes([0x44, 0x12, 0x00, 0x1])
RW2_ID = bytes([0x44, 0x12, 0x00, 0x2])
RW3_ID = bytes([0x44, 0x12, 0x00, 0x3])

2
pus_tc/tc_packer_hook.py
View File

@ -69,7 +69,7 @@ def pack_service_queue_user(service: Union[str, int], op_code: str, service_queu
object_id = IMTQ_HANDLER_ID
return pack_imtq_test_into(object_id=object_id, tc_queue=service_queue, op_code=op_code)
if service == CustomServiceList.PLOC.value:
object_id = PLOC_ID
object_id = PLOC_MPSOC_ID
return pack_ploc_test_into(object_id=object_id, tc_queue=service_queue)
if service == CustomServiceList.REACTION_WHEEL_1.value:
object_id = RW1_ID

2
pus_tm/service_8_hook.py
View File

@ -30,7 +30,7 @@ def user_analyze_service_8_data(
content_list = [data_string]
elif object_id == IMTQ_HANDLER_ID:
return handle_imtq_replies(action_id, custom_data)
elif object_id == PLOC_ID:
elif object_id == PLOC_MPSOC_ID:
return handle_ploc_replies(action_id, custom_data)
else:
header_list = []