summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-157-3/+14
|\
| * Fix keycode mappings for via and ensure they don't change within protocol ↵xyzz2021-03-157-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#12130) * Fix keycode mappings for via and ensure they don't change within protocol * Update keycodes * Fix broken keyboards * added the missing keycodes found in via * Remove invalid keycodes Co-authored-by: David Hoelscher <infinityis@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-1411-0/+473
|\|
| * [Keyboard] Added Adellein Keyboard/PCB (#11547)NightlyBoards2021-03-1411-0/+473
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-147-0/+534
|\|
| * [Keymap] Add yhaliaw keymap for Planck/Rev6.1. (#11318)yhaliaw2021-03-147-0/+534
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-141-0/+83
|\|
| * Add info.json for RGBKB Pan (#12218)Ryan2021-03-151-0/+83
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-1411-0/+610
|\|
| * Add Cassette42 (#10562)Monksoffunk2021-03-1511-0/+610
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-144-0/+194
|\|
| * [Keymap] miles2go userspace update, add functions for babblepaste library, ↵milestogo2021-03-144-0/+194
| | | | | | | | | | add prime_e keybard keymap (#9196) Co-authored-by: Drashna Jaelre <drashna@live.com>
* | LED Matrix: Clean up includes (#12197)Ryan2021-03-132-3/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-1211-0/+294
|\|
| * Hand 88 (#11963)yiancar2021-03-1311-0/+294
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-121-1/+1
|\|
| * fix info.json layout name for boardsource/5x12 (#12145)Dan Thomas2021-03-131-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-124-1/+5
|\|
| * [Bugs] Fix VIA Compiles (#12186)Xelus222021-03-124-1/+5
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-122-0/+10
|\|
| * Document LED physical location index for Planck and Preonic (#12147)Albert Y2021-03-132-0/+10
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-121-0/+2
|\|
| * Enable default features on VIA keymap for Lily58 (#12185)Albert Y2021-03-121-0/+2
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-123-1365/+57
|\|
| * ChibiOS conf upgrade for boston (#12170)Nick Brassel2021-03-123-1365/+57
| | | | | | boston - 8bded9dabff58de6febd927d4ad976bb743696a3
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-112-23/+18
|\|
| * [Keymap] arkag Userspace updated (#12183)Alexander Kagno2021-03-112-23/+18
| | | | | | Co-authored-by: Alex <alex@turncommerce.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-10153-1623/+249
|\|
| * Refactor to use led config - Part 6 (#12115)Joel Challis2021-03-10153-1623/+249
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Convert to config * Convert to config * Convert to config * Convert to config * Convert to config * Convert to config * Convert to config * Convert to config * revert changes
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-1015-49/+493
|\|
| * Add VIA support to doodboard/duckboard_r2 (#12028)somepin2021-03-0915-49/+493
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update R1 keymap and config * Add duckboard R2 * Add VIA support for duckboard R2 * Set bootmagic lite row and column * Update config.h * Update keyboards/doodboard/duckboard/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update config.h Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-091-0/+127
|\|
| * Add BFO-9000 info.json (#12179)Danny2021-03-091-0/+127
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-074-0/+209
|\|
| * [Keymap] add crkbd/keymaps/armand1m (#12098)Armando Magalhães2021-03-074-0/+209
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-0720-0/+817
|\|
| * [Keyboard] Capsunlocked CU80 - added variant's for RGB matrix support (#12019)maz0r2021-03-0720-0/+817
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | trivial change to trigger api updateZach White2021-03-071-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-071-1/+2
|\|
| * minor change to trigger api updateZach White2021-03-071-1/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-073-3/+3
|\|
| * Remove stale references to "handwired/ferris"Pierre Chevalier2021-03-063-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | The code was moved to the "ferris" directory. Fixes the following commands: ``` qmk compile ~/qmk_firmware/keyboards/ferris/keymaps/default/keymap.json qmk compile ~/qmk_firmware/keyboards/ferris/keymaps/pierrec83/keymap.json ``` Addresses this issue: https://github.com/pierrechevalier83/ferris/issues/5
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-068-0/+429
|\|
| * [Keyboard] bm68rgb (#12128)peepeetee2021-03-068-0/+429
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add support for Bbm68rgb * pull request changes filled * pull request changes filled(this time for real) * added new line to files that did not have new lines at end of file * updated modifier keys for rgb effects * Update keyboards/bm68rgb/readme.md * Apply suggestions from code review * Apply suggestions from code review * add nkro suppport * Update keyboards/bm68rgb/rules.mk * modified keymap to better correspond to physical layout * updated comment style
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-0610-0/+356
|\|
| * [Keyboard] add Soup10 support (#11921)icesoup2021-03-0610-0/+356
| | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-0617-0/+1121
|\|
| * Adding Zodiark Split keyboard (#11837)Aleblazer2021-03-0617-0/+1121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adding Files for Zodiark * zodiark.h and keymap.c layout corrections * Apply suggestions from code review Applied all suggestions from zvecr. Co-authored-by: Joel Challis <git@zvecr.com> * Applied all suggestions from fauxpark Co-authored-by: Ryan <fauxpark@gmail.com> * Defined matrix driver * Update keymap with GPL2 * Added GPL2+ to All keymap.c, cleaned up config.h, and removed the rgbmatrixwip keymap * Apply suggestions from code review Removed the two lines from the config.h and changed to the smaller resolution picture on the Readme. Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> * Added VIA keymap * Corrected VIA Keymap oled.c 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 Bot2021-03-059-0/+595
|\|
| * added 0xCB/1337 keyboard (#12089)Conor Burns2021-03-059-0/+595
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com>