~ruther/qmk_firmware

0d74ed3c35afef7e4d2b13a47e9e310183eb85d2 — QMK Bot 4 years ago a72172a + 305cca9
Merge remote-tracking branch 'origin/master' into develop
1 files changed, 6 insertions(+), 6 deletions(-)

M lib/python/qmk/decorators.py
M lib/python/qmk/decorators.py => lib/python/qmk/decorators.py +6 -6
@@ 17,12 17,12 @@ def automagic_keyboard(func):
    @functools.wraps(func)
    def wrapper(*args, **kwargs):
        # Ensure that `--keyboard` was not passed and CWD is under `qmk_firmware/keyboards`
        if cli.config_source[cli._entrypoint.__name__]['keyboard'] != 'argument':
        if cli.config_source[cli._subcommand.__name__]['keyboard'] != 'argument':
            keyboard = find_keyboard_from_dir()

            if keyboard:
                cli.config[cli._entrypoint.__name__]['keyboard'] = keyboard
                cli.config_source[cli._entrypoint.__name__]['keyboard'] = 'keyboard_directory'
                cli.config[cli._subcommand.__name__]['keyboard'] = keyboard
                cli.config_source[cli._subcommand.__name__]['keyboard'] = 'keyboard_directory'

        return func(*args, **kwargs)



@@ 37,12 37,12 @@ def automagic_keymap(func):
    @functools.wraps(func)
    def wrapper(*args, **kwargs):
        # Ensure that `--keymap` was not passed and that we're under `qmk_firmware`
        if cli.config_source[cli._entrypoint.__name__]['keymap'] != 'argument':
        if cli.config_source[cli._subcommand.__name__]['keymap'] != 'argument':
            keymap_name, keymap_type = find_keymap_from_dir()

            if keymap_name:
                cli.config[cli._entrypoint.__name__]['keymap'] = keymap_name
                cli.config_source[cli._entrypoint.__name__]['keymap'] = keymap_type
                cli.config[cli._subcommand.__name__]['keymap'] = keymap_name
                cli.config_source[cli._subcommand.__name__]['keymap'] = keymap_type

        return func(*args, **kwargs)