diff --git a/pus_tc/system/controllers.py b/pus_tc/system/controllers.py index 30a5b4d..16f3252 100644 --- a/pus_tc/system/controllers.py +++ b/pus_tc/system/controllers.py @@ -1,11 +1,11 @@ -from ast import Pass from tmtccmd.tc.definitions import TcQueueT - from .common import command_mode import config.object_ids as obj_ids +from pus_tc.prompt_parameters import prompt_parameters + class OpCodes: THERMAL_CONTROLLER = [obj_ids.THERMAL_CONTROLLER_ID.hex(), "thermal_controller"] @@ -18,12 +18,11 @@ class Info: def pack_controller_commands(tc_queue: TcQueueT, op_code: str): - 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") + + parameters = prompt_parameters([{"name": "Mode", "defaultValue": "2"}, { + "name": "Submode", "defaultValue": "0"}]) + mode = int(parameters["Mode"]) + submode = int(parameters["Submode"]) command_mode( object_id=get_object_from_op_code(op_code), mode=mode, @@ -32,6 +31,7 @@ def pack_controller_commands(tc_queue: TcQueueT, op_code: str): info=op_code + " to " + str(mode) + "," + str(submode), ) + def get_object_from_op_code(op_code: str): try: return bytes.fromhex(op_code)