summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-159-0/+309
|\
| * [Keyboard] add Matrix Me (#14331)yulei2021-09-159-0/+309
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-1517-17/+53
|\|
| * [Keyboard] Replaced Maker Keyboards & FJLabs Legacy Code (#14393)Felix Jen2021-09-1517-17/+53
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-151-2/+2
|\|
| * [Keyboard] Add `NO_LED` positions to match key matrix. (#14417)Albert Y2021-09-151-2/+2
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-152-5/+5
|\|
| * [Keymap] A slight improvement to my own ErgoDox keymap (#14425)IFo Hancroft2021-09-152-5/+5
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-1514-86/+200
|\|
| * [Keymap] Trying again with Prime-e update! (#14429)peott-fr2021-09-151-21/+21
| |
| * [Keyboard] Update lighting effects for xbows keyboard (#14432)X-Bows Tech2021-09-1513-65/+179
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-151-7/+6
|\|
| * [Bug] Fix IS31fl3741 driver to accept 1 or 2 addresses (#14451)Drashna Jaelre2021-09-151-7/+6
| | | | | | Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-151-6/+7
|\|
| * [Keyboard] Fix Boop65 rgb compile issues (#14444)Drashna Jaelre2021-09-151-6/+7
| |
* | Migrate STM32_EEPROM_ENABLE to use EEPROM_DRIVER (#14433)Joel Challis2021-09-151-4/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-158-0/+251
|\|
| * [Keyboard] Add Aya keyboard (#14378)Dan Nixon2021-09-148-0/+251
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-159-0/+285
|\|
| * [Keyboard] add kbd75 hotswap keyboard (#14283)moyi46812021-09-149-0/+285
| | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-1518-0/+1124
|\|
| * [Keyboard] add boop65 rgb keyboard (#14166)moyi46812021-09-149-0/+385
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Add KeyBee65 (#14163)Wolf Van Herreweghe2021-09-149-0/+739
| | | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Wolf Van Herreweghe <wolfvh@getupgamesofficial.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-1513-0/+764
|\|
| * [Keyboard] Add Mach80 for Melgeek (#14076)bomb2021-09-1413-0/+764
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-152-0/+96
|\|
| * [Keyboard] added 64_ansi_split_bs layout (#13776)jmcwilliams4032021-09-142-0/+96
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-151-2/+2
|\|
| * [Keyboard] Update peranekofactory/tone/rev2/rev2.h (#13610)ぺらねこ2021-09-141-2/+2
| | | | | | I changed the description that was mistakenly described as the same wiring as Rev1 to the correct description.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-151-17/+7
|\|
| * [Keyboard] Dubba175 Default Keymap Update (#13486)drhigsby2021-09-141-17/+7
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-151-18/+26
|\|
| * [Keyboard] VIA support with top facing LEDs and underglow (#12814)Carlos Martins2021-09-141-18/+26
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-1311-0/+415
|\|
| * Add initial support for M65S (#14027)Álvaro A. Volpato2021-09-1411-0/+415
| | | | | | | | | | | | | | | | | | | | | | * Add initial support for M65S * Remove LTO_ENABLE from rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Removed defs in rules.mk, remove EEPROM debug code in m65s.c Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-131-19/+0
|\|
| * [Keymap] Userspace updates (#14418)stanrc852021-09-131-19/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-132-25/+26
|\|
| * [Keyboard] fix mokey63 keymaps (#14424)Drashna Jaelre2021-09-132-25/+26
| |
* | Migrate boston_meetup/2019 away from QWIIC_DRIVERS (#14413)Joel Challis2021-09-135-224/+68
| |
* | Migrate hadron away from QWIIC_DRIVERS (#14415)Joel Challis2021-09-1315-733/+155
| |
* | Move Bluetooth config to common_features.mk (#14404)Ryan2021-09-1224-40/+42
| | | | | | | | | | | | | | | | | | * Move Bluetooth config to common_features.mk * Update common_features.mk Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Align ChibiOS I2C defs with other drivers (#14399)Joel Challis2021-09-1222-55/+43
| | | | | | | | | | | | | | | | | | * Align ChibiOS I2C defs with other drivers * Update keyboards/xelus/valor_frl_tkl/config.h Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-1213-64/+95
|\|
| * [Bug] Keymap Fixes - lyra and reviung39 (#14400)Xelus222021-09-113-42/+44
| |
| * [Keyboard] Fix Redox Media compilation errors (#14345)Drashna Jaelre2021-09-1110-22/+51
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-121409-1411/+0
|\|
| * Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (#14379)Ryan2021-09-121409-1411/+0
| |
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-09-121654-4000/+189
|\|
| * Remove width, height and key_count from info.json (#14274)Ryan2021-09-121654-4004/+193
| |