drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Update via2json layout macro searching (#24640)

Browse source
This commit is contained in:
Joel Challis 2025-01-20 03:45:47 +00:00 • committed by GitHub
parent 58aea4b479
commit d30cd87556
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

32
lib/python/qmk/cli/via2json.py
View file

@ -9,19 +9,15 @@ import qmk.keyboard
import qmk.path import qmk.path
from qmk.info import info_json from qmk.info import info_json
from qmk.json_encoders import KeymapJSONEncoder from qmk.json_encoders import KeymapJSONEncoder
from qmk.commands import parse_configurator_json, dump_lines from qmk.commands import dump_lines
from qmk.keymap import generate_json, list_keymaps, locate_keymap, parse_keymap_c from qmk.keymap import generate_json
def _find_via_layout_macro(keyboard): def _find_via_layout_macro(keyboard_data):
keymap_layout = None """Assume layout macro when only 1 is available
if 'via' in list_keymaps(keyboard): """
keymap_path = locate_keymap(keyboard, 'via') layouts = list(keyboard_data['layouts'].keys())
if keymap_path.suffix == '.json': return layouts[0] if len(layouts) == 1 else None
keymap_layout = parse_configurator_json(keymap_path)['layout']
else:
keymap_layout = parse_keymap_c(keymap_path)['layers'][0]['layout']
return keymap_layout
def _convert_macros(via_macros): def _convert_macros(via_macros):
@ -130,20 +126,16 @@ def via2json(cli):
This command uses the `qmk.keymap` module to generate a keymap.json from a VIA backup json. The generated keymap is written to stdout, or to a file if -o is provided. This command uses the `qmk.keymap` module to generate a keymap.json from a VIA backup json. The generated keymap is written to stdout, or to a file if -o is provided.
""" """
# Find appropriate layout macro
keymap_layout = cli.args.layout if cli.args.layout else _find_via_layout_macro(cli.args.keyboard)
if not keymap_layout:
cli.log.error(f"Couldn't find LAYOUT macro for keyboard {cli.args.keyboard}. Please specify it with the '-l' argument.")
return False
# Load the VIA backup json # Load the VIA backup json
with cli.args.filename.open('r') as fd: with cli.args.filename.open('r') as fd:
via_backup = json.load(fd) via_backup = json.load(fd)
# Generate keyboard metadata
keyboard_data = info_json(cli.args.keyboard) keyboard_data = info_json(cli.args.keyboard)
if not keyboard_data:
cli.log.error(f'LAYOUT macro {keymap_layout} is not a valid one for keyboard {cli.args.keyboard}!') # Find appropriate layout macro
keymap_layout = cli.args.layout if cli.args.layout else _find_via_layout_macro(keyboard_data)
if not keymap_layout:
cli.log.error(f"Couldn't find LAYOUT macro for keyboard {cli.args.keyboard}. Please specify it with the '-l' argument.")
return False return False
# Get keycode array # Get keycode array