mkbd65/qmk-firmware
Watch
1
0
Fork
You've already forked qmk-firmware
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/develop' into xap

Browse source
This commit is contained in:
Nick Brassel 2023-11-22 13:27:44 +11:00
commit 8fa6fd6d64
No known key found for this signature in database
11 changed files with 76 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/python/qmk/cli/ci/validate_aliases.py
View file

@ -1,11 +1,8 @@
"""Validates the list of keyboard aliases.
"""
from pathlib import Path
from milc import cli
from qmk.json_schema import json_load
from qmk.keyboard import resolve_keyboard, keyboard_folder
from qmk.keyboard import resolve_keyboard, keyboard_folder, keyboard_alias_definitions
def _safe_keyboard_folder(target):
@ -34,7 +31,7 @@ def _target_keyboard_exists(target):
@cli.subcommand('Validates the list of keyboard aliases.', hidden=True)
def ci_validate_aliases(cli):
aliases = json_load(Path('data/mappings/keyboard_aliases.hjson'))
aliases = keyboard_alias_definitions()
success = True
for alias in aliases.keys():

4
lib/python/qmk/cli/generate/api.py
View file

@ -11,7 +11,7 @@ from qmk.datetime import current_datetime
from qmk.info import info_json
from qmk.json_schema import json_load
from qmk.keymap import list_keymaps
from qmk.keyboard import find_readme, list_keyboards
from qmk.keyboard import find_readme, list_keyboards, keyboard_alias_definitions
from qmk.keycodes import load_spec, list_versions, list_languages
from qmk.xap.common import get_xap_definition_files, update_xap_definitions
@ -184,7 +184,7 @@ def generate_api(cli):
# Generate data for the global files
keyboard_list = sorted(kb_all)
keyboard_aliases = json_load(Path('data/mappings/keyboard_aliases.hjson'))
keyboard_aliases = keyboard_alias_definitions()
keyboard_metadata = {
'last_updated': current_datetime(),
'keyboards': keyboard_list,