From 85a3c936a4b38f490a18ec7446f08e505b08cc2d Mon Sep 17 00:00:00 2001
From: Ulrich Mohr <mohr@irs.uni-stuttgart.de>
Date: Mon, 23 May 2022 00:20:06 +0200
Subject: [PATCH] tmtcgui -m7 is kinda working like I would expect it to

---
 pus_tc/prompt_parameters.py  |  7 +++++--
 pus_tc/system/controllers.py | 12 +++++++++++-
 tmtccmd                      |  2 +-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/pus_tc/prompt_parameters.py b/pus_tc/prompt_parameters.py
index 7959c34..aa7dacb 100644
--- a/pus_tc/prompt_parameters.py
+++ b/pus_tc/prompt_parameters.py
@@ -6,7 +6,7 @@ from PyQt5 import QtCore
 
 
 from tmtccmd.core.globals_manager import get_global
-from tmtccmd.config.definitions import CoreGlobalIds
+from tmtccmd.config.definitions import CoreGlobalIds, CoreModeList
 
 
 class Parameter:
@@ -90,7 +90,10 @@ class ParameterDialog(QDialog):
     """
 def prompt_parameters(parameterList):
     gui = get_global(CoreGlobalIds.GUI)
-    if gui:
+    mode = get_global(CoreGlobalIds.MODE)
+
+    # gui only works in cont mode right now
+    if gui and mode == CoreModeList.CONTINUOUS_MODE:
         return _gui_prompt(parameterList)
     else: 
         return _cli_prompt(parameterList)
diff --git a/pus_tc/system/controllers.py b/pus_tc/system/controllers.py
index 50db0de..1f44f32 100644
--- a/pus_tc/system/controllers.py
+++ b/pus_tc/system/controllers.py
@@ -1,5 +1,5 @@
 from tmtccmd.tc.definitions import TcQueueT
-
+from tmtccmd.config import QueueCommands
 
 from .common import command_mode
 import config.object_ids as obj_ids
@@ -33,6 +33,16 @@ def pack_controller_commands(tc_queue: TcQueueT, op_code: str):
         info=op_code + " to " + str(mode) + "," + str(submode),
     )
 
+    tc_queue.appendleft((QueueCommands.WAIT, 20))
+
+    command_mode(
+        object_id=get_object_from_op_code(op_code),
+        mode=0,
+        submode=0,
+        tc_queue=tc_queue,
+        info=op_code + " to 0,0",
+    )
+
 
 def get_object_from_op_code(op_code: str):
     try:
diff --git a/tmtccmd b/tmtccmd
index 208f577..b031eef 160000
--- a/tmtccmd
+++ b/tmtccmd
@@ -1 +1 @@
-Subproject commit 208f5779327db817841f073d0bbdd96da491b5d9
+Subproject commit b031eefe4aea7829e5aa2051e7493472529e6d2d