Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-15 | 958 | -2807/+32 |
|\ | |||||
| * | Remove `NO_ACTION_MACRO` and `NO_ACTION_FUNCTION` from keyboard config.h ↵ | Ryan | 2022-03-15 | 958 | -2807/+32 |
| | | | | | | | | (#16655) | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-15 | 4 | -10/+6 |
|\| | |||||
| * | [Keyboard] Fix westm/westm68 compliation errors (#16657) | jack | 2022-03-15 | 4 | -10/+6 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-15 | 10 | -0/+222 |
|\| | |||||
| * | [Keyboard] Io mini1800 (#16115) | jpuerto96 | 2022-03-15 | 10 | -0/+222 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * First commit * first commit * 2x3u layout functional * 625u layout * rotary encoder * Modifications to keymaps * Remove ingrained from io_mini branch * Update readme * Update info.json * change hardware availability * Change rules.mk wording to match other PR * Update keyboards/io_mini1800/rules.mk * Update keyboards/io_mini1800/keymaps/default/keymap.c * Update keyboards/io_mini1800/keymaps/2x3u/keymap.c * Update keyboards/io_mini1800/io_mini1800.c * Update keyboards/io_mini1800/keymaps/2x3u/readme.md * Update keyboards/io_mini1800/readme.md | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-15 | 8 | -0/+316 |
|\| | |||||
| * | [Keyboard] Adding Gerald65 (#15872) | PaperCraneKeyboards | 2022-03-15 | 8 | -0/+316 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Gerald65 new keyboard files * removing initial population of pck * Initial Gerald65 Keyboard files * Changed diode direction * added fn layer, added picture to readme * directed mo keycode to fn layer * Changes to vendor id and bootloader instructions * Changed to direct image reference * Update keyboards/papercranekeyboards/gerald65/readme.md * Remove no longer used features | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-15 | 12 | -0/+576 |
|\| | |||||
| * | [Keyboard] Add Bacca70 keyboard (#16626) | thompson-ele | 2022-03-15 | 12 | -0/+576 |
| | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-15 | 2 | -33/+30 |
|\| | |||||
| * | Fix evancookaudio/sleepingdinosaur (#16654) | jack | 2022-03-15 | 2 | -33/+30 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-15 | 11 | -9/+9 |
|\| | |||||
| * | [Keyboard] Fix mechlovin/kay65 (#16653) | jack | 2022-03-14 | 11 | -9/+9 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-15 | 8 | -23/+80 |
|\| | |||||
| * | [Keyboard westm68 rev1 and fine tune westm boards (#16528) | Pear | 2022-03-14 | 8 | -23/+80 |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-15 | 4 | -4/+66 |
|\| | |||||
| * | [Keyboard] evancookaudio sleepingdinosaur v2 (#16625) | evanmcook | 2022-03-14 | 4 | -4/+66 |
| | | |||||
* | | Add SN74x154 driver and convert AL1 custom matrix (#16331) | Ryan | 2022-03-15 | 3 | -72/+88 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-15 | 15 | -11/+642 |
|\| | |||||
| * | [Keyboard] Add Kay65 PCB by Team Mechlovin' (#15565) | mechlovin | 2022-03-14 | 15 | -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 develop | QMK Bot | 2022-03-14 | 4 | -2/+51 |
|\| | |||||
| * | [Keyboard] Add via keymap to AL1 (#16499) | Yakbats | 2022-03-14 | 4 | -2/+51 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-14 | 12 | -0/+368 |
|\| | |||||
| * | [Keyboard] Add BAMFK-1 (#16409) | Danny | 2022-03-14 | 12 | -0/+368 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-14 | 7 | -9/+8 |
|\| | |||||
| * | Disable RGB matrix pixel animations for some boards (#16643) | Ryan | 2022-03-14 | 3 | -9/+0 |
| | | | | | | | | | | * idobao/id87/v2: disable RGB matrix pixel animations * Same for two more boards | ||||
| * | keebio/iris: Add ifdefs to encoder callbacks (#16642) | Ryan | 2022-03-14 | 4 | -0/+8 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-14 | 1 | -0/+10 |
|\| | |||||
| * | bolsa/damapad - Fix missing layout macro (#16639) | Joel Challis | 2022-03-13 | 1 | -0/+10 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-14 | 3 | -3/+3 |
|\| | |||||
| * | Fix 40percentclub USB descriptors (#16638) | jack | 2022-03-14 | 3 | -3/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-13 | 70 | -269/+237 |
|\| | |||||
| * | Move keyboard USB IDs and strings to data driven: 0-9 (#16481) | Ryan | 2022-03-13 | 70 | -269/+237 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-13 | 11 | -169/+41 |
|\| | |||||
| * | USB-USB converter cleanup (#16618) | Ryan | 2022-03-13 | 11 | -169/+41 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-13 | 16 | -150/+489 |
|\| | |||||
| * | [Keyboard] Add "Uno" rev2 (#14071) | Spencer Peterson | 2022-03-13 | 16 | -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 develop | QMK Bot | 2022-03-13 | 9 | -0/+651 |
|\| | |||||
| * | [Keyboard] Add support for Jels60 (#16605) | jels | 2022-03-13 | 9 | -0/+651 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-13 | 1 | -0/+1 |
|\| | |||||
| * | helix:edvorakjp keymap change to use split_common (#16532) | Takeshi ISHII | 2022-03-13 | 1 | -0/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-13 | 3 | -15/+74 |
|\| | |||||
| * | [Keymap] Update personal crkbd keymap (#16624) | jpe230 | 2022-03-13 | 3 | -15/+74 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-13 | 1 | -0/+1 |
|\| | |||||
| * | [Keyboard] add missing endif in glitch keyboard (#16629) | jack | 2022-03-13 | 1 | -0/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-13 | 9 | -0/+401 |
|\| | |||||
| * | [Keyboard] Add damapad (#16443) | Matthew Dias | 2022-03-12 | 9 | -0/+401 |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-03-13 | 8 | -0/+556 |
|\| | |||||
| * | [Keyboard] Add Glitch (#16444) | Matthew Dias | 2022-03-12 | 8 | -0/+556 |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> |