summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Fix comment of CM_QUES (Colemak question mark) (#18557)precondition2022-10-011-1/+1
| | | | | | `#define CM_QUES S(CM_SLSH) // /` → `#define CM_QUES S(CM_SLSH) // ?`
* | 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
* | Small un/register_code() cleanups (#18544)Ryan2022-09-302-31/+25
| |
* | 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.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-301-12/+72
|\|
| * Forrcaho foldkb caps lock blink (#17424)Forrest Cahoon2022-09-301-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 developQMK Bot2022-09-304-0/+70
|\|
| * [Keyboard] handwired/tractyl_manuform: Arduino Micro (#17199)Pascal J2022-09-304-0/+70
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-3012-0/+747
|\|
| * [Keyboard] Add nightstar75 (#18546)JX2022-09-3012-0/+747
| |
* | onekey: enable ADC for Bluepill and Blackpill (#18545)Ryan2022-09-3010-0/+26
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-3015-199/+106
|\|
| * Rotary encoder setting is revised to solve a malfunction. (#18227)3araht2022-09-3015-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 developQMK Bot2022-09-3014-0/+377
|\|
| * Add Unicomp PC122 keyboard (#18326)Purdea Andrei2022-09-3014-0/+377
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-304-0/+1008
|\|
| * AceVice One's keymap for Kyria keyboard (#18393)Luis Moreno2022-09-304-0/+1008
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-3013-0/+759
|\|
| * [Keyboard] Add mini42 (#18491)Controller Works2022-09-3013-0/+759
| | | | | | | | Co-authored-by: kevinmgee <kevingee@kevingee.biz> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-307-1/+220
|\|
| * [Keyboard] Add saevus cor (#18368)Ramon Imbao2022-09-296-0/+219
| |
| * [Keyboard] Fix tklfrlnrlmlao layout (#18543)Zicodia2022-09-291-1/+1
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-3014-0/+350
|\|
| * [Keyboard] add Ask55 (#18256)Tom Barnes2022-09-2914-0/+350
| | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-3012-0/+707
|\|
| * [Keyboard] Add yandrstudio/buff67v3 keyboard (#17592)JX2022-09-2912-0/+707
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-301-1/+1
|\|
| * Grammar Fix for PR Checklist (#18540)James Young2022-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | * Grammar Fix for PR Checklist * Update docs/pr_checklist.md Co-authored-by: Nick Brassel <nick@tzarc.org> * Update docs/pr_checklist.md, take 2 Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-304-0/+130
|\|
| * [Keyboard] Add handwired tkk diodeless keyboard (#18379)Joseph Fass2022-09-294-0/+130
| | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Remove remaining use of terminal keys and related comment labels (#18402)Johannes Löthberg2022-09-2995-187/+186
| |