summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-2019-316/+508
|\
| * [Keymap] Minifan minor issues (#12592)Jos Boersema2021-04-1919-316/+508
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-1911-0/+522
|\|
| * [Keyboard] Add Wanderland - An Alice-layout keyboard (#12516)kiwikey2021-04-1911-0/+522
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-198-0/+248
|\|
| * [Keyboard] Add jkdlab/binary_monkey (#12374)Jaehee2021-04-198-0/+248
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-191-1/+1
|\|
| * Fix bm68rgb led map (#12503)peepeetee2021-04-191-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-193-0/+174
|\|
| * [Keymap] Iracing replay keymap (#12461)AaronVerDow2021-04-193-0/+174
| | | | | | Co-authored-by: Aaron VerDow <aaron@verdow.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-193-5/+60
|\|
| * [Keyboard] VIA Support for LCK75 (#12402)jack2021-04-193-5/+60
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-194-102/+10
|\|
| * [Keyboard] Update RAMA WORKS M50-A (#12459)Wilba2021-04-194-102/+10
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-191-8/+1
|\|
| * [Keyboard] Update dz60rgb default keymap (#12488)Benedict Tan2021-04-191-8/+1
| | | | | | | | | | The keymap for this PCB as of April 5, 2020 has a 4rth, largely superfluous layer, creating a total of 5 layers. When ported to VIA, this results in a layer that users can access but cannot edit. I propose removing this layer completely along with it's access from the default.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-193-0/+99
|\|
| * [Keymap] add kinesis/keymaps/stapelberg (#12430)Michael Stapelberg2021-04-183-0/+99
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-197-4/+157
|\|
| * New keyboard keymap, small keymap updates to mm2 keymap (#12310)Alexander Kagno2021-04-187-4/+157
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Alex <alex@turncommerce.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-199-0/+213
|\|
| * [Keyboard] Add wilba.tech WT60-G2 (#12395)Wilba2021-04-189-0/+213
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-1918-0/+426
|\|
| * [Keyboard] Add wilba.tech WT65-FX (#12394)Wilba2021-04-189-0/+213
| |
| * [Keyboard] Add wilba.tech WT65-F (#12393)Wilba2021-04-189-0/+213
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-198-0/+322
|\|
| * [Keyboard] Add handwired/frankie_macropad (#12349)Eric Wood2021-04-188-0/+322
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-196-155/+565
|\|
| * [Keyboard] Updates for 0xCB 1337 (#12336)Conor Burns2021-04-186-155/+565
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-193-0/+105
|\|
| * [Keymap] add my quefrency layout (#12104)Ben Fiedler2021-04-183-0/+105
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-199-0/+248
|\|
| * [Keyboard] Add G1_65 keyboard (#12140)Angel Rojas2021-04-189-0/+248
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-1940-1111/+436
|\|
| * [Keyboard] Capsunlocked CU80 Squish and Refactor (#12193)maz0r2021-04-1840-1111/+436
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Erovia <Erovia@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-192-3/+3
|\|
| * [Keyboard] Helen80 matrix fixes (#11969)LIParadise2021-04-182-3/+3
| | | | | | Co-authored-by: LIParadise <a58524andy>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-199-0/+230
|\|
| * [Keyboard] Add Dystopia keyboard (#11997)Sanctified-git2021-04-189-0/+230
| | | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Erovia <Erovia@users.noreply.github.com> Co-authored-by: Sanctified <Sanctified@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-198-138/+354
|\|
| * [Keyboard] Update MJ61 architecture to support multi version (#11787)MelGeek2021-04-188-138/+354
| | | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-1911-0/+411
|\|
| * [Keyboard] Adding of Monarch keyboard (#11769)RinoSolutions2021-04-1811-0/+411
| | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ramon Imbao <ramonimbao@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-1910-0/+289
|\|
| * [Keyboard] Added Koolertron AMAG23 (#11725)Ian McLinden2021-04-1810-0/+289
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-198-0/+421
|\|
| * [Keyboard] Add Tau4 keyboard (#11361)Oliver Gaskell2021-04-188-0/+421
| | | | | | | | | | | | with default and i2cscanner keymaps Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-193-125/+13
|\|
| * Fixup Satisfaction75 bootprocess. (#12621)Nick Brassel2021-04-193-125/+13
| | | | | | | | | | | | | | | | | | | | - Use normal ChibiOS I2C driver. - Move drawing code to housekeeping -- previously it was during matrix scan, which gets executed during bootmagic checks. However, bootmagic is invoked before QWIIC subsystem is enabled, which means I2C isn't configured yet. All I2C calls to the OLED fail with timeouts while bootmagic is being checked. Housekeeping ensures this is executed once the system has initialised and settled. - QWIIC OLED driver: properly clear out OLED buffer when clearing screen.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-181-2/+2
|\|