summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove references to info.json `width` and `height` in CLI (#13728)Ryan2021-07-2910-25/+2
|
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-292-53/+594
|\
| * Draytronics Elise Configurator fixes (#13763)James Young2021-07-292-53/+594
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2911-0/+246
|\|
| * [Keyboard] Add Treasure TYPE-9 Series II (#13725)TreasureTypes2021-07-2911-0/+246
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-299-0/+263
|\|
| * [Keyboard] add sus board (#13701)Alabahuy2021-07-299-0/+263
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-292-2/+2
|\|
| * [Keyboard] Match Vendor ID to my other keyboard, "unison". (#13699)Takeshi Nishio2021-07-292-2/+2
| | | | | | Co-authored-by: Takeshi Nishio <kkeennnn@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-291-6/+6
|\|
| * [Keyboard] we27 update info.json (#13678)Uy Bui2021-07-291-6/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2911-0/+516
|\|
| * [Keyboard] Add Mojo68 for Melgeek (#13578)bomb2021-07-2911-0/+516
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-299-0/+291
|\|
| * [Keyboard] Add Emi20 (#13603)AquaCylinder2021-07-299-0/+291
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2910-0/+270
|\|
| * [Keyboard] add cherryb studio cb1800 keyboard (#13639)DA2021-07-2910-0/+270
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2911-0/+607
|\|
| * [Keyboard] Add X-Bows Ranger Keyboard (#13660)X-Bows Tech2021-07-2911-0/+607
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-292-17/+51
|\|
| * [Keymap] Jonavin keymap Mercutio add win key lockout function (#13670)Jonavin2021-07-292-17/+51
| | | | | | Co-authored-by: Jonavin <=>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2912-0/+856
|\|
| * [Keyboard] Add halfcliff keyboard (#13515)N2-Sumikko2021-07-2912-0/+856
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2922-0/+733
|\|
| * [Keyboard] Add GetawayVan (#13412)ESCA472021-07-2922-0/+733
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-297-0/+430
|\|
| * [Keyboard] Added Orthocode keyboard (#13487)Jordan Blackbourn2021-07-297-0/+430
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-291-0/+18
|\|
| * Fix unit tests after recent refactor (#13765)Joel Challis2021-07-291-0/+18
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-281-5/+62
|\|
| * Allison Numpad: Configurator fix for LAYOUT_numpad_6x4 (#13759)James Young2021-07-281-5/+62
| | | | | | | | | | | | | | | | | | * info.json: human-friendly formatting - one key object per line; line breaks between physical rows - four-space indent - remove trailing whitespace * info.json: correct key object order for LAYOUT_numpad_6x4
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-281-5/+14
|\|
| * Update "make format" message (#13741)Ryan2021-07-281-5/+14
| | | | | | | | | | * Update "make format" message * Add examples for `qmk` command as well
* | Minor tidy up of key overrides (#13747)Joel Challis2021-07-285-39/+17
| | | | | | | | | | | | | | * Minor tidy up of key overrides * Update quantum/quantum.c * Update quantum/quantum.c
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-281-1/+1
|\|
| * fix: Fix typo in documentation for one shot keys. ON_TOGG -> OS_TOGG (#13754)Shane Celis2021-07-281-1/+1
| | | | | | `ON_TOGG` doesn't exist in the codebase.
* | matrix_scan_x -> x_task (#13748)Joel Challis2021-07-2813-31/+27
| |
* | Allow for higher USB Polling rate on ATSAM boards (#13755)Drashna Jaelre2021-07-281-3/+7
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-281-1/+1
|\|
| * [Keyboard] fix short circuit in led_update_kb for quefrency rev3 (#13752)Jonavin2021-07-281-1/+1
| | | | | | Co-authored-by: Jonavin <=>
* | Remove some legacy files (#13715)Joel Challis2021-07-277-173/+0
| |
* | Align AW20216 driver (#13712)Joel Challis2021-07-273-90/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Align AW20216 driver * Update drivers/awinic/aw20216.h Co-authored-by: Ryan <fauxpark@gmail.com> * Review comments * formatting fixes * stop if start failed? * review comments Co-authored-by: Ryan <fauxpark@gmail.com>
* | Fix typo in Dactyl Manuform (#13740)Ryan2021-07-271-1/+1
| |
* | Dactyl Manuform cleanup (#13686)Ryan2021-07-2754-1554/+1409
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-271-0/+2
|\|
| * [Docs] Add `default` case in Tap Dance Example 6 (#13727)ForsakenRei2021-07-261-0/+2
| | | | | | | | | | | | Added a `default` case in `switch(ql_tap_state.state)` at line 493 and 494. Without it compile firmware with Example 6 code will encounter 2 errors: `enumeration value 'TD_NONE' not handled in switch` `enumeration value 'TD_UNKNOWN' not handled in switch`
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-276-46/+290
|\|
| * [Keyboard] Ares refactor (#13730)James Young2021-07-266-46/+290
| |
* | [Keyboard] Add RGB matrix support for Kyria (#12789)Albert Y2021-07-263-0/+38
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: filterpaper <filterpaper@localhost>
* | Reduce firmware size in prep for #12670 (#13724)Drashna Jaelre2021-07-2712-18/+55
| | | | | | | | | | * Reduce firmware size in pre for #12670 * Also disable pixel mode, just in case
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-06 20:06:43 +0000