Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix layer switching from tap dances by redoing the keymap lookup (#17935) | Sergey Vlasov | 2022-10-03 | 8 | -5/+874 |
| | |||||
* | 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 |
| | | |||||
* | | Prevent tap dance from wiping dynamic macros (#17880) | Jason Ken Adhinarta | 2022-10-03 | 1 | -8/+14 |
| | | |||||
* | | 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-03 | 3 | -2/+4 |
|\| | |||||
| * | `:flash`: print bootloader (#18569) | Ryan | 2022-10-03 | 3 | -2/+4 |
| | | |||||
* | | 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> | ||||
* | | [Core] ChibiOS: Fix USB bus disconnect handling (#18566) | Stefan Kerkmann | 2022-10-02 | 2 | -1/+3 |
| | | |||||
* | | Reverse keymap search order (#18449) | Ryan | 2022-10-01 | 3 | -16/+41 |
| | | |||||
* | | 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 |
| | | |||||
* | | Fix comment of CM_QUES (Colemak question mark) (#18557) | precondition | 2022-10-01 | 1 | -1/+1 |
| | | | | | | `#define CM_QUES S(CM_SLSH) // /` → `#define CM_QUES S(CM_SLSH) // ?` | ||||
* | | 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 | ||||
* | | Small un/register_code() cleanups (#18544) | Ryan | 2022-09-30 | 2 | -31/+25 |
| | | |||||
* | | 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. | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-09-30 | 1 | -12/+72 |
|\| | |||||
| * | Forrcaho foldkb caps lock blink (#17424) | Forrest Cahoon | 2022-09-30 | 1 | -12/+72 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add mapping for Keebio FoldKB * Add (test) macro key; draw box chars around layout * More programming macro keys added * Fix stupid bug: return false when key has been handled * Add mouse layer * Encoder functions as mouse scroll wheel * add readme.md for my foldkb layout * Custom Keebio FoldKB keymap: blink backlight when caps lock is on | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-09-30 | 4 | -0/+70 |
|\| | |||||
| * | [Keyboard] handwired/tractyl_manuform: Arduino Micro (#17199) | Pascal J | 2022-09-30 | 4 | -0/+70 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-09-30 | 12 | -0/+747 |
|\| | |||||
| * | [Keyboard] Add nightstar75 (#18546) | JX | 2022-09-30 | 12 | -0/+747 |
| | | |||||
* | | onekey: enable ADC for Bluepill and Blackpill (#18545) | Ryan | 2022-09-30 | 10 | -0/+26 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-09-30 | 15 | -199/+106 |
|\| | |||||
| * | Rotary encoder setting is revised to solve a malfunction. (#18227) | 3araht | 2022-09-30 | 15 | -199/+106 |
| | | | | | | | | | | | | | | | | | | | | | | * Rotary encoder setting is revised to solve a mulfunction. UNUSED_PINS deleted. * Encoder map applied. * ENCODER_MAP_ENABLE moved to keymap level. * Settings in rules.mk moved to info.json. * picture sent to imgur. config.h streamlined. | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-09-30 | 14 | -0/+377 |
|\| | |||||
| * | Add Unicomp PC122 keyboard (#18326) | Purdea Andrei | 2022-09-30 | 14 | -0/+377 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-09-30 | 4 | -0/+1008 |
|\| | |||||
| * | AceVice One's keymap for Kyria keyboard (#18393) | Luis Moreno | 2022-09-30 | 4 | -0/+1008 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-09-30 | 13 | -0/+759 |
|\| | |||||
| * | [Keyboard] Add mini42 (#18491) | Controller Works | 2022-09-30 | 13 | -0/+759 |
| | | | | | | | | Co-authored-by: kevinmgee <kevingee@kevingee.biz> Co-authored-by: Drashna Jaelre <drashna@live.com> |