diff options
| author | QMK Bot <hello@qmk.fm> | 2021-09-27 17:03:42 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-09-27 17:03:42 +0000 |
| commit | bca7a99e7aad2ff0a4aaed2d0e755e2d6bd7cee6 (patch) | |
| tree | 764b035dc6beebd5ced279f02d10b5b0e0720894 /keyboards | |
| parent | a311514f43de7cf7bde758a691419a95367cebe2 (diff) | |
| parent | fce9cb933845bf0b74d322eba02de3b76daaeb84 (diff) | |
| download | qmk_firmware-bca7a99e7aad2ff0a4aaed2d0e755e2d6bd7cee6.tar.gz qmk_firmware-bca7a99e7aad2ff0a4aaed2d0e755e2d6bd7cee6.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
| -rw-r--r-- | keyboards/dekunukem/duckypad/keymaps/m4cs/sysinfo.py | 1 | ||||
| -rwxr-xr-x | keyboards/ergodox_ez/util/compile_keymap.py | 5 | ||||
| -rwxr-xr-x | keyboards/ergodox_ez/util/keymap_beautifier/KeymapBeautifier.py | 1 |
3 files changed, 0 insertions, 7 deletions
diff --git a/keyboards/dekunukem/duckypad/keymaps/m4cs/sysinfo.py b/keyboards/dekunukem/duckypad/keymaps/m4cs/sysinfo.py index 04cf343ea6..4dfcd4d4d1 100644 --- a/keyboards/dekunukem/duckypad/keymaps/m4cs/sysinfo.py +++ b/keyboards/dekunukem/duckypad/keymaps/m4cs/sysinfo.py @@ -21,7 +21,6 @@ import hid import time -import string import psutil import GPUtil import datetime diff --git a/keyboards/ergodox_ez/util/compile_keymap.py b/keyboards/ergodox_ez/util/compile_keymap.py index f427d6fd80..b447ecaf5c 100755 --- a/keyboards/ergodox_ez/util/compile_keymap.py +++ b/keyboards/ergodox_ez/util/compile_keymap.py @@ -584,11 +584,6 @@ def unicode_macro_cases(config): for macro_id, uc_hex in config['unicode_macros'].items(): hi = int(uc_hex, 16) >> 8 lo = int(uc_hex, 16) & 0xFF - unimacro_keys = ", ".join( - "T({})".format( - "KP_" + digit if digit.isdigit() else digit - ) for digit in uc_hex - ) yield UNICODE_MACRO_TEMPLATE.format( macro_id=macro_id, hi=hi, lo=lo ) diff --git a/keyboards/ergodox_ez/util/keymap_beautifier/KeymapBeautifier.py b/keyboards/ergodox_ez/util/keymap_beautifier/KeymapBeautifier.py index f55bdaf2d7..9beee37961 100755 --- a/keyboards/ergodox_ez/util/keymap_beautifier/KeymapBeautifier.py +++ b/keyboards/ergodox_ez/util/keymap_beautifier/KeymapBeautifier.py @@ -227,7 +227,6 @@ class KeymapBeautifier: self.layer_keys_pointer = 0 begin = self.layer_keys_pointer - end = begin + n_columns return self.layer_keys[self.layer_keys_pointer-n_keys:self.layer_keys_pointer] key_coordinates_counter = 0 |