summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-152-33/+30
|\
| * Fix evancookaudio/sleepingdinosaur (#16654)jack2022-03-152-33/+30
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-1511-9/+9
|\|
| * [Keyboard] Fix mechlovin/kay65 (#16653)jack2022-03-1411-9/+9
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-158-23/+80
|\|
| * [Keyboard westm68 rev1 and fine tune westm boards (#16528)Pear2022-03-148-23/+80
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-154-4/+66
|\|
| * [Keyboard] evancookaudio sleepingdinosaur v2 (#16625)evanmcook2022-03-144-4/+66
| |
* | Add SN74x154 driver and convert AL1 custom matrix (#16331)Ryan2022-03-155-72/+194
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-1515-11/+642
|\|
| * [Keyboard] Add Kay65 PCB by Team Mechlovin' (#15565)mechlovin2022-03-1415-11/+642
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add kay65 PCB * update * update * Update readme.md * Update keyboards/mechlovin/kay65/rev1/rules.mk * Update keyboards/mechlovin/olly/jf/rules.mk * Update keyboards/mechlovin/kay65/rev1/rules.mk * Update keyboards/mechlovin/kay65/rev1/info.json * Update keymap.c * update * Update keyboards/mechlovin/kay65/rev1/rev1.h * Update keyboards/mechlovin/kay65/rev1/info.json * Update keyboards/mechlovin/kay65/rev1/info.json * Update keyboards/mechlovin/kay65/rev1/rules.mk * Update keymap.c * Update readme.md * Update keyboards/mechlovin/olly/jf/readme.md * Update keyboards/mechlovin/kay65/rev1/config.h
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-141-1/+1
|\|
| * Sentence correction (#16650)ethsol2022-03-141-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-144-2/+51
|\|
| * [Keyboard] Add via keymap to AL1 (#16499)Yakbats2022-03-144-2/+51
| |
* | Rename TICK to TICK_EVENT to prevent naming conflicts (#16649)Stefan Kerkmann2022-03-142-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-1412-0/+368
|\|
| * [Keyboard] Add BAMFK-1 (#16409)Danny2022-03-1412-0/+368
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-147-9/+8
|\|
| * Disable RGB matrix pixel animations for some boards (#16643)Ryan2022-03-143-9/+0
| | | | | | | | | | * idobao/id87/v2: disable RGB matrix pixel animations * Same for two more boards
| * keebio/iris: Add ifdefs to encoder callbacks (#16642)Ryan2022-03-144-0/+8
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-141-0/+10
|\|
| * bolsa/damapad - Fix missing layout macro (#16639)Joel Challis2022-03-131-0/+10
| |
* | Mousekeys fix (#16640)jack2022-03-131-0/+1
| |
* | Fix oneshot toggle logic (#16630)Drashna Jaelre2022-03-145-16/+15
| | | | | | | | | | | | | | * Fix oneshot toggle logic * Enable oneshots by default * Decrement eeconfig magic number due to eeconfig changes
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-143-3/+3
|\|
| * Fix 40percentclub USB descriptors (#16638)jack2022-03-143-3/+3
| |
* | [Core] Move `has_mouse_report_changed` function to `report.c` (#16543)Drashna Jaelre2022-03-145-23/+32
| | | | | | | | | | | | | | * Move 'has_mouse_report_changed' checkto report.c * change mousekeys to use memcpy * fix linting issues
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-131-1/+91
|\|
| * ISP flashing guide: add instructions for flashing STM32duino bootloader (#16568)Ryan2022-03-131-1/+91
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-1370-269/+237
|\|
| * Move keyboard USB IDs and strings to data driven: 0-9 (#16481)Ryan2022-03-1370-269/+237
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-1311-169/+41
|\|
| * USB-USB converter cleanup (#16618)Ryan2022-03-1311-169/+41
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-1316-150/+489
|\|
| * [Keyboard] Add "Uno" rev2 (#14071)Spencer Peterson2022-03-1316-150/+489
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [Keyboard] Add "Uno" rev2 Adds support for the second revision of Uno, courtesy of @Snipeye. * Update keyboards/uno/rev2/rules.mk * Update keyboards/uno/rev1/rules.mk * Update keyboards/uno/uno.h * Update keyboards/uno/rev2/rules.mk * Update keyboards/uno/rev1/rules.mk * Update keyboards/uno/keymaps/demo/keymap.c * Update keyboards/uno/keymaps/demo/keymap.c * Update keyboards/uno/keymaps/demo/keymap.c * Update keyboards/uno/rev2/rules.mk * Update keyboards/uno/rev1/rules.mk * Align rules.mk comments * Update keyboards/uno/info.json * Update keyboards/uno/rev1/config.h * Update keyboards/uno/rev2/config.h * Update keyboards/uno/rev2/config.h * Update keyboards/uno/rev2/config.h * Update keyboards/uno/rev1/config.h
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-139-0/+651
|\|
| * [Keyboard] Add support for Jels60 (#16605)jels2022-03-139-0/+651
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-131-0/+1
|\|
| * helix:edvorakjp keymap change to use split_common (#16532)Takeshi ISHII2022-03-131-0/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-133-15/+74
|\|
| * [Keymap] Update personal crkbd keymap (#16624)jpe2302022-03-133-15/+74
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-131-0/+1
|\|
| * [Keyboard] add missing endif in glitch keyboard (#16629)jack2022-03-131-0/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-139-0/+401
|\|
| * [Keyboard] Add damapad (#16443)Matthew Dias2022-03-129-0/+401
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-138-0/+556
|\|
| * [Keyboard] Add Glitch (#16444)Matthew Dias2022-03-128-0/+556
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-121-1/+2
|\|
| * docs: fix code sample (#16623)Thomas Kriechbaumer2022-03-121-1/+2
| |