config/hook_implementations.py

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

pus_tc/devs/syrlinks_hk_handler.py

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