summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-0317-28/+168
|\
| * [Keyboard] RS60 Rev2 change to eeprom emulation (#18201)Xelus222022-09-0317-28/+168
| | | | | | by xelus
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-0311-0/+568
|\|
| * [Keyboard] Add IDOBAO Abacus ID42 Keyboard (#16923)Vino Rodrigues2022-09-0311-0/+568
| | | | | | by vinorodrigues
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-031-35/+35
|\|
| * Add absolute key positions to microdox info.json (#18238)Tim Traversy2022-09-031-35/+35
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-0358-72/+59
|\|
| * Remove more RESET keycode references (#18252)Joel Challis2022-09-0358-72/+59
| |
* | Adjust `EXTRAKEY_ENABLE` ifdefs for `send_extra()` (#18249)Ryan2022-09-024-8/+8
| |
* | Simplify extrakeys sending at the host driver level (#18230)Ryan2022-09-0212-149/+70
| | | | | | | | | | | | | | | | | | * Simplify extrakeys sending at the host driver level * There are two arguments here * Wrong syntax * Adjust keyboards which use a custom host driver
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-022-0/+0
|\|
| * [Keymap] Fixing location of my Keymap for the Gentleman65 (#18246)Brian2022-09-022-0/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-023-54/+60
|\|
| * [Keymap] Fix bootmagic compilation issue with Drashna keymaps (#18223)Drashna Jaelre2022-09-023-54/+60
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-0211-0/+354
|\|
| * [Keyboard] Add Lunakey Pico (#18202)Yoichiro Tanaka2022-09-0111-0/+354
| | | | | | | | | | 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 Bot2022-09-028-0/+424
|\|
| * [Keyboard] Add Shoc Keyboard (#18143)Jannik Becker2022-09-018-0/+424
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Prevent USB peripheral fault when restarting USB on WB32 MCUs (#18058)Joy Lee2022-09-013-0/+10
| | | | | | Co-authored-by: Joy <chang.li@westberrytech.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-021-1/+1
|\|
| * Install correct package on Fedora (#18243)Joel Challis2022-09-011-1/+1
| |
* | Better handle EEPROM reset keycode (#18244)Drashna Jaelre2022-09-011-1/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-0111-0/+725
|\|
| * [Keyboard] Add Ingrained Keyboard (#15928)jpuerto962022-09-0111-0/+725
| | | | | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Juan Puerto <jpuerto@psc.edu> Co-authored-by: jpuerto-psc <68066250+jpuerto-psc@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-09-012-11/+2
|\|
| * Remove non promicro pins from converters (#18239)Joel Challis2022-09-012-11/+2
| |
* | Add unicode mode change callbacks (#18235)Joshua Diamond2022-08-316-28/+63
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-3139-0/+5283
|\|
| * Add giabalanai keyboard (#10125)3araht2022-08-3139-0/+5283
| | | | | | by 3araht
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-319-0/+622
|\|
| * Added personal Iris Rev6a layout and Milk 2% layout (#17600)Ryan Neff2022-08-319-0/+622
| | | | | | by JellyTitan
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-312-0/+65
|\|
| * Add bepo variant to massdrop/thekey keymaps (#18129)Benjamin Collet2022-08-312-0/+65
| | | | | | by mrBen
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-3112-90/+76
|\|
| * Bandominedoni encoder fix (#18229)3araht2022-08-3112-90/+76
| | | | | | by 3araht
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-3121-156/+84
|\|
| * [Keyboard] Updates to Work Louder keyboards (#18232)Drashna Jaelre2022-08-3121-156/+84
| | | | | | | | by Drashna
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-3112-0/+726
|\|
| * [Keyboard] add tg67 (#18225)JX2022-08-3112-0/+726
| |
* | Ensure all keyboards have a bootloader set (#18234)Ryan2022-08-3115-5/+16
| |
* | Move bootloader.mk to platforms (#18228)Ryan2022-08-3111-100/+180
| |
* | [Core] Rework PS/2 driver selection (#17892)Marek Kraus2022-08-3126-60/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [Core] Rework PS/2 driver selection Enabling and selecting PS/2 driver was using old approach, so it was reworked to current approach, inspired by Serial and WS2812 driver selections. * [Keyboard] Update keyboards using PS/2 to use new PS/2 driver selection * [Docs] Update PS/2 documentation to use new PS/2 driver selection * Fix indentation * [Core] Add PS2 to data driver * Fix oversight in property name Co-authored-by: Drashna Jaelre <drashna@live.com> * Add PS/2 pins to data driven mappings Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-311-1/+1
|\|
| * `qmk lint`: fix TypeError (#18226)Ryan2022-08-311-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-3012-0/+403
|\|
| * [Keyboard] CannonKeys Malicious Ergo (#17076)Andrew Kannan2022-08-3012-0/+403
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add Malicious Ergo keyboard to QMK * Update layout * update info.json * update info.json again * Update info.json again * i h8 info.json * its default not all * Update keyboards/cannonkeys/malicious_ergo/config.h * Add bootloader instructions and license header * Update keyboards/cannonkeys/malicious_ergo/rules.mk * Update keyboards/cannonkeys/malicious_ergo/rules.mk * Update keyboards/cannonkeys/malicious_ergo/readme.md * Remove rotation from info.json * Remove labels * Update keyboards/cannonkeys/malicious_ergo/readme.md * Update keyboards/cannonkeys/malicious_ergo/malicious_ergo.h * Revise info.json again * whitespace fix * Apply suggestions from code review Move pid/vid into info json Fix rounding errors in info json Thanks to fauxpark and noroadsleft!
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-3026-0/+893
|\|
| * [Keyboard] Add NK65B (#18211)yiancar2022-08-3013-0/+441
| | | | | | Co-authored-by: yiancar <yiancar@gmail.com>
| * [Keyboard] Add NK87B (#18210)yiancar2022-08-3013-0/+452
| | | | | | Co-authored-by: yiancar <yiancar@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-301-2/+2
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 02:28:04 +0000