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

This commit is contained in:
QMK Bot
2023-11-15 05:25:30 +00:00
10 changed files with 296 additions and 285 deletions
+1 -5
View File
@@ -100,11 +100,7 @@ def keyboard_folder(keyboard):
if keyboard == last_keyboard:
break
rules_mk_file = Path(base_path, keyboard, 'rules.mk')
if rules_mk_file.exists():
rules_mk = parse_rules_mk_file(rules_mk_file)
keyboard = rules_mk.get('DEFAULT_FOLDER', keyboard)
keyboard = resolve_keyboard(keyboard)
if not qmk.path.is_keyboard(keyboard):
raise ValueError(f'Invalid keyboard: {keyboard}')