From f0d2f1b2f326fc56556d929b5809827ea873f4a0 Mon Sep 17 00:00:00 2001 From: Chao Gui Date: Mon, 27 Feb 2023 16:03:07 -0800 Subject: util: Support inject_keys util with Frostflow kb matrix BUG=b:268158580 TEST=NONE Change-Id: I34183f23f0460440182ab61d0c0a518abd3ccf23 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4295371 Reviewed-by: Tim Van Patten Reviewed-by: Jonathon Murphy Commit-Queue: Chao Gui Tested-by: Chao Gui (cherry picked from commit 9ead57f955c54f736aae38abe64413620ed711ef) Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4513643 Tested-by: LeilaCY Lin Reviewed-by: SamSP Liu Reviewed-by: Chao Gui --- util/inject-keys.py | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 109 insertions(+), 1 deletion(-) diff --git a/util/inject-keys.py b/util/inject-keys.py index 71eb7a3281..8efdb17208 100755 --- a/util/inject-keys.py +++ b/util/inject-keys.py @@ -14,7 +14,7 @@ import subprocess import sys -KEYMATRIX = { +KEYMATRIX_0 = { "`": (3, 1), "1": (6, 1), "2": (6, 4), @@ -90,6 +90,91 @@ KEYMATRIX = { "": (7, 12), } +KEYMATRIX_1 = { + "`": (3, 1), + "1": (7, 1), + "2": (6, 4), + "3": (6, 2), + "4": (6, 3), + "5": (3, 3), + "6": (3, 6), + "7": (6, 6), + "8": (6, 5), + "9": (6, 9), + "0": (0, 9), + "-": (3, 8), + "=": (0, 8), + "q": (6, 12), + "w": (7, 4), + "e": (5, 8), + "r": (7, 3), + "t": (2, 3), + "y": (2, 6), + "u": (7, 6), + "i": (7, 5), + "o": (6, 8), + "p": (7, 8), + "[": (2, 8), + "]": (2, 5), + "\\": (1, 11), + "a": (4, 1), + "s": (5, 6), + "d": (0, 14), + "f": (4, 3), + "g": (1, 3), + "h": (1, 6), + "j": (4, 6), + "k": (4, 5), + "l": (4, 9), + ";": (4, 8), + "'": (1, 8), + "z": (7, 9), + "x": (5, 5), + "c": (7, 13), + "v": (7, 2), + "b": (0, 3), + "n": (0, 6), + "m": (5, 1), + ",": (5, 4), + ".": (5, 9), + "/": (6, 11), + " ": (5, 3), + "": (1, 12), + "": (0, 10), + "": (5, 11), + "": (6, 1), + "": (1, 4), + "": (7, 7), + "": (4, 0), + "": (1, 1), + "": (7, 11), + "": (3, 2), + "": (6, 10), + "": (2, 0), + "": (4, 2), + "": (3, 0), + "": (2, 2), + "": (1, 2), + "": (4, 4), + "": (3, 4), + "": (2, 4), + "": (2, 9), + "": (1, 9), + "": (2, 11), + "": (1, 7), + "": (4, 11), + "": (0, 12), +} + +# Extensible: when new model comes up in future that deviates from default keyboard matrix, +# and most certainly different from frostflow, new KEYMATRIX_x entry can be defined first, +# and then add an "model_name" : KEYMATRIX_x to here. +MODEL_KBMATRIX_MAP = { + "default_matrix": KEYMATRIX_0, + "frostflow": KEYMATRIX_1, + # "mithrax" is another model that uses same kb matrix with frostflow, + # can add "mithrax" : KEYMATRIX_1 +} UNSHIFT_TABLE = { "~": "`", @@ -120,6 +205,7 @@ for c in string.ascii_lowercase: def inject_event(key, press): + """Function inject_event().""" if len(key) >= 2 and key[0] != "<": key = "<" + key + ">" if key not in KEYMATRIX: @@ -132,11 +218,13 @@ def inject_event(key, press): def inject_key(key): + """Function inject_key().""" inject_event(key, True) inject_event(key, False) def inject_string(string): + """Function inject_string().""" for c in string: if c in KEYMATRIX: inject_key(c) @@ -149,7 +237,20 @@ def inject_string(string): sys.exit(1) +def read_dutmodel(): + """Function read_dutmodel().""" + try: + output = subprocess.check_output( + "cros_config / name", stderr=subprocess.DEVNULL, shell=True + ) + modelstr = str(output, "UTF-8") + except subprocess.SubprocessError: + modelstr = "" + return modelstr + + def usage(): + """Function usage().""" print( "Usage: %s [-s ] [-k ]" % this_script, "[-p ] [-r ] ...", @@ -160,6 +261,7 @@ def usage(): def help(): + """Function help().""" usage() print("Valid keys are:") i = 0 @@ -173,6 +275,7 @@ def help(): def usage_check(asserted_condition, message): + """Function usage_check().""" if asserted_condition: return print("%s:" % this_script, message) @@ -198,6 +301,11 @@ for i in range(1, arg_len, 2): "unknown flag: %s" % sys.argv[i], ) +KEYMATRIX = KEYMATRIX_0 +model = read_dutmodel() +if model in MODEL_KBMATRIX_MAP: + KEYMATRIX = MODEL_KBMATRIX_MAP[model] + for i in range(1, arg_len, 2): flag = sys.argv[i] arg = sys.argv[i + 1] -- cgit v1.2.1