From 476066a5ac261943a24caa5e1aa270595a6cc120 Mon Sep 17 00:00:00 2001
From: Ulrich Mohr <mohr@irs.uni-stuttgart.de>
Date: Tue, 17 May 2022 22:11:31 +0200
Subject: [PATCH] changed controller commanding to allow more flexibility

---
 pus_tc/cmd_definitions.py    |  8 +++---
 pus_tc/system/controllers.py | 55 +++++++++++++++++++++---------------
 2 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/pus_tc/cmd_definitions.py b/pus_tc/cmd_definitions.py
index c3ea712..db803da 100644
--- a/pus_tc/cmd_definitions.py
+++ b/pus_tc/cmd_definitions.py
@@ -1058,14 +1058,14 @@ def add_system_cmds(cmd_dict: ServiceOpCodeDictT):
     op_code_dict = dict()
     add_op_code_entry(
         op_code_dict=op_code_dict,
-        keys=controllers.OpCodes.THERMAL_CONTROLLER_NORMAL,
-        info=controllers.Info.THERMAL_CONTROLLER_NORMAL,
+        keys=controllers.OpCodes.THERMAL_CONTROLLER,
+        info=controllers.Info.THERMAL_CONTROLLER,
         options=default_opts,
     )
     add_op_code_entry(
         op_code_dict=op_code_dict,
-        keys=controllers.OpCodes.THERMAL_CONTROLLER_OFF,
-        info=controllers.Info.THERMAL_CONTROLLER_OFF,
+        keys=controllers.OpCodes.CORE_CONTROLLER,
+        info=controllers.Info.CORE_CONTROLLER,
         options=default_opts,
     )
     add_service_op_code_entry(
diff --git a/pus_tc/system/controllers.py b/pus_tc/system/controllers.py
index 183d1ec..30a5b4d 100644
--- a/pus_tc/system/controllers.py
+++ b/pus_tc/system/controllers.py
@@ -1,35 +1,44 @@
-from tmtccmd.tc.definitions import TcQueueT, QueueCommands
-from tmtccmd.tc.pus_200_fsfw_modes import Modes
+from ast import Pass
+from tmtccmd.tc.definitions import TcQueueT
+
+
 
 from .common import command_mode
 import config.object_ids as obj_ids
 
 
 class OpCodes:
-    THERMAL_CONTROLLER_NORMAL = ["0", "thermal-normal"]
-    THERMAL_CONTROLLER_OFF = ["1", "thermal-off"]
+    THERMAL_CONTROLLER = [obj_ids.THERMAL_CONTROLLER_ID.hex(), "thermal_controller"]
+    CORE_CONTROLLER = [obj_ids.CORE_CONTROLLER_ID.hex(), "core_controller"]
 
 
 class Info:
-    THERMAL_CONTROLLER_NORMAL = "Switching Thermal Controller into normal"
-    THERMAL_CONTROLLER_OFF = "Switching Thermal Controller off"
+    THERMAL_CONTROLLER = "Thermal controller"
+    CORE_CONTROLLER = "ACS controller"
 
 
 def pack_controller_commands(tc_queue: TcQueueT, op_code: str):
-    if op_code in OpCodes.THERMAL_CONTROLLER_NORMAL:
-        command_mode(
-            object_id=obj_ids.THERMAL_CONTROLLER_ID,
-            mode=Modes.NORMAL,
-            submode=0,
-            tc_queue=tc_queue,
-            info=Info.THERMAL_CONTROLLER_NORMAL,
-        )
-    if op_code in OpCodes.THERMAL_CONTROLLER_OFF:
-        command_mode(
-            object_id=obj_ids.THERMAL_CONTROLLER_ID,
-            mode=Modes.OFF,
-            submode=0,
-            tc_queue=tc_queue,
-            info=Info.THERMAL_CONTROLLER_OFF,
-        )
- 
+    mode = int(input("Specify mode: (OFF = 0; ON = 1; NORMAL = 2) [2] ") or "2")
+    print(mode)
+    if mode < 0  or mode > 2:
+        print("Invalid Mode, defaulting to OFF")
+        mode = 0
+    submode = int(input("Specify submode [0]: ") or "0")
+    command_mode(
+        object_id=get_object_from_op_code(op_code),
+        mode=mode,
+        submode=submode,
+        tc_queue=tc_queue,
+        info=op_code + " to " + str(mode) + "," + str(submode),
+    )
+
+def get_object_from_op_code(op_code: str):
+    try:
+        return bytes.fromhex(op_code)
+    except:
+        pass
+
+    if op_code in OpCodes.THERMAL_CONTROLLER:
+        return obj_ids.THERMAL_CONTROLLER_ID
+    if op_code in OpCodes.CORE_CONTROLLER:
+        return obj_ids.CORE_CONTROLLER_ID