summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-286-18/+47
|\
| * CLI: Validate JSON keymap input (#16261)Erovia2022-02-286-18/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix schema validator It should use the passed schema. * Add required attributes to keymap schema * Rework subcommands to validate the JSON keymaps The 'compile', 'flash' and 'json2c' subcommands were reworked to add JSON keymap validation so error is reported for non-JSON and non-compliant-JSON inputs. * Fix required fields in keymap schema * Add tests * Fix compiling keymaps directly from keymap directory * Schema should not require version for now.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-274-27/+32
|\|
| * Fix issues with data driven split keyboards (#16457)Joel Challis2022-02-274-27/+32
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-271-1/+1
|\|
| * fix helix/rev2:edvorakjp build error (#16433)Takeshi ISHII2022-02-271-1/+1
| | | | | | | | | | 'helix/rev2/keymaps/edvorakjp' was no longer buildable due to changes made by #14864. The reason is that the prototype of `oled_task_user()` was changed in keymaps/edvorakjp/oled.c, but keymaps/edvorakjp/oled.h was not changed. Therefore, I modified the prototype in keymaps/edvorakjp/oled.h.
* | Rework generate-api CLI command to use .build directory (#16441)Joel Challis2022-02-276-11/+24
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-271-1/+0
|\|
| * Revert CLI default for manufacturer (#16467)Joel Challis2022-02-271-1/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-272-2/+120
|\|
| * Wolf Sabre: fix Configurator layout data (#16465)James Young2022-02-272-2/+120
| | | | | | | | | | | | | | | | | | * apply friendly formatting to info.json * rebuild Configurator layout data KLE Rotation leads to incorrect layout data when converted to `info.json` format. * add matrix diagram to sabre.h
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-271-7/+6
|\|
| * Wren: fix QMK Configurator key sequence (#16462)James Young2022-02-271-7/+6
| | | | | | | | | | * Wren: fix QMK Configurator key sequence * info.json: update maintainer field
* | [Core] Squeeze AVR some more with `-mrelax` and `-mcall-prologues` (#16269)Stefan Kerkmann2022-02-261-1/+8
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-271-1/+1
|\|
| * [Docs] Anchor link correction in rgb matrix docs (#16460)Albert Y2022-02-261-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-271-10/+4
|\|
| * [Keymap] stanrc85 userspace rules cleanup (#16447)stanrc852022-02-261-10/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-272-0/+4
|\|
| * Link WS2812 driver page from rgb feature docs (#16366)Dasky2022-02-272-0/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-277-0/+272
|\|
| * [Keyboard] add YMDK YMD21 v2 (#16442)James Young2022-02-267-0/+272
| | | | | | | | | | * [Keyboard] add YMDK YMD21 v2 * remove trailing whitespace from default keymap
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-271-4/+30
|\|
| * [Docs] Add commands to flashing docs (#16456)Ryan2022-02-261-4/+30
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-2712-0/+392
|\|
| * [Handwired] Support for Adafruit lemon keypad (#16395)Dari2022-02-2612-0/+392
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: zvecr <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-278-0/+281
|\|
| * [Keyboard] ada1800mini (#16386)peepeetee2022-02-268-0/+281
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-2655-94/+9
|\|
| * Remove 1k USB_POLLING_INTERVAL_MS config from keyboards and default-ish ↵Joel Challis2022-02-2655-94/+9
| | | | | | | | | | | | | | keymaps (#16448) * Remove 1k USB_POLLING_INTERVAL_MS config from keyboard level * Remove 1k USB_POLLING_INTERVAL_MS config from default|via keymaps
* | Start develop for 2022q2zvecr2022-02-261-0/+4
|/
* Merge remote-tracking branch 'origin/develop'zvecr2022-02-254166-26911/+32069
|\
| * Changelog 2022q1 (#16380)Joel Challis2022-02-236-23/+502
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Initial changelog pass * update generate-develop-pr-list content * Fix bad word-ness * Fix generate-develop-pr-list ignores * Update docs/ChangeLog/20220226.md Co-authored-by: Sergey Vlasov <sigprof@gmail.com> Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-221-1/+2
| |\
| * \ Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-222-10/+8
| |\ \
| * \ \ Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-221-0/+3
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-222-0/+2
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-214-2/+94
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-2117-0/+449
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-213-84/+44
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into developfauxpark2022-02-2297-1141/+1879
| |\ \ \ \ \ \ \ \
| * | | | | | | | | [Keymap] BDN9 keymap (#15924)Adam Lickel2022-02-213-0/+179
| | | | | | | | | |
| * | | | | | | | | Format code according to conventions (#16421)QMK Bot2022-02-216-346/+329
| | | | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into developfauxpark2022-02-224-11/+20
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-2131-31/+1026
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-2111-1/+657
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-218-0/+334
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-2111-0/+1008
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-219-0/+346
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-217-0/+296
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-24 11:59:35 +0000