From 598635ee4fb1eb246980564ae9f3a0feb1f4da30 Mon Sep 17 00:00:00 2001
From: Jakob Meier <meier-jakob@gmx.de>
Date: Tue, 25 Jan 2022 18:23:02 +0100
Subject: [PATCH] command to set arbitrary bitrates

---
 .idea/runConfigurations/ccsds_handler.xml    |  2 +-
 .idea/runConfigurations/tmtcc_Service_17.xml |  2 +-
 config/hook_implementations.py               |  1 +
 pus_tc/ccsds_handler.py                      | 21 +++++++++++++-------
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/.idea/runConfigurations/ccsds_handler.xml b/.idea/runConfigurations/ccsds_handler.xml
index 47a9e6d..7c6d714 100644
--- a/.idea/runConfigurations/ccsds_handler.xml
+++ b/.idea/runConfigurations/ccsds_handler.xml
@@ -12,7 +12,7 @@
     <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$/tmtc_client_cli.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" />
diff --git a/.idea/runConfigurations/tmtcc_Service_17.xml b/.idea/runConfigurations/tmtcc_Service_17.xml
index 06866e6..1ed784c 100644
--- a/.idea/runConfigurations/tmtcc_Service_17.xml
+++ b/.idea/runConfigurations/tmtcc_Service_17.xml
@@ -12,7 +12,7 @@
     <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$/tmtc_client_cli.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtccli.py" />
     <option name="PARAMETERS" value="-s 17 -o 0 -t 3 -l" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
diff --git a/config/hook_implementations.py b/config/hook_implementations.py
index b49aa93..af96d27 100644
--- a/config/hook_implementations.py
+++ b/config/hook_implementations.py
@@ -338,6 +338,7 @@ def get_eive_service_op_code_dict(service_op_code_dict: ServiceOpCodeDictT):
         "1": ("CCSDS Handler: Set high rate", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "2": ("CCSDS Handler: Enable transmitter", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "3": ("CCSDS Handler: Disable transmitter", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "4": ("CCSDS Handler: Set arbitrary bitrate", {OpCodeDictKeys.TIMEOUT: 2.0}),
     }
     service_ccsds_handler_tuple = ("CCSDS Handler", op_code_dict_srv_ccsds_handler)
 
diff --git a/pus_tc/ccsds_handler.py b/pus_tc/ccsds_handler.py
index c74be2b..bf9efb0 100644
--- a/pus_tc/ccsds_handler.py
+++ b/pus_tc/ccsds_handler.py
@@ -5,6 +5,8 @@
 @author J. Meier
 @date   20.11.2021
 """
+import struct
+
 from tmtccmd.config.definitions import QueueCommands
 from tmtccmd.tc.packer import TcQueueT
 from spacepackets.ecss.tc import PusTelecommand
@@ -19,36 +21,41 @@ class CommandIds:
     EN_TRANSMITTER = bytearray([0x0, 0x0, 0x0, 0x2])
     # Disables the syrlinks transmitter (by using RS485 enables lines)
     DIS_TRANSMITTER = bytearray([0x0, 0x0, 0x0, 0x3])
+    # Sets an arbitrary bitrate. Normally only set low and set high rate commands should be
+    # required
+    ARBITRARY_BITRATE = bytearray([0x0, 0x0, 0x0, 0x4])
 
 
 def pack_ccsds_handler_test(object_id: bytearray, tc_queue: TcQueueT, op_code: str) -> TcQueueT:
     tc_queue.appendleft(
         (QueueCommands.PRINT,
-         "Testing ccsds handler with object id: 0x" + object_id.hex())
+         "Testing CCSDS handler with object id: 0x" + object_id.hex())
     )
-
     if op_code == "0":
         tc_queue.appendleft((QueueCommands.PRINT, "CCSDS Handler: Set low rate"))
         command = object_id + CommandIds.SET_LOW_RATE
         command = PusTelecommand(service=8, subservice=128, ssc=20, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-
     if op_code == "1":
         tc_queue.appendleft((QueueCommands.PRINT, "CCSDS Handler: Set high rate"))
         command = object_id + CommandIds.SET_HIGH_RATE
         command = PusTelecommand(service=8, subservice=128, ssc=21, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-
     if op_code == "2":
         tc_queue.appendleft((QueueCommands.PRINT, "CCSDS Handler: Enables the transmitter"))
         command = object_id + CommandIds.EN_TRANSMITTER
-        command = PusTelecommand(service=8, subservice=128, ssc=21, app_data=command)
+        command = PusTelecommand(service=8, subservice=128, ssc=22, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-
     if op_code == "3":
         tc_queue.appendleft((QueueCommands.PRINT, "CCSDS Handler: Disables the transmitter"))
         command = object_id + CommandIds.DIS_TRANSMITTER
-        command = PusTelecommand(service=8, subservice=128, ssc=21, app_data=command)
+        command = PusTelecommand(service=8, subservice=128, ssc=23, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "4":
+        tc_queue.appendleft((QueueCommands.PRINT, "CCSDS Handler: Set arbitrary bitrate"))
+        bitrate = int(input("Specify bit rate (bps): "))
+        command = object_id + CommandIds.ARBITRARY_BITRATE + struct.pack('!I', bitrate)
+        command = PusTelecommand(service=8, subservice=128, ssc=24, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
 
     return tc_queue