From fd4ee6f1c5826013757ca6ca33e5b5bbbf4459cd Mon Sep 17 00:00:00 2001
From: Michel Le Bihan <michel@lebihan.pl>
Date: Tue, 5 Mar 2024 19:36:01 +0100
Subject: [PATCH] Only print keyboard help on poll start and unknown command
 (#31710)

old-commit-hash: 32fb58656a46dc428ec43f04f396aee994efd14e
---
 tools/sim/bridge/common.py     | 4 ----
 tools/sim/lib/keyboard_ctrl.py | 7 +++++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/tools/sim/bridge/common.py b/tools/sim/bridge/common.py
index 2391df6651..78ddfa5aa6 100644
--- a/tools/sim/bridge/common.py
+++ b/tools/sim/bridge/common.py
@@ -13,7 +13,6 @@ from openpilot.selfdrive.car.honda.values import CruiseButtons
 from openpilot.tools.sim.lib.common import SimulatorState, World
 from openpilot.tools.sim.lib.simulated_car import SimulatedCar
 from openpilot.tools.sim.lib.simulated_sensors import SimulatedSensors
-from openpilot.tools.sim.lib.keyboard_ctrl import KEYBOARD_HELP
 
 
 def rk_loop(function, hz, exit_event: threading.Event):
@@ -74,9 +73,6 @@ class SimulatorBridge(ABC):
   def print_status(self):
     print(
     f"""
-Keyboard Commands:
-{KEYBOARD_HELP}
-
 State:
 Ignition: {self.simulator_state.ignition} Engaged: {self.simulator_state.is_engaged}
     """)
diff --git a/tools/sim/lib/keyboard_ctrl.py b/tools/sim/lib/keyboard_ctrl.py
index 339f4ea6bb..ea255d9ce4 100644
--- a/tools/sim/lib/keyboard_ctrl.py
+++ b/tools/sim/lib/keyboard_ctrl.py
@@ -49,7 +49,12 @@ def getch() -> str:
     termios.tcsetattr(STDIN_FD, termios.TCSADRAIN, old_settings)
   return ch
 
+def print_keyboard_help():
+  print(f"Keyboard Commands:\n{KEYBOARD_HELP}")
+
 def keyboard_poll_thread(q: 'Queue[str]'):
+  print_keyboard_help()
+
   while True:
     c = getch()
     if c == '1':
@@ -77,6 +82,8 @@ def keyboard_poll_thread(q: 'Queue[str]'):
     elif c == 'q':
       q.put("quit")
       break
+    else:
+      print_keyboard_help()
 
 def test(q: 'Queue[str]') -> NoReturn:
   while True: