aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <[email protected]>2024-11-21 06:22:51 +0000
committerQMK Bot <[email protected]>2024-11-21 06:22:51 +0000
commit074bbbfb2129c738a3abfcdcb3e754c7ffcd1b04 (patch)
tree330c9e3494ee9c040f2f81681a2749bd8bd70f72
parent638b22d05778f30c1f2bd347e48d523a7858bb51 (diff)
parent9bea332a210aed22cd6775eaf726da595bd5e9ce (diff)
downloadqmk_firmware-074bbbfb2129c738a3abfcdcb3e754c7ffcd1b04.tar.gz
qmk_firmware-074bbbfb2129c738a3abfcdcb3e754c7ffcd1b04.zip
Merge remote-tracking branch 'origin/master' into develop
-rwxr-xr-xlib/python/qmk/cli/new/keymap.py12
-rwxr-xr-xlib/python/qmk/cli/via2json.py34
2 files changed, 37 insertions, 9 deletions
diff --git a/lib/python/qmk/cli/new/keymap.py b/lib/python/qmk/cli/new/keymap.py
index d4339bc9ef..f1df05636c 100755
--- a/lib/python/qmk/cli/new/keymap.py
+++ b/lib/python/qmk/cli/new/keymap.py
@@ -1,5 +1,6 @@
"""This script automates the copying of the default keymap into your own keymap.
"""
+import re
import shutil
from milc import cli
@@ -13,6 +14,13 @@ from qmk.keyboard import keyboard_completer, keyboard_folder
from qmk.userspace import UserspaceDefs
+def validate_keymap_name(name):
+ """Returns True if the given keymap name contains only a-z, 0-9 and underscore characters.
+ """
+ regex = re.compile(r'^[a-zA-Z0-9][a-zA-Z0-9_]+$')
+ return bool(regex.match(name))
+
+
def prompt_keyboard():
prompt = """{fg_yellow}Select Keyboard{style_reset_all}
If you`re unsure you can view a full list of supported keyboards with {fg_yellow}qmk list-keyboards{style_reset_all}.
@@ -60,6 +68,10 @@ def new_keymap(cli):
cli.log.error(f'Default keymap {{fg_cyan}}{keymap_path_default}{{fg_reset}} does not exist!')
return False
+ if not validate_keymap_name(user_name):
+ cli.log.error('Keymap names must contain only {fg_cyan}a-z{fg_reset}, {fg_cyan}0-9{fg_reset} and {fg_cyan}_{fg_reset}! Please choose a different name.')
+ return False
+
if keymap_path_new.exists():
cli.log.error(f'Keymap {{fg_cyan}}{user_name}{{fg_reset}} already exists! Please choose a different name.')
return False
diff --git a/lib/python/qmk/cli/via2json.py b/lib/python/qmk/cli/via2json.py
index 73c9a61b3d..537e102640 100755
--- a/lib/python/qmk/cli/via2json.py
+++ b/lib/python/qmk/cli/via2json.py
@@ -29,6 +29,7 @@ def _convert_macros(via_macros):
if len(via_macros) == 0:
return list()
split_regex = re.compile(r'(}\,)|(\,{)')
+ macro_group_regex = re.compile(r'({.+?})')
macros = list()
for via_macro in via_macros:
# Split VIA macro to its elements
@@ -38,13 +39,28 @@ def _convert_macros(via_macros):
macro_data = list()
for m in macro:
if '{' in m or '}' in m:
- # Found keycode(s)
- keycodes = m.split(',')
- # Remove whitespaces and curly braces from around keycodes
- keycodes = list(map(lambda s: s.strip(' {}'), keycodes))
- # Remove the KC prefix
- keycodes = list(map(lambda s: s.replace('KC_', ''), keycodes))
- macro_data.append({"action": "tap", "keycodes": keycodes})
+ # Split macro groups
+ macro_groups = macro_group_regex.findall(m)
+ for macro_group in macro_groups:
+ # Remove whitespaces and curly braces from around group
+ macro_group = macro_group.strip(' {}')
+
+ macro_action = 'tap'
+ macro_keycodes = []
+
+ if macro_group[0] == '+':
+ macro_action = 'down'
+ macro_keycodes.append(macro_group[1:])
+ elif macro_group[0] == '-':
+ macro_action = 'up'
+ macro_keycodes.append(macro_group[1:])
+ else:
+ macro_keycodes.extend(macro_group.split(',') if ',' in macro_group else [macro_group])
+
+ # Remove the KC prefixes
+ macro_keycodes = list(map(lambda s: s.replace('KC_', ''), macro_keycodes))
+
+ macro_data.append({"action": macro_action, "keycodes": macro_keycodes})
else:
# Found text
macro_data.append(m)
@@ -54,13 +70,13 @@ def _convert_macros(via_macros):
def _fix_macro_keys(keymap_data):
- macro_no = re.compile(r'MACRO0?([0-9]{1,2})')
+ macro_no = re.compile(r'MACRO0?\(([0-9]{1,2})\)')
for i in range(0, len(keymap_data)):
for j in range(0, len(keymap_data[i])):
kc = keymap_data[i][j]
m = macro_no.match(kc)
if m:
- keymap_data[i][j] = f'MACRO_{m.group(1)}'
+ keymap_data[i][j] = f'MC_{m.group(1)}'
return keymap_data