From 7540e7b47b55447475bb8191fb3520dd67cf7998 Mon Sep 17 00:00:00 2001 From: Jeremy Bettis Date: Fri, 8 Jul 2022 10:58:19 -0600 Subject: ec: Format all python files with black and isort find . \( -path ./private -prune \) -o -name '*.py' -print | xargs black find . \( -path ./private -prune \) -o -name '*.py' -print | xargs ~/chromiumos/chromite/scripts/isort --settings-file=.isort.cfg BRANCH=None BUG=b:238434058 TEST=None Signed-off-by: Jeremy Bettis Change-Id: I63462d6f15d1eaf3db84eb20d1404ee976be8382 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3749242 Commit-Queue: Jeremy Bettis Reviewed-by: Tom Hughes Tested-by: Jeremy Bettis Commit-Queue: Jack Rosenthal Auto-Submit: Jeremy Bettis Reviewed-by: Jack Rosenthal --- util/inject-keys.py | 149 +++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 113 insertions(+), 36 deletions(-) (limited to 'util/inject-keys.py') diff --git a/util/inject-keys.py b/util/inject-keys.py index bd10b693ad..d05d4fbed7 100755 --- a/util/inject-keys.py +++ b/util/inject-keys.py @@ -8,50 +8,124 @@ # Note: This is a py2/3 compatible file. from __future__ import print_function + import string import subprocess import sys - -KEYMATRIX = {'`': (3, 1), '1': (6, 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': (6, 8), '-': (3, 8), '=': (0, 8), 'q': (7, 1), 'w': (7, 4), - 'e': (7, 2), 'r': (7, 3), 't': (2, 3), 'y': (2, 6), 'u': (7, 6), - 'i': (7, 5), 'o': (7, 9), 'p': (7, 8), '[': (2, 8), ']': (2, 5), - '\\': (3, 11), 'a': (4, 1), 's': (4, 4), 'd': (4, 2), 'f': (4, 3), - 'g': (1, 3), 'h': (1, 6), 'j': (4, 6), 'k': (4, 5), 'l': (4, 9), - ';': (4, 8), '\'': (1, 8), 'z': (5, 1), 'x': (5, 4), 'c': (5, 2), - 'v': (5, 3), 'b': (0, 3), 'n': (0, 6), 'm': (5, 6), ',': (5, 5), - '.': (5, 9), '/': (5, 8), ' ': (5, 11), '': (6, 12), - '': (0, 10), '': (6, 11), '': (2, 1), - '': (0, 4), '': (7, 7), '': (4, 0), - '': (1, 1), '': (1, 11), '': (3, 2), - '': (6, 10), '': (2, 0), '': (0, 2), - '': (0, 1), '': (2, 2), '': (1, 2), '': (3, 4), - '': (2, 4), '': (1, 4), '': (2, 9), '': (1, 9), - '': (7, 11), '': (5, 7), '': (4, 11), - '': (7, 12)} - - -UNSHIFT_TABLE = { '~': '`', '!': '1', '@': '2', '#': '3', '$': '4', - '%': '5', '^': '6', '&': '7', '*': '8', '(': '9', - ')': '0', '_': '-', '+': '=', '{': '[', '}': ']', - '|': '\\', - ':': ';', '"': "'", '<': ',', '>': '.', '?': '/'} +KEYMATRIX = { + "`": (3, 1), + "1": (6, 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": (6, 8), + "-": (3, 8), + "=": (0, 8), + "q": (7, 1), + "w": (7, 4), + "e": (7, 2), + "r": (7, 3), + "t": (2, 3), + "y": (2, 6), + "u": (7, 6), + "i": (7, 5), + "o": (7, 9), + "p": (7, 8), + "[": (2, 8), + "]": (2, 5), + "\\": (3, 11), + "a": (4, 1), + "s": (4, 4), + "d": (4, 2), + "f": (4, 3), + "g": (1, 3), + "h": (1, 6), + "j": (4, 6), + "k": (4, 5), + "l": (4, 9), + ";": (4, 8), + "'": (1, 8), + "z": (5, 1), + "x": (5, 4), + "c": (5, 2), + "v": (5, 3), + "b": (0, 3), + "n": (0, 6), + "m": (5, 6), + ",": (5, 5), + ".": (5, 9), + "/": (5, 8), + " ": (5, 11), + "": (6, 12), + "": (0, 10), + "": (6, 11), + "": (2, 1), + "": (0, 4), + "": (7, 7), + "": (4, 0), + "": (1, 1), + "": (1, 11), + "": (3, 2), + "": (6, 10), + "": (2, 0), + "": (0, 2), + "": (0, 1), + "": (2, 2), + "": (1, 2), + "": (3, 4), + "": (2, 4), + "": (1, 4), + "": (2, 9), + "": (1, 9), + "": (7, 11), + "": (5, 7), + "": (4, 11), + "": (7, 12), +} + + +UNSHIFT_TABLE = { + "~": "`", + "!": "1", + "@": "2", + "#": "3", + "$": "4", + "%": "5", + "^": "6", + "&": "7", + "*": "8", + "(": "9", + ")": "0", + "_": "-", + "+": "=", + "{": "[", + "}": "]", + "|": "\\", + ":": ";", + '"': "'", + "<": ",", + ">": ".", + "?": "/", +} for c in string.ascii_lowercase: UNSHIFT_TABLE[c.upper()] = c def inject_event(key, press): - if len(key) >= 2 and key[0] != '<': - key = '<' + key + '>' + if len(key) >= 2 and key[0] != "<": + key = "<" + key + ">" if key not in KEYMATRIX: print("%s: invalid key: %s" % (this_script, key)) sys.exit(1) (row, col) = KEYMATRIX[key] - subprocess.call(["ectool", "kbpress", str(row), str(col), - "1" if press else "0"]) + subprocess.call(["ectool", "kbpress", str(row), str(col), "1" if press else "0"]) def inject_key(key): @@ -73,8 +147,10 @@ def inject_string(string): def usage(): - print("Usage: %s [-s ] [-k ]" % this_script, - "[-p ] [-r ] ...") + print( + "Usage: %s [-s ] [-k ]" % this_script, + "[-p ] [-r ] ...", + ) print("Examples:") print("%s -s MyPassw0rd -k enter" % this_script) print("%s -p ctrl_l -p alt_l -k f3 -r alt_l -r ctrl_l" % this_script) @@ -85,7 +161,7 @@ def help(): print("Valid keys are:") i = 0 for key in KEYMATRIX: - print("%12s" % key, end='') + print("%12s" % key, end="") i += 1 if i % 4 == 0: print() @@ -114,12 +190,13 @@ usage_check(arg_len > 1, "not enough arguments") usage_check(arg_len % 2 == 1, "mismatched arguments") for i in range(1, arg_len, 2): - usage_check(sys.argv[i] in ("-s", "-k", "-p", "-r"), - "unknown flag: %s" % sys.argv[i]) + usage_check( + sys.argv[i] in ("-s", "-k", "-p", "-r"), "unknown flag: %s" % sys.argv[i] + ) for i in range(1, arg_len, 2): flag = sys.argv[i] - arg = sys.argv[i+1] + arg = sys.argv[i + 1] if flag == "-s": inject_string(arg) elif flag == "-k": -- cgit v1.2.1 From f37d95b3edc6ff7bbda96fe7a4147273db66c306 Mon Sep 17 00:00:00 2001 From: Jeremy Bettis Date: Thu, 14 Jul 2022 14:19:14 -0600 Subject: ec: Switch black to 80 cols and reformat files Add pyproject.toml config file to set black to 80 columns. Remove column length overrides from other config files. Reformat python files to 80 cols. BRANCH=None BUG=b:238434058 TEST=presubmit/CQ Signed-off-by: Jeremy Bettis Change-Id: I870a68f1bb751f4bad97024045f6e3075489e80f Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3764071 Commit-Queue: Jeremy Bettis Auto-Submit: Jeremy Bettis Tested-by: Jeremy Bettis Reviewed-by: Jack Rosenthal --- util/inject-keys.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'util/inject-keys.py') diff --git a/util/inject-keys.py b/util/inject-keys.py index d05d4fbed7..292dd4f492 100755 --- a/util/inject-keys.py +++ b/util/inject-keys.py @@ -125,7 +125,9 @@ def inject_event(key, press): print("%s: invalid key: %s" % (this_script, key)) sys.exit(1) (row, col) = KEYMATRIX[key] - subprocess.call(["ectool", "kbpress", str(row), str(col), "1" if press else "0"]) + subprocess.call( + ["ectool", "kbpress", str(row), str(col), "1" if press else "0"] + ) def inject_key(key): @@ -191,7 +193,8 @@ usage_check(arg_len % 2 == 1, "mismatched arguments") for i in range(1, arg_len, 2): usage_check( - sys.argv[i] in ("-s", "-k", "-p", "-r"), "unknown flag: %s" % sys.argv[i] + sys.argv[i] in ("-s", "-k", "-p", "-r"), + "unknown flag: %s" % sys.argv[i], ) for i in range(1, arg_len, 2): -- cgit v1.2.1 From 71b2ef709dcb14260f5fdaa3ab4ced005a29fb46 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 12 Sep 2022 14:54:36 -0400 Subject: Update license boilerplate text in source code files Normally we don't do this, but enough changes have accumulated that we're doing a tree-wide one-off update of the name & style. BRANCH=none BUG=chromium:1098010 TEST=`repo upload` works Change-Id: Icd3a1723c20595356af83d190b2c6a9078b3013b Signed-off-by: Mike Frysinger Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3891203 Reviewed-by: Jeremy Bettis Reviewed-by: Jack Rosenthal --- util/inject-keys.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'util/inject-keys.py') diff --git a/util/inject-keys.py b/util/inject-keys.py index 292dd4f492..7ff72ea134 100755 --- a/util/inject-keys.py +++ b/util/inject-keys.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# Copyright 2016 The Chromium OS Authors. All rights reserved. +# Copyright 2016 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -- cgit v1.2.1