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

fixed conflicts

Browse Source
This commit is contained in:
Jakob Meier
2022-04-05 11:58:13 +02:00
parent f8d6fc4c2b 4600aed2be
commit 28ca0aa363
4 changed files with 50 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pus_tc/devs/syrlinks_hk_handler.py
View File

@ -136,6 +136,7 @@ def pack_syrlinks_command(
command = object_id + struct.pack('!I', CommandIds.READ_LCL_CONFIG_REGISTER)
command = PusTelecommand(service=8, subservice=128, ssc=19, app_data=command)
tc_queue.appendleft(command.pack_command_tuple())
<<<<<<< HEAD
if op_code == "15":
tc_queue.appendleft(
(QueueCommands.PRINT, "Syrlinks: Set waveform OQPSK")
@ -171,3 +172,5 @@ def pack_syrlinks_command(
command = object_id + struct.pack('!I', CommandIds.DISABLE_DEBUG)
command = PusTelecommand(service=8, subservice=128, ssc=24, app_data=command)
tc_queue.appendleft(command.pack_command_tuple())
=======
>>>>>>> develop