From eb4dc95160ccf9093b46fa2d48240c69c85226ea Mon Sep 17 00:00:00 2001
From: EIVE Cleanroom <muellerr@irs.uni-stuttgart.de>
Date: Wed, 30 Mar 2022 16:31:52 +0200
Subject: [PATCH 1/4] write lcl config register

---
 .idea/runConfigurations/Syrlinks.xml |  2 +-
 config/hook_implementations.py       | 12 ++++++++++++
 pus_tc/devs/syrlinks_hk_handler.py   | 25 +++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/.idea/runConfigurations/Syrlinks.xml b/.idea/runConfigurations/Syrlinks.xml
index 28f4220..d5a3454 100644
--- a/.idea/runConfigurations/Syrlinks.xml
+++ b/.idea/runConfigurations/Syrlinks.xml
@@ -13,7 +13,7 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtccli.py" />
-    <option name="PARAMETERS" value="-s syrlinks -l -t 6" />
+    <option name="PARAMETERS" value="-s syrlinks -t 6" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />
diff --git a/config/hook_implementations.py b/config/hook_implementations.py
index 8240759..3915be8 100644
--- a/config/hook_implementations.py
+++ b/config/hook_implementations.py
@@ -350,6 +350,18 @@ def get_eive_service_op_code_dict(service_op_code_dict: ServiceOpCodeDictT):
             "Syrlinks Handler: Read TX AGC value low byte ",
             {OpCodeDictKeys.TIMEOUT: 2.0},
         ),
+        "12": (
+            "Syrlinks Handler: Write LCL config",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "13": (
+            "Syrlinks Handler: Read RX status registers",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "14": (
+            "Syrlinks Handler: Read LCL config register",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
     }
     service_syrlinks_handler_tuple = (
         "Syrlinks Handler",
diff --git a/pus_tc/devs/syrlinks_hk_handler.py b/pus_tc/devs/syrlinks_hk_handler.py
index 7b9b724..109ba79 100644
--- a/pus_tc/devs/syrlinks_hk_handler.py
+++ b/pus_tc/devs/syrlinks_hk_handler.py
@@ -11,6 +11,7 @@ from tmtccmd.tc.definitions import TcQueueT
 from tmtccmd.tc.service_3_housekeeping import make_sid, generate_one_hk_command
 from spacepackets.ecss.tc import PusTelecommand
 from tmtccmd.tc.service_200_mode import pack_mode_data, Modes
+import struct
 
 
 class SetIds:
@@ -26,6 +27,9 @@ class CommandIds:
     READ_TX_WAVEFORM = bytearray([0x0, 0x0, 0x0, 0x8])
     READ_TX_AGC_VALUE_HIGH_BYTE = bytearray([0x0, 0x0, 0x0, 0x9])
     READ_TX_AGC_VALUE_LOW_BYTE = bytearray([0x0, 0x0, 0x0, 0x9])
+    WRITE_LCL_CONFIG = 11
+    READ_LCL_CONFIG_REGISTER = 12
+    READ_RX_STATUS_REGISTERS = 2
 
 
 def pack_syrlinks_command(
@@ -106,3 +110,24 @@ def pack_syrlinks_command(
         command = object_id + CommandIds.READ_TX_AGC_VALUE_LOW_BYTE
         command = PusTelecommand(service=8, subservice=128, ssc=16, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "12":
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "Syrlinks: Write LCL config")
+        )
+        command = object_id + struct.pack('!I', CommandIds.WRITE_LCL_CONFIG)
+        command = PusTelecommand(service=8, subservice=128, ssc=17, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "13":
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "Syrlinks: Read RX status registers")
+        )
+        command = object_id + struct.pack('!I', CommandIds.READ_RX_STATUS_REGISTERS)
+        command = PusTelecommand(service=8, subservice=128, ssc=18, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "14":
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "Syrlinks: Read LCL config register")
+        )
+        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())

From f7a3ad9981c2792d9d6bda335cb22e540c8f9b1a Mon Sep 17 00:00:00 2001
From: EIVE Cleanroom <muellerr@irs.uni-stuttgart.de>
Date: Wed, 30 Mar 2022 18:12:51 +0200
Subject: [PATCH 2/4] rad sensor enable debug output

---
 .idea/runConfigurations/ccsds_handler.xml |  6 ++---
 .idea/runConfigurations/pdec_handler.xml  |  4 +--
 pus_tc/cmd_definitions.py                 |  4 +++
 pus_tc/devs/rad_sensor.py                 | 33 +++++++++++++++++++++++
 4 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/.idea/runConfigurations/ccsds_handler.xml b/.idea/runConfigurations/ccsds_handler.xml
index 7c6d714..5e506bb 100644
--- a/.idea/runConfigurations/ccsds_handler.xml
+++ b/.idea/runConfigurations/ccsds_handler.xml
@@ -6,16 +6,16 @@
     <envs>
       <env name="PYTHONUNBUFFERED" value="1" />
     </envs>
-    <option name="SDK_HOME" value="C:\Users\jakob\AppData\Local\Programs\Python\Python39\python.exe" />
+    <option name="SDK_HOME" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="IS_MODULE_SDK" value="false" />
+    <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtccli.py" />
     <option name="PARAMETERS" value="-s ccsds_handler -l -t 8 --hk" />
     <option name="SHOW_COMMAND_LINE" value="false" />
-    <option name="EMULATE_TERMINAL" value="false" />
+    <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />
     <option name="REDIRECT_INPUT" value="false" />
     <option name="INPUT_FILE" value="" />
diff --git a/.idea/runConfigurations/pdec_handler.xml b/.idea/runConfigurations/pdec_handler.xml
index 5a2f222..cedb49e 100644
--- a/.idea/runConfigurations/pdec_handler.xml
+++ b/.idea/runConfigurations/pdec_handler.xml
@@ -6,9 +6,9 @@
     <envs>
       <env name="PYTHONUNBUFFERED" value="1" />
     </envs>
-    <option name="SDK_HOME" value="C:\Users\jakob\AppData\Local\Programs\Python\Python39\python.exe" />
+    <option name="SDK_HOME" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="IS_MODULE_SDK" value="false" />
+    <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
diff --git a/pus_tc/cmd_definitions.py b/pus_tc/cmd_definitions.py
index 5dff327..47d39ee 100644
--- a/pus_tc/cmd_definitions.py
+++ b/pus_tc/cmd_definitions.py
@@ -461,6 +461,10 @@ def add_rad_sens_cmds(cmd_dict: ServiceOpCodeDictT):
         "0": ("Radiation Sensor: Set mode on", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "1": ("Radiation Sensor: Set mode normal", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "2": ("Radiation Sensor: Set mode off", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "3": ("Radiation Sensor: Start conversions", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "4": ("Radiation Sensor: Read conversions", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "5": ("Radiation Sensor: Enable debug output", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "6": ("Radiation Sensor: Disable debug putput", {OpCodeDictKeys.TIMEOUT: 2.0}),
     }
     service_rad_sensor_tuple = ("Radiation Sensor", op_code_dict_srv_rad_sensor)
     cmd_dict[CustomServiceList.RAD_SENSOR.value] = service_rad_sensor_tuple
diff --git a/pus_tc/devs/rad_sensor.py b/pus_tc/devs/rad_sensor.py
index 2dbee43..4216a23 100644
--- a/pus_tc/devs/rad_sensor.py
+++ b/pus_tc/devs/rad_sensor.py
@@ -5,6 +5,8 @@
 @author J. Meier
 @date   01.07.2021
 """
+import struct
+
 from tmtccmd.config.definitions import QueueCommands
 
 from tmtccmd.tc.packer import TcQueueT
@@ -12,6 +14,13 @@ from spacepackets.ecss.tc import PusTelecommand
 from pus_tc.service_200_mode import pack_mode_data
 
 
+class CommandIds:
+    START_CONVERSIONS = 2
+    READ_CONVERSIONS = 3
+    ENABLE_DEBUG_OUTPUT = 4
+    DISABLE_DEBUG_OUTPUT = 5
+
+
 def pack_rad_sensor_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: str):
     tc_queue.appendleft(
         (
@@ -37,3 +46,27 @@ def pack_rad_sensor_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code:
         mode_data = pack_mode_data(object_id, 0, 0)
         command = PusTelecommand(service=200, subservice=1, ssc=42, app_data=mode_data)
         tc_queue.appendleft(command.pack_command_tuple())
+
+    if op_code == "3":
+        tc_queue.appendleft((QueueCommands.PRINT, "Rad sensor: Start  conversions"))
+        command = object_id + struct.pack('!I', CommandIds.START_CONVERSIONS)
+        command = PusTelecommand(service=8, subservice=128, ssc=43, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+    if op_code == "4":
+        tc_queue.appendleft((QueueCommands.PRINT, "Rad sensor: Read  conversions"))
+        command = object_id + struct.pack('!I', CommandIds.READ_CONVERSIONS)
+        command = PusTelecommand(service=8, subservice=128, ssc=44, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+    if op_code == "5":
+        tc_queue.appendleft((QueueCommands.PRINT, "Rad sensor: Enable debug output"))
+        command = object_id + struct.pack('!I', CommandIds.ENABLE_DEBUG_OUTPUT)
+        command = PusTelecommand(service=8, subservice=128, ssc=45, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+    if op_code == "6":
+        tc_queue.appendleft((QueueCommands.PRINT, "Rad sensor: Disable debug output"))
+        command = object_id + struct.pack('!I', CommandIds.DISABLE_DEBUG_OUTPUT)
+        command = PusTelecommand(service=8, subservice=128, ssc=45, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())

From 592f37544f252466f702502ffb0140840ab75d8c Mon Sep 17 00:00:00 2001
From: Jakob Meier <meier-jakob@gmx.de>
Date: Mon, 4 Apr 2022 15:05:38 +0200
Subject: [PATCH 3/4] fixed conflicts

---
 .idea/runConfigurations/PDU1_Commanding.xml |  2 +-
 config/hook_implementations.py              | 23 +++++++++
 pus_tc/devs/syrlinks_hk_handler.py          | 55 ++++++++++++++++++---
 3 files changed, 71 insertions(+), 9 deletions(-)

diff --git a/.idea/runConfigurations/PDU1_Commanding.xml b/.idea/runConfigurations/PDU1_Commanding.xml
index 45f209a..28f9c0d 100644
--- a/.idea/runConfigurations/PDU1_Commanding.xml
+++ b/.idea/runConfigurations/PDU1_Commanding.xml
@@ -13,7 +13,7 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtccli.py" />
-    <option name="PARAMETERS" value="-s pdu1 -l -t 6" />
+    <option name="PARAMETERS" value="-s pdu1 -t 6" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />
diff --git a/config/hook_implementations.py b/config/hook_implementations.py
index 3915be8..c987d21 100644
--- a/config/hook_implementations.py
+++ b/config/hook_implementations.py
@@ -362,6 +362,29 @@ 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},
+        ),
+        "16": (
+            "Syrlinks Handler: Set waveform BPSK",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "17": (
+            "Syrlinks Handler: Set second config",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "18": (
+            "Syrlinks Handler: Enable debug output",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "19": (
+            "Syrlinks Handler: Disable debug output",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+>>>>>>> Stashed changes
     }
     service_syrlinks_handler_tuple = (
         "Syrlinks Handler",
diff --git a/pus_tc/devs/syrlinks_hk_handler.py b/pus_tc/devs/syrlinks_hk_handler.py
index 109ba79..b12dada 100644
--- a/pus_tc/devs/syrlinks_hk_handler.py
+++ b/pus_tc/devs/syrlinks_hk_handler.py
@@ -20,16 +20,20 @@ class SetIds:
 
 
 class CommandIds:
-    SET_TX_MODE_STANDBY = bytearray([0x0, 0x0, 0x0, 0x3])
-    SET_TX_MODE_MODULATION = bytearray([0x0, 0x0, 0x0, 0x4])
-    SET_TX_MODE_CW = bytearray([0x0, 0x0, 0x0, 0x5])
-    READ_TX_STATUS = bytearray([0x0, 0x0, 0x0, 0x7])
-    READ_TX_WAVEFORM = bytearray([0x0, 0x0, 0x0, 0x8])
-    READ_TX_AGC_VALUE_HIGH_BYTE = bytearray([0x0, 0x0, 0x0, 0x9])
-    READ_TX_AGC_VALUE_LOW_BYTE = bytearray([0x0, 0x0, 0x0, 0x9])
+    READ_RX_STATUS_REGISTERS = 2
+    SET_TX_MODE_STANDBY = 3
+    SET_TX_MODE_MODULATION = 4
+    SET_TX_MODE_CW = 5
+    READ_TX_STATUS = 7
+    READ_TX_WAVEFORM = 8
+    READ_TX_AGC_VALUE_HIGH_BYTE = 9
+    READ_TX_AGC_VALUE_LOW_BYTE = 10
     WRITE_LCL_CONFIG = 11
     READ_LCL_CONFIG_REGISTER = 12
-    READ_RX_STATUS_REGISTERS = 2
+    SET_WAVEFORM_OQPSK = 17
+    SET_WAVEFORM_BPSK = 18
+    SET_SECOND_CONFIG = 19
+    ENABLE_DEBUG = 20
 
 
 def pack_syrlinks_command(
@@ -131,3 +135,38 @@ 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())
+    if op_code == "15":
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "Syrlinks: Set waveform OQPSK")
+        )
+        command = object_id + struct.pack('!I', CommandIds.SET_WAVEFORM_OQPSK)
+        command = PusTelecommand(service=8, subservice=128, ssc=20, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "16":
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "Syrlinks: Set waveform BPSK")
+        )
+        command = object_id + struct.pack('!I', CommandIds.SET_WAVEFORM_BPSK)
+        command = PusTelecommand(service=8, subservice=128, ssc=21, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "17":
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "Syrlinks: Set second config")
+        )
+        command = object_id + struct.pack('!I', CommandIds.SET_SECOND_CONFIG)
+        command = PusTelecommand(service=8, subservice=128, ssc=22, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "18":
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "Syrlinks: Enable debug printout")
+        )
+        command = object_id + struct.pack('!I', CommandIds.ENABLE_DEBUG)
+        command = PusTelecommand(service=8, subservice=128, ssc=23, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "19":
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "Syrlinks: Disable debug printout")
+        )
+        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())

From f8d6fc4c2b2276c58247d626df3a461131027d2b Mon Sep 17 00:00:00 2001
From: Jakob Meier <meier-jakob@gmx.de>
Date: Tue, 5 Apr 2022 08:42:38 +0200
Subject: [PATCH 4/4] disabel debug command id

---
 config/hook_implementations.py     | 3 ---
 pus_tc/devs/syrlinks_hk_handler.py | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/config/hook_implementations.py b/config/hook_implementations.py
index c987d21..177e6f9 100644
--- a/config/hook_implementations.py
+++ b/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",
diff --git a/pus_tc/devs/syrlinks_hk_handler.py b/pus_tc/devs/syrlinks_hk_handler.py
index b12dada..a902af7 100644
--- a/pus_tc/devs/syrlinks_hk_handler.py
+++ b/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(