summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-10-0531-177/+914
|\
| * Product changes to 1up lineup (#18382)ziptyze2022-10-0531-177/+914
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-10-051-4/+4
|\|
| * width:2 → height:2 for spacetime thumb keys (#18605)precondition2022-10-051-4/+4
| |
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2022-10-0612-19/+49
|\|
| * [Keyboard] Add encoder map support for GMMK Pro (#18600)adophoxia2022-10-0512-58/+44
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-10-0518-0/+493
|\|
| * [Keyboard] Add waffling60 Rev D ANSI Hotswap (#18579)4pplet2022-10-059-0/+233
| | | | | | | | Co-authored-by: 4pplet <4pplet@protonmail.com> Co-authored-by: 4pplet <stefan.ess@gmail.com>
| * [Keyboard] Add waffling60 Rev D Solder (#18580)4pplet2022-10-059-0/+260
| | | | | | | | Co-authored-by: 4pplet <4pplet@protonmail.com> Co-authored-by: 4pplet <stefan.ess@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-10-053-3/+3
|\|
| * RESET → QK_BOOT in nyhxis/nfr_70 (#18607)precondition2022-10-053-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-10-0510-0/+83
|\|
| * Fixup builds for mechlovin/infinity87. (#18604)Nick Brassel2022-10-0510-0/+83
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-10-0510-0/+440
|\|
| * [Keyboard] Add Nyhxis NFR-70 keyboard (#17562)Jesper Severinsen2022-10-0410-0/+440
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-10-057-0/+199
|\|
| * [Keyboard] Twig50 (#18085)nodatk2022-10-047-0/+199
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Remove lingering DRIVER_LED_TOTAL references (#18594)jack2022-10-052-2/+2
| |
* | Fixup linworks/fave84h (#18593)jack2022-10-052-6/+6
| |
* | onekey: Enable ADC for STM32F072 Discovery (#18592)Ryan2022-10-052-0/+5
| |
* | Fix Per Key LED Indicator Callbacks (#18450)Drashna Jaelre2022-10-04205-1224/+1357
| | | | | | | | Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com> Co-authored-by: Nick Brassel <nick@tzarc.org>
* | [Core] PWM Backlight for RP2040 (#17706)Stefan Kerkmann2022-10-047-1/+28
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-10-035-1/+211
|\|
| * Adds Anne Pro 2 c18 ISO variant support (#18154)Johns2022-10-035-1/+211
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-10-037-0/+255
|\|
| * add rart60 (#18570)Alabahuy2022-10-037-0/+255
| | | | | | * add rart60
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-10-0227-0/+974
|\|
| * Add `tzarc/ghoul`. (#18562)Nick Brassel2022-10-0327-0/+974
| | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Reverse keymap search order (#18449)Ryan2022-10-012-0/+25
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-10-019-7/+171
|\|
| * [Keyboard] Add Uni v4 keyboard (#18280)Peter Park2022-10-019-7/+171
| | | | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Peter Park <peter@Peters-MacBook-Air.local>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-10-0131-90/+540
|\|
| * [Keyboard] Add waffling60 Rev D ISO Hotswap (#18372)4pplet2022-10-0131-90/+540
| | | | | | | | Co-authored-by: 4pplet <4pplet@protonmail.com> Co-authored-by: 4pplet <stefan.ess@gmail.com>
* | RESET -> QK_BOOT user keymaps (#18560)Joel Challis2022-10-0115-15/+15
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-10-018-8/+8
|\|
| * Remove more RESET keycode references (#18559)Joel Challis2022-10-018-8/+8
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-10-012-4/+4
|\|
| * Djinn theme, allow force redraws (#18558)Nick Brassel2022-10-012-4/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-10-011-3/+2
|\|
| * onekey: fix quine keymap (#18555)Ryan2022-10-011-3/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-306-0/+155
|\|
| * [Keyboard] Add Little Big Scroll 4 macropad (#18516)Markus Knutsson2022-09-306-0/+155
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-304-0/+736
|\|
| * [Keymap] corne layout with mac/linux text editing shortcuts (#18374)nimishgautam2022-09-304-0/+736
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-309-173/+85
|\|
| * Fixup keebio/sinc (#18551)jack2022-09-309-173/+85
| |
* | Fixup controllerworks/mini42 (#18553)jack2022-09-304-47/+5
| | | | | | fix up stuff by waffle
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-304-43/+489
|\|
| * Smith and Rune Iron 165R2 Refactor (#18552)James Young2022-09-304-43/+489
| | | | | | by noroadsleft
* | Fix keyboard pet OLED timeout logic (#17189)Jouke Witteveen2022-09-306-72/+71
| | | | | | | | The animation itself turns the screen on, preventing the normal timeout from ever triggering.