summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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-1/+1
|\|
| * [Docs] fixed incorrect amount of steps for oled usage (#13519)vsrivastava2021-09-141-1/+1
| | | | | | | | | | changed line 21 from saying "three steps" to "two steps" as there are only two steps Co-authored-by: feynmantf <46390109+feynmantf@users.noreply.github.com>
* | 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>
* | fix typo in backlight code from #14439 (#14442)Drashna Jaelre2021-09-151-1/+1
| |
* | Refactor use of _STM32_ defines (#14439)Joel Challis2021-09-1511-46/+55
| |
* | [Docs] Clean up some code block languages (#14434)Ryan2021-09-1425-61/+61
| |
* | Refactor use of STM32_SYSCLK (#14430)Joel Challis2021-09-146-12/+14
| | | | | | | | | | * Refactor use of STM32_SYSCLK * clang
* | 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-133-19/+40
|\|
| * [Keymap] Userspace updates (#14418)stanrc852021-09-133-19/+40
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-132-25/+26
|\|
| * [Keyboard] fix mokey63 keymaps (#14424)Drashna Jaelre2021-09-132-25/+26
| |
* | RN42 Bluetooth typo fix (#14421)Ryan2021-09-131-1/+1
| |
* | 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
| |
* | Update ChibiOS-Contrib (#14419)Nick Brassel2021-09-131-0/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-123-6/+9
|\|
| * Apply `TAP_CODE_DELAY` to Tap Dance key sequences (#14412)Drashna Jaelre2021-09-133-6/+9
| | | | | | | | | | * Add support to tap dances * Move default tap code defines to header file
* | Update ChibiOS-Contrib (#14408)Nick Brassel2021-09-131-0/+0
| |
* | Move Bluetooth config to common_features.mk (#14404)Ryan2021-09-1231-99/+78
| | | | | | | | | | | | | | | | | | * 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-1226-95/+64
| | | | | | | | | | | | | | | | | | * 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-121-2/+2
|\|
| * update compatible_microcontrollers.md translation (#14401)umi2021-09-121-2/+2
| |
* | 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-121410-1412/+0
|\|
| * Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (#14379)Ryan2021-09-121410-1412/+0
| |
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-09-121718-4139/+193
|\|
| * Remove width, height and key_count from info.json (#14274)Ryan2021-09-121718-4143/+197
| |
* | Remove unreferenced IBM4704, Sony NEWS, NeXT keyboard code. (#14380)Nick Brassel2021-09-126-776/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-114-13/+22
|\|
| * [Keyboard] Update lighting effects for xbows ranger keyboard (#14318)X-Bows Tech2021-09-114-13/+22
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-119-0/+344
|\|
| * [Keyboard] add support for Bobpad (#13989)Ananya Kirti2021-09-119-0/+344
| | | | | | | | 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-119-0/+268
|\|
| * [Keyboard] Add 3keyecosystem and 2key2 keyboard (#14023)John Mueller2021-09-119-0/+268
| | | | | | | | 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-119-0/+333
|\|
| * [keyboard] Add hotswap YMDK Wings (#14176)alittlepeace2021-09-119-0/+333
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add files via upload * Update keyboards/ymdk/wingshs/readme.md Co-authored-by: Joel Challis <git@zvecr.com> * Delete wingshs.json * Update keyboards/ymdk/wingshs/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/ymdk/wingshs/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/ymdk/wingshs/info.json Co-authored-by: Ryan <fauxpark@gmail.com> 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-114-0/+410
|\|