Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | [Keymap] Fix maddie layout for ploopy/trackball_nano (#17213) | Aidan Gauland | 2022-06-02 | 1 | -27/+28 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-06-02 | 2 | -0/+5 | |
|\| | ||||||
| * | [Keyboard] Acheron Shark alpha Encoder support (#17266) | Václav Kučera | 2022-06-02 | 2 | -0/+5 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-06-02 | 9 | -0/+382 | |
|\| | ||||||
| * | Add wavtype/p01_ultra (#16513) | wavtype | 2022-06-02 | 9 | -0/+382 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * new fork (manta and foundation) added foundation and manta firmware * removed manta * VIA compliant changes added readme, info.json edits * Update keyboards/wavtype/foundation/config.h Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/wavtype/foundation/readme.md Co-authored-by: Joel Challis <git@zvecr.com> * removed via.json and updated readme * Update keyboards/wavtype/foundation/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/wavtype/foundation/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/wavtype/foundation/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keymap.c * added p01 ultra * updated diode direction proto used opposite diode direction * removed foundation * Update keyboards/wavtype/p01_ultra/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/wavtype/p01_ultra/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/wavtype/p01_ultra/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/wavtype/p01_ultra/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/wavtype/p01_ultra/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/wavtype/p01_ultra/readme.md Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/wavtype/p01_ultra/info.json Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/wavtype/p01_ultra/keymaps/via/keymap.c Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/wavtype/p01_ultra/keymaps/default/keymap.c Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/wavtype/p01_ultra/keymaps/default/keymap.c Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/wavtype/p01_ultra/keymaps/via/keymap.c Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/wavtype/p01_ultra/keymaps/via/keymap.c Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/wavtype/p01_ultra/keymaps/default/keymap.c Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/wavtype/p01_ultra/keymaps/default/keymap.c Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/wavtype/p01_ultra/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/wavtype/p01_ultra/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/wavtype/p01_ultra/config.h Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> | |||||
* | | Allow larger SPLIT_USB_TIMEOUT with default SPLIT_USB_TIMEOUT_POLL (#17272) | Dasky | 2022-06-01 | 1 | -1/+2 | |
| | | | | | | | | | | * Switch SPLIT_USB_DETECT loop to uint16_t * Add assertion | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-05-31 | 2 | -2/+2 | |
|\| | ||||||
| * | move RESET to QK_BOOT (#17278) | Carlo Sala | 2022-05-31 | 2 | -2/+2 | |
| | | | | | | | | | | * move RESET to QK_BOOT * fix tapping_term | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-05-31 | 1 | -1/+1 | |
|\| | ||||||
| * | Add trailing parens to `get_oneshot_mods` in feature_advanced_keycodes.md ↵ | Forrest Cahoon | 2022-05-31 | 1 | -1/+1 | |
| | | | | | | | | (#17211) | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-05-31 | 1 | -1/+2 | |
|\| | ||||||
| * | [Keyboard] fix dz64rgb rgb sleep (#17209) | moyi4681 | 2022-05-31 | 1 | -1/+2 | |
| | | ||||||
* | | Make bootloader_jump for dualbank STM32 respect ↵ | Thomas Preisner | 2022-05-30 | 2 | -3/+3 | |
| | | | | | | | | STM32_BOOTLOADER_DUAL_BANK_DELAY (#17178) | |||||
* | | Improve PS/2 mouse performance (#17111) | Andrew Dunai | 2022-05-30 | 4 | -6/+22 | |
| | | ||||||
* | | Use TAP_HOLD_CAPS_DELAY for KC_LOCKING_CAPS_LOCK (#17099) | precondition | 2022-05-30 | 1 | -1/+1 | |
| | | ||||||
* | | Removes terminal from QMK. (#17258) | Nick Brassel | 2022-05-30 | 44 | -663/+38 | |
| | | ||||||
* | | Make SPI Mode configurable and change default mode to 3 (#17263) | trwnh | 2022-05-31 | 2 | -1/+6 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-05-31 | 59 | -768/+671 | |
|\| | ||||||
| * | [Keymap] Drashna update for post Q2 merge (#17241) | Drashna Jaelre | 2022-05-30 | 59 | -768/+671 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-05-31 | 1 | -1/+1 | |
|\| | ||||||
| * | Change AW20216 SPI Mode from 0 to 3, to fix RGB LEDs on GMMK Pro (#17262) | trwnh | 2022-05-31 | 1 | -1/+1 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-05-31 | 4 | -136/+223 | |
|\| | ||||||
| * | Nix shell updates (#17243) | Sergey Vlasov | 2022-05-31 | 4 | -136/+223 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-05-31 | 12 | -789/+653 | |
|\| | ||||||
| * | Convert ergodone to use core mcp23018 driver (#17005) | Joel Challis | 2022-05-31 | 12 | -789/+653 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-05-30 | 5 | -20/+33 | |
|\| | ||||||
| * | Fix various lint errors (#17255) | Joel Challis | 2022-05-30 | 5 | -20/+33 | |
| | | | | | | | | | | * Fix various lint errors * reduce complexity | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-05-30 | 2 | -2/+2 | |
|\| | ||||||
| * | Fix docs typo (#17254) | Dasky | 2022-05-30 | 2 | -2/+2 | |
| | | ||||||
* | | Add uf2-split-* make targets. (#17257) | Dasky | 2022-05-31 | 4 | -2/+15 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-05-30 | 13 | -0/+983 | |
|\| | ||||||
| * | [Keyboard] Add str.merro60 pcb (#17097) | chalex | 2022-05-30 | 13 | -0/+983 | |
| | | | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Alexander Lee <aclee3@CGHan-Macbook-2015.local> Co-authored-by: chalex <chlxbsmt@gmail.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-05-30 | 3 | -13/+27 | |
|\| | ||||||
| * | [Keymap] Updates to layouts/community/ortho_4x12/junonum (#17249) | Juno Nguyen | 2022-05-30 | 3 | -13/+27 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-05-30 | 8 | -6/+56 | |
|\| | ||||||
| * | [Keymap] Update sethbarberee code to QK_BOOT and try out DVVORAK (#17230) | Seth Barberee | 2022-05-30 | 8 | -6/+56 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-05-30 | 4 | -4/+30 | |
|\| | ||||||
| * | Fix API errors (#17239) | Joel Challis | 2022-05-30 | 4 | -4/+30 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-05-29 | 1 | -1/+1 | |
|\| | ||||||
| * | Use correct container for unit test workflow (#17242) | Joel Challis | 2022-05-29 | 1 | -1/+1 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-05-29 | 1 | -0/+1 | |
|\| | ||||||
| * | Fix quark_lp via firmware size (#17233) | Joel Challis | 2022-05-29 | 1 | -0/+1 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-05-29 | 4 | -22/+45 | |
|\| | ||||||
| * | Fixup iron165r2 (#17119) | jack | 2022-05-29 | 4 | -22/+45 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | * initial * revert some defines * formatting * apply changes * update readme * suggestion | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-05-28 | 1 | -23/+37 | |
|\| | ||||||
| * | Fixup command sequencing for master/develop. (#17227) | Nick Brassel | 2022-05-29 | 1 | -23/+37 | |
| | | ||||||
* | | Branch point after 2022-05-28 Breaking Change. | Nick Brassel | 2022-05-29 | 1 | -0/+4 | |
| | | ||||||
* | | Merge branch 'master' into develop | Nick Brassel | 2022-05-29 | 0 | -0/+0 | |
|\| | ||||||
| * | Merge branch 'develop' -- breaking changes 2022-05-28. | Nick Brassel | 2022-05-29 | 2860 | -9639/+19576 | |
| |\ | |/ |/| | ||||||
* | | Merge point for 2022-05-28 Breaking Change | Nick Brassel | 2022-05-29 | 1 | -4/+0 | |
| | |