ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
QMK Bot 2025-05-05 00:23:26 +00:00
commit a992e32bd5
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/python/qmk/decorators.py
View file

@ -5,7 +5,7 @@ from time import monotonic
from milc import cli from milc import cli
from qmk.keyboard import find_keyboard_from_dir from qmk.keyboard import find_keyboard_from_dir, keyboard_folder
from qmk.keymap import find_keymap_from_dir from qmk.keymap import find_keymap_from_dir
@ -27,6 +27,11 @@ def automagic_keyboard(func):
def wrapper(*args, **kwargs): def wrapper(*args, **kwargs):
cmd = _get_subcommand_name() cmd = _get_subcommand_name()
# TODO: Workaround for if config file contains "old" keyboard name
# Potential long-term fix needs to be within global cli or milc
if cli.config_source[cmd]['keyboard'] == 'config_file':
cli.config[cmd]['keyboard'] = keyboard_folder(cli.config[cmd]['keyboard'])
# Ensure that `--keyboard` was not passed and CWD is under `qmk_firmware/keyboards` # Ensure that `--keyboard` was not passed and CWD is under `qmk_firmware/keyboards`
if cli.config_source[cmd]['keyboard'] != 'argument': if cli.config_source[cmd]['keyboard'] != 'argument':
keyboard = find_keyboard_from_dir() keyboard = find_keyboard_from_dir()