summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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-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-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
| |
* | 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-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
* | [Keyboard] Update kyria make path example (#13720)Albert Y2021-07-261-2/+2
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
* | [Keymap] Drashna's Defaults cleanup (#13722)Drashna Jaelre2021-07-2627-583/+381
| |
* | Remove legacy BACKLIGHT_CUSTOM_DRIVER option (#13731)Joel Challis2021-07-272-4/+1
| |
* | Merge remote-tracking branch 'upstream/master' into developNick Brassel2021-07-2726-559/+394
|\|
| * Add bootloader size (#13729)datafx2021-07-272-0/+2
| | | | | | | | | | | | | | | | | | * Add bootloader size Bootloader size needs to be 6144 to allow QMK to jump to the correct location with bootmagic * Include dz60rgb v2.1 Add boot loader size to this pcb also
| * 40percentclub/nein: update info.json layout macro reference (#13726)James Young2021-07-261-1/+1
| | | | | | - change LAYOUT to LAYOUT_ortho_3x3
| * Revert "Fixed the ortho60 and ortho48 matrix layout after testing (#12106)" ↵Cyril2021-07-252-4/+4
| | | | | | | | | | (#13456) This reverts commit e25f05224f1c06aeed13b2e99e8e755af65ac689.
| * [Keyboard] Change RGB light defaults for melgeek/mj6xy (#13657)bomb2021-07-251-0/+2
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Update ZSA Keyboard Readmes and keymaps (#13041)Drashna Jaelre2021-07-2520-555/+386
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [Keyboard] Update ZSA Keyboard Readmes and keymaps * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> * Remove custom rgb code for RGB_M_P * Fix inevitable typo Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/planck/ez/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Keyboard Update] Change to L422 (#13717)Xelus222021-07-262-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | * change to L422 * Add bootloader Co-authored-by: Ryan <fauxpark@gmail.com> * add bootloader Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Keyboard] Valor Rev 2 (#13551)Xelus222021-07-2516-0/+672
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Keyboard] Fix up SplitKB keyboards (#13511)Drashna Jaelre2021-07-25111-314/+1012
| |
* | [Keyboard] Fix compile size for the Vitamins Included via keymap (#13696)Drashna Jaelre2021-07-254-20/+24
| |
* | dirty fix (#13695)Dasky2021-07-253-1/+4
| |
* | Merge remote-tracking branch 'upstream/master' into developNick Brassel2021-07-259-0/+242
|\|
| * [Keyboard] Fix keymaps for clueboard 66_hotswap (#13694)Drashna Jaelre2021-07-259-0/+242
| | | | | | | | | | | | | | * [Keyboard] Fix default keymap for clueboard proto * Fix keymaps, because they're not actually revision compatible * Add copyright headers
* | [Keyboard] Fix compile size for the Lets Split Sockets via keymap (#13691)Drashna Jaelre2021-07-252-5/+2
| |
* | [Keyboard] Fix Compile size on ungodly Launch Pad (#13692)Drashna Jaelre2021-07-251-0/+8
| |
* | Fix & clean up tronguylabs/m122_3270 (#13684)Ryan2021-07-2514-347/+318
| |
* | [Keyboard] Fix compile size for the Merge UM70 via keymap (#13690)Drashna Jaelre2021-07-251-1/+4
| |
* | Clean up remaining RGB_DISABLE_WHEN_USB_SUSPENDED defines (#13689)Drashna Jaelre2021-07-2418-70/+63
| |