|
13 | 13 | from adafruit_ble.services.standard.hid import HIDService |
14 | 14 |
|
15 | 15 | from .hid import HID |
16 | | -from .model import Matrix, COORDS, Backlight, battery_level |
| 16 | +from .model import Matrix, COORDS, Backlight, battery_level, key_name |
17 | 17 | from .action_code import * |
18 | 18 | from .util import usb_is_connected, do_nothing |
19 | 19 |
|
20 | 20 |
|
21 | | -# fmt: off |
22 | | -KEY_NAME = ( |
23 | | - 'ESC', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=', 'BACKSPACE', |
24 | | - 'TAB', 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', 'P', '[', ']', '|', |
25 | | - 'CAPS', 'A', 'S', 'D', 'F', 'G', 'H', 'J', 'K', 'L', ';', '"', 'ENTER', |
26 | | - 'LSHIFT', 'Z', 'X', 'C', 'V', 'B', 'N', 'M', ',', '.', '/', 'RSHIFT', |
27 | | - 'LCTRL', 'LGUI', 'LALT', 'SPACE', 'RALT', 'MENU', 'FN', 'RCTRL' |
28 | | -) |
29 | | -# fmt: on |
30 | | - |
31 | | - |
32 | | -def key_name(key): |
33 | | - return KEY_NAME[COORDS[key]] |
34 | | - |
35 | | - |
36 | 21 | def reset_into_bootloader(): |
37 | 22 | microcontroller.on_next_reset(microcontroller.RunMode.BOOTLOADER) |
38 | 23 | microcontroller.reset() |
@@ -476,7 +461,8 @@ def run(self): |
476 | 461 | key2 = self.get() |
477 | 462 |
|
478 | 463 | dt = ms( |
479 | | - matrix.get_keydown_time(key2) - matrix.get_keydown_time(key1) |
| 464 | + matrix.get_keydown_time(key2) |
| 465 | + - matrix.get_keydown_time(key1) |
480 | 466 | ) |
481 | 467 | log("pair keys {} {}, dt = {}".format(pair_index, pair, dt)) |
482 | 468 | try: |
|
0 commit comments