eive/eive-tmtc
14
0
Fork 0
Code Issues Pull Requests 1 Projects Releases 99 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 +7130 -1536
118 changed files with 7130 additions and 1536 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f8d6fc4c2b - Show all commits

3
config/hook_implementations.py
View File

@@ -362,8 +362,6 @@ def get_eive_service_op_code_dict(service_op_code_dict: ServiceOpCodeDictT):
"Syrlinks Handler: Read LCL config register", "Syrlinks Handler: Read LCL config register",
{OpCodeDictKeys.TIMEOUT: 2.0}, {OpCodeDictKeys.TIMEOUT: 2.0},
), ),
<<<<<<< Updated upstream
=======
"15": ( "15": (
"Syrlinks Handler: Set waveform OQPSK", "Syrlinks Handler: Set waveform OQPSK",
{OpCodeDictKeys.TIMEOUT: 2.0}, {OpCodeDictKeys.TIMEOUT: 2.0},
@@ -384,7 +382,6 @@ def get_eive_service_op_code_dict(service_op_code_dict: ServiceOpCodeDictT):
"Syrlinks Handler: Disable debug output", "Syrlinks Handler: Disable debug output",
{OpCodeDictKeys.TIMEOUT: 2.0}, {OpCodeDictKeys.TIMEOUT: 2.0},
), ),
>>>>>>> Stashed changes
} }
service_syrlinks_handler_tuple = ( service_syrlinks_handler_tuple = (
"Syrlinks Handler", "Syrlinks Handler",

1
pus_tc/devs/syrlinks_hk_handler.py
View File

@@ -34,6 +34,7 @@ class CommandIds:
SET_WAVEFORM_BPSK = 18 SET_WAVEFORM_BPSK = 18
SET_SECOND_CONFIG = 19 SET_SECOND_CONFIG = 19
ENABLE_DEBUG = 20 ENABLE_DEBUG = 20
DISABLE_DEBUG = 21
def pack_syrlinks_command( def pack_syrlinks_command(