summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-0815-0/+885
|\
| * EC Pro 2 PCB (#19917)Cipulot2023-03-0815-0/+885
| | | | | | * EC Pro 2 firmware by Cipulot
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-089-0/+336
|\|
| * [Keyboard] Teahouse Ayleen TKL (#19900)Freather2023-03-089-0/+336
| | | | | | | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: CMM.Studio Freather <50167286+frankBTHID@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-081-1/+1
|\|
| * Fix processing of recently added system keycodes (#20058)Joel Challis2023-03-081-1/+1
| |
* | Remove empty rules.mk from keymaps (#20056)Joel Challis2023-03-0850-0/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-073-0/+187
|\|
| * VIA keymap for djinn (#19881)Niles Tanner2023-03-083-0/+187
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-076-181/+143
|\|
| * implement rgb matrix for momokai keyboards (#19904)peepeetee2023-03-076-181/+143
| | | | | | | | Co-authored-by: jack <0x6a73@protonmail.com>
* | Change aidansmithdotdev/fine40 to use Encoder Map (#19912)Aidan Smith2023-03-076-12/+32
| | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: jack <0x6a73@protonmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-073-0/+43
|\|
| * [Keymap] Smooted's BM80v2 keymap (#19873)Olivia2023-03-073-0/+43
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-0711-0/+362
|\|
| * [Keyboard] Add Karn Keyboard (#19846)Robert Mills2023-03-0711-0/+362
| | | | | | | | | | | | Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-071-0/+3
|\|
| * Add disable git safe directory check step (#20040)Albert Y2023-03-071-0/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-067-0/+250
|\|
| * [Keyboard] Sejin EAT-1010R2 keyboard (#19809)Dmitry Nosachev2023-03-067-0/+250
| | | | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: jack <0x6a73@protonmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-062-0/+12
|\|
| * [Docs] Discuss layout macro (#19803)souvlakeeb2023-03-062-0/+12
| | | | | | | | | | Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-067-0/+219
|\|
| * [Keyboard] Add gummykey (#19695)gumorr2023-03-067-0/+219
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: jack <0x6a73@protonmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-066-0/+202
|\|
| * keyboards/anavi: Add ANAVI Knobs 3 (#18624)Leon Anavi2023-03-056-0/+202
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-051-0/+1
|\|
| * Reject VIA keys within info.json (#20026)Joel Challis2023-03-061-0/+1
| |
* | Move matrix config to info.json, part 1 (#19985)Ryan2023-03-05502-3461/+1299
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-051-3/+3
|\|
| * Unbreak switchplate/southpaw_65 after #16277 (#20015)Sergey Vlasov2023-03-051-3/+3
| | | | | | | | | | Apparently the changes done in #16277 swapped the values read from the PCA9555 expanders by mistake, which resulted in mixed up matrix columns. Fix the chip and register addresses to match the original code.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-0426-0/+1647
|\|
| * Add Keychron Q12 (#19844)lalalademaxiya12023-03-0426-0/+1647
| | | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-038-0/+530
|\|
| * Add Support for Lilly58 r2g (#19862)Elliot Powell2023-03-038-0/+530
| | | | | | * Add support for lilly58 r2g by Mechboards
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-034-0/+296
|\|
| * Add new keymap for Preonic rev3 (#19706)Guillermo Aguirre2023-03-034-0/+296
| |
* | Remove some use of keymap.h (#20006)Joel Challis2023-03-0316-22/+11
| |
* | Remove some use of keymap.h (#19980)Joel Challis2023-03-0369-69/+75
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-034-7/+70
|\|
| * Initial deprecation policy documentation. (#19908)Nick Brassel2023-03-032-1/+51
| |
| * Update branch names to reflect configurator's new deployment. (#19999)Nick Brassel2023-03-032-6/+19
| |
* | Remove Vagrant due to bit-rot. (#20000)Nick Brassel2023-03-0310-323/+1
| |
* | Merge upstream changes to uf2conv (#19993)Joel Challis2023-03-033-30/+43
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-011-1/+3
|\|
| * Check all keys have matrix positions when parsing C LAYOUT macros (#19781)Ryan2023-03-021-1/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-017-73/+135
|\|
| * [Keyboard] Clean up contra & move to data-driven (#19973)Albert Y2023-03-017-73/+135
| | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-03-014-0/+246
|\|
| * [Keymap] Add davidrambo lulu keymap (#19448)David Rambo2023-03-014-0/+246
| | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com>