Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-10-05 | 31 | -177/+914 |
|\ | |||||
| * | Product changes to 1up lineup (#18382) | ziptyze | 2022-10-05 | 31 | -177/+914 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-10-05 | 1 | -4/+4 |
|\| | |||||
| * | width:2 → height:2 for spacetime thumb keys (#18605) | precondition | 2022-10-05 | 1 | -4/+4 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' into develop | fauxpark | 2022-10-06 | 12 | -19/+49 |
|\| | |||||
| * | [Keyboard] Add encoder map support for GMMK Pro (#18600) | adophoxia | 2022-10-05 | 12 | -58/+44 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-10-05 | 18 | -0/+493 |
|\| | |||||
| * | [Keyboard] Add waffling60 Rev D ANSI Hotswap (#18579) | 4pplet | 2022-10-05 | 9 | -0/+233 |
| | | | | | | | | Co-authored-by: 4pplet <4pplet@protonmail.com> Co-authored-by: 4pplet <stefan.ess@gmail.com> | ||||
| * | [Keyboard] Add waffling60 Rev D Solder (#18580) | 4pplet | 2022-10-05 | 9 | -0/+260 |
| | | | | | | | | Co-authored-by: 4pplet <4pplet@protonmail.com> Co-authored-by: 4pplet <stefan.ess@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-10-05 | 3 | -3/+3 |
|\| | |||||
| * | RESET → QK_BOOT in nyhxis/nfr_70 (#18607) | precondition | 2022-10-05 | 3 | -3/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-10-05 | 10 | -0/+83 |
|\| | |||||
| * | Fixup builds for mechlovin/infinity87. (#18604) | Nick Brassel | 2022-10-05 | 10 | -0/+83 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-10-05 | 10 | -0/+440 |
|\| | |||||
| * | [Keyboard] Add Nyhxis NFR-70 keyboard (#17562) | Jesper Severinsen | 2022-10-04 | 10 | -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 develop | QMK Bot | 2022-10-05 | 7 | -0/+199 |
|\| | |||||
| * | [Keyboard] Twig50 (#18085) | nodatk | 2022-10-04 | 7 | -0/+199 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Remove lingering DRIVER_LED_TOTAL references (#18594) | jack | 2022-10-05 | 2 | -2/+2 |
| | | |||||
* | | Fixup linworks/fave84h (#18593) | jack | 2022-10-05 | 2 | -6/+6 |
| | | |||||
* | | onekey: Enable ADC for STM32F072 Discovery (#18592) | Ryan | 2022-10-05 | 2 | -0/+5 |
| | | |||||
* | | Fix Per Key LED Indicator Callbacks (#18450) | Drashna Jaelre | 2022-10-04 | 205 | -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 Kerkmann | 2022-10-04 | 7 | -1/+28 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-10-03 | 5 | -1/+211 |
|\| | |||||
| * | Adds Anne Pro 2 c18 ISO variant support (#18154) | Johns | 2022-10-03 | 5 | -1/+211 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-10-03 | 7 | -0/+255 |
|\| | |||||
| * | add rart60 (#18570) | Alabahuy | 2022-10-03 | 7 | -0/+255 |
| | | | | | | * add rart60 | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-10-02 | 27 | -0/+974 |
|\| | |||||
| * | Add `tzarc/ghoul`. (#18562) | Nick Brassel | 2022-10-03 | 27 | -0/+974 |
| | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Reverse keymap search order (#18449) | Ryan | 2022-10-01 | 2 | -0/+25 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-10-01 | 9 | -7/+171 |
|\| | |||||
| * | [Keyboard] Add Uni v4 keyboard (#18280) | Peter Park | 2022-10-01 | 9 | -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 develop | QMK Bot | 2022-10-01 | 31 | -90/+540 |
|\| | |||||
| * | [Keyboard] Add waffling60 Rev D ISO Hotswap (#18372) | 4pplet | 2022-10-01 | 31 | -90/+540 |
| | | | | | | | | Co-authored-by: 4pplet <4pplet@protonmail.com> Co-authored-by: 4pplet <stefan.ess@gmail.com> | ||||
* | | RESET -> QK_BOOT user keymaps (#18560) | Joel Challis | 2022-10-01 | 15 | -15/+15 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-10-01 | 8 | -8/+8 |
|\| | |||||
| * | Remove more RESET keycode references (#18559) | Joel Challis | 2022-10-01 | 8 | -8/+8 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-10-01 | 2 | -4/+4 |
|\| | |||||
| * | Djinn theme, allow force redraws (#18558) | Nick Brassel | 2022-10-01 | 2 | -4/+4 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-10-01 | 1 | -3/+2 |
|\| | |||||
| * | onekey: fix quine keymap (#18555) | Ryan | 2022-10-01 | 1 | -3/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-09-30 | 6 | -0/+155 |
|\| | |||||
| * | [Keyboard] Add Little Big Scroll 4 macropad (#18516) | Markus Knutsson | 2022-09-30 | 6 | -0/+155 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-09-30 | 4 | -0/+736 |
|\| | |||||
| * | [Keymap] corne layout with mac/linux text editing shortcuts (#18374) | nimishgautam | 2022-09-30 | 4 | -0/+736 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-09-30 | 9 | -173/+85 |
|\| | |||||
| * | Fixup keebio/sinc (#18551) | jack | 2022-09-30 | 9 | -173/+85 |
| | | |||||
* | | Fixup controllerworks/mini42 (#18553) | jack | 2022-09-30 | 4 | -47/+5 |
| | | | | | | fix up stuff by waffle | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-09-30 | 4 | -43/+489 |
|\| | |||||
| * | Smith and Rune Iron 165R2 Refactor (#18552) | James Young | 2022-09-30 | 4 | -43/+489 |
| | | | | | | by noroadsleft | ||||
* | | Fix keyboard pet OLED timeout logic (#17189) | Jouke Witteveen | 2022-09-30 | 6 | -72/+71 |
| | | | | | | | | The animation itself turns the screen on, preventing the normal timeout from ever triggering. |