Merge branch 'develop' of https://github.com/qmk/qmk_firmware into update-q6

This commit is contained in:
adophoxia 2023-11-30 19:37:01 -08:00
commit d038e6105e
2 changed files with 2 additions and 1 deletions

View File

@ -29,6 +29,7 @@
// VIA support won't fit otherwise
#ifdef RGBLIGHT_ENABLE
#undef RGBLIGHT_EFFECT_TWINKLE
#undef RGBLIGHT_EFFECT_RGB_TEST
#endif //RGB LIGHT_ENABLE
// Split Options

View File

@ -108,4 +108,4 @@ def mass_compile(cli):
else:
targets = search_keymap_targets([('all', cli.config.mass_compile.keymap)], cli.args.filter)
return mass_compile_targets(targets, cli.args.clean, cli.args.dry_run, cli.config.mass_compile.no_temp, cli.config.mass_compile.parallel, **build_environment(cli.args.env))
return mass_compile_targets(targets, cli.args.clean, cli.args.dry_run, cli.args.no_temp, cli.config.mass_compile.parallel, **build_environment(cli.args.env))