Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-25 | 1 | -7/+12 |
|\ | |||||
| * | Fix CLI incorrectly following `DEFAULT_FOLDER` (#12529) | Nick Brassel | 2021-04-25 | 1 | -7/+12 |
| | | | | | | | | | | | | | | * Attempt to sort out incorrectly following DEFAULT_FOLDER. * Fix CI checks. * qmk pyformat | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-15 | 19 | -85/+138 |
|\| | |||||
| * | Add support for tab completion (#12411) | Zach White | 2021-04-14 | 19 | -85/+138 |
| | | | | | | | | | | | | | | * Add support for tab completion * make flake8 happy * Add documentation | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-08 | 1 | -2/+2 |
|\| | |||||
| * | `qmk chibios-confmigrate`: Make `-i` and `-r` required (#12515) | Ryan | 2021-04-08 | 1 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-02 | 1 | -1/+1 |
|\| | |||||
| * | `qmk doctor`: Fix WSL /mnt check (#12466) | Ryan | 2021-04-02 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-02 | 1 | -4/+9 |
|\| | |||||
| * | qmk doctor: Display macOS and Windows versions, and add WSL warning for /mnt ↵ | Ryan | 2021-04-02 | 1 | -4/+9 |
| | | | | | | | | (#12441) | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-03-30 | 1 | -1/+1 |
|\| | |||||
| * | Format code according to conventions (#12437) | github-actions[bot] | 2021-03-31 | 1 | -1/+1 |
| | | | | | | Co-authored-by: QMK Bot <hello@qmk.fm> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-03-30 | 1 | -1/+1 |
|\| | |||||
| * | Allow for clang-format up to v20. (#12407) | Nick Brassel | 2021-03-31 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-03-27 | 1 | -1/+1 |
|\| | |||||
| * | add utf-8 encoding to the open() call (#12388) | Zach White | 2021-03-27 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-03-25 | 14 | -107/+309 |
|\| | |||||
| * | Add a `qmk format-json` command that will format JSON files (#12372) | Zach White | 2021-03-25 | 14 | -107/+309 |
| | | | | | | | | | | | | | | | | | | | | | | * Add a command to format json files * change to work after rebase * add test for qmk format-json * add documentation for qmk format-json * Update lib/python/qmk/cli/format/json.py | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-03-25 | 1 | -5/+5 |
|\| | |||||
| * | [CI] Format code according to conventions (#12363) | github-actions[bot] | 2021-03-24 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | * Format code according to conventions * Update lib/python/qmk/cli/generate/api.py * Update lib/python/qmk/cli/generate/api.py Co-authored-by: QMK Bot <hello@qmk.fm> Co-authored-by: Zach White <skullydazed@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-03-24 | 17 | -106/+171 |
|\| | |||||
| * | Add support for qmk_configurator style aliases (#11954) | Zach White | 2021-03-24 | 17 | -106/+171 |
| | | | | | | | | | | | | | | | | | | * Add support for qmk_configurator style aliases * add the keyboard aliases to the api data * add support for a keyboard metadata file * make flake8 happy | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-03-23 | 1 | -1/+9 |
|\| | |||||
| * | use layout aliases when processing info.json (#12333) | Zach White | 2021-03-22 | 1 | -1/+9 |
| | | |||||
* | | Consistently use bin/qmk when that script is called (#12286) | Zach White | 2021-03-18 | 1 | -1/+1 |
| | | | | | | | | | | * Pass QMK_BIN down to build_keyboard.mk * choose the correct qmk script | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-03-18 | 1 | -5/+11 |
|\| | |||||
| * | `qmk doctor`: Don't run udev checks under WSL (#12231) | Ryan | 2021-03-19 | 1 | -5/+11 |
| | | |||||
* | | core: add support for MK66F18 (Teensy 3.6) micro controller (#12258) | Michael Stapelberg | 2021-03-17 | 1 | -1/+1 |
| | | | | | | This is in preparation for https://github.com/qmk/qmk_firmware/pull/10171 | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-03-09 | 1 | -1/+1 |
|\| | |||||
| * | Fix typo in `get_git_version()` (#12182) | Ryan | 2021-03-10 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-03-09 | 1 | -13/+4 |
|\| | |||||
| * | improve detection of community layout support | Zach White | 2021-03-09 | 1 | -13/+4 |
| | | |||||
* | | Begin the process of deprecating bin/qmk in favor of the global cli (#12109) | Zach White | 2021-03-07 | 2 | -2/+3 |
|/ | | | | | * Begin the process of deprecating bin/qmk in favor of the global cli * Correctly set the qmk bin | ||||
* | `qmk generate-rules-mk`: add `--escape` switch for makefile logic (#12101) | Ryan | 2021-03-04 | 1 | -1/+5 |
| | |||||
* | Migrate make_dfu_header to CLI (#12061) | Joel Challis | 2021-02-28 | 2 | -0/+60 |
| | | | | | | | | | | | | | * Migrate make_dfu_header to CLI * lint fixes * Update lib/python/qmk/cli/generate/dfu_header.py Co-authored-by: Ryan <fauxpark@gmail.com> * Rename object Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | Fix generated file output while target exists (#12062) | Joel Challis | 2021-02-28 | 6 | -9/+9 |
| | |||||
* | Fix compile errors (#12048) | Zach White | 2021-02-27 | 1 | -2/+3 |
| | | | | | * fix compile errors * fix broken json files | ||||
* | Fix develop (#12039) | Zach White | 2021-02-27 | 9 | -30/+56 |
| | | | | | | | | | Fixes file encoding errors on Windows, and layouts not correctly merging into info.json. * force utf8 encoding * correctly merge layouts and layout aliases * show what aliases point to | ||||
* | make LAYOUT parsing more robust | Zach White | 2021-02-24 | 1 | -2/+4 |
| | |||||
* | bump to python 3.7 (#11408) | Zach White | 2021-02-13 | 1 | -2/+20 |
| | |||||
* | remove deprecated qmk json-keymap (#11823) | Zach White | 2021-02-08 | 3 | -22/+0 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-07 | 4 | -20/+16 |
|\ | |||||
| * | Allow flash/compile to accept relative json paths (#11767) | Joel Challis | 2021-02-07 | 4 | -20/+16 |
| | | | | | | | | | | | | | | | | | | | | | | * Allow flash/compile to accept relative paths * Review suggestions * Review comments * Put back exists check otherwise stdin fails * fix lint | ||||
* | | Add STM32G431 and STM32G474 board definitions. (#11793) | Nick Brassel | 2021-02-06 | 1 | -1/+1 |
| | | | | | | | | | | * Add STM32G431 and STM32G474 board definitions. * Add docs. | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-01 | 2 | -3/+6 |
|\| | |||||
| * | CLI: Fix json flashing (#11765) | Erovia | 2021-02-01 | 2 | -3/+6 |
| | | |||||
* | | Create a system to map between info.json and config.h/rules.mk (#11548) | Zach White | 2021-01-31 | 6 | -453/+231 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * generate rules.mk from a json mapping * generate rules.mk from a json mapping * support for config.h from json maps * improve the mapping system * document the mapping system * move data/maps to data/mappings * fix flake8 errors * fixup LED_MATRIX_DRIVER * remove product and description from the vision_division keymap level * reduce the complexity of generate-rules-mk * add tests for the generate commands * fix qmk doctor when submodules are not clean | ||||
* | | Adds AT90USB162 support (#11570) | Dasky | 2021-01-29 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | * at90usb162 support * fix missing bracket * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | ChibiOS conf migrations... take 11 (#11646) | Nick Brassel | 2021-01-21 | 1 | -3/+4 |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |