Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-06 | 1 | -0/+116 |
|\ | |||||
| * | handwired/ortho_brass: add QMK Configurator data (#15755) | James Young | 2022-01-05 | 1 | -0/+116 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-01-05 | 1 | -1/+1 |
|\| | |||||
| * | [Keymap] Fix onekey oled keymap (#15751) | Drashna Jaelre | 2022-01-05 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-12-30 | 2 | -113/+33 |
|\| | |||||
| * | [Keymap] Reorganization, cleanup and readmes for drashna code (#15617) | Drashna Jaelre | 2021-12-29 | 2 | -113/+33 |
| | | |||||
* | | [Keyboard] Fix compiler issue with tractyl manuform 4x6 (#15646) | Drashna Jaelre | 2021-12-29 | 1 | -4/+2 |
| | | |||||
* | | [Keyboard] Update Tractyl Manuform to use Split Pointing Device Sync | Drashna Jaelre | 2021-12-28 | 7 | -204/+57 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-12-27 | 10 | -0/+974 |
|\| | |||||
| * | Added BareDev keyboard (#15518) | Fernando Rodrigues | 2021-12-27 | 10 | -0/+974 |
| | | | | | | | | | | | | | | * Added BareDev keyboard * Updated readme.md to reflect handwired directory * Simplified keycodes for basic GUI + [KEY] | ||||
* | | Refactor `bootloader_jump()` implementations (#15450) | Ryan | 2021-12-27 | 2 | -0/+6 |
| | | | | | | | | | | | | | | * Refactor `bootloader_jump()` implementations * Fix tests? * Rename `atmel-samba` to `md-boot` | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-12-27 | 12 | -0/+405 |
|\| | |||||
| * | K.O.Y and German layout for several boards (#14991) | Paul Scheikl | 2021-12-27 | 12 | -0/+405 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added accent. * Added keymap for 5x6 dactyl manuform on KOY layout * Added xd75 folder that is not in the main repo anymore? * Added keymap for naked48 on KOY layout * Added keymap for splitreus62 on KOY layout * Added keymap for Dactyl Manuform 4x6 with RGB LEDs and K.O,Y layout * Fixed error where handedness was not correctly determined because of combining vbus pins of both controllers. * Replaced dynamic macros bith backspace and delete. * Changed detecting handedness from detecting usb communication to checking a wired pin. This avoids problems when booting the PC, where VBUS is already high, but no communication is happening -> both halves think they are not master. * Update keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/naked48/keymaps/scheiklp/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/naked48/keymaps/scheiklp/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/naked48/keymaps/scheiklp/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keymap.c Added copyright * Update config.h * Update rules.mk * Updated files according to PR requests. * Update keyboards/xd75/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/xd75/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/xd75/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/xd75/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Removed duplicate code. Updated copyright info. * Restored readme Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-12-27 | 7 | -0/+390 |
|\| | |||||
| * | Add personal handwired Planck clone (#13299) | BifbofII | 2021-12-27 | 7 | -0/+390 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add personal handwired Planck clone * remove references to planck * requested changes - small changes to defines - licence headers * Clean up rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Change function return type to bool Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-12-24 | 10 | -0/+277 |
|\| | |||||
| * | [Keyboard] Add dactyl manuform 4x6 with a 5 key thumb cluster (#15516) | Andrzej Kotulski | 2021-12-23 | 10 | -0/+277 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-12-15 | 5 | -122/+38 |
|\| | |||||
| * | [Keymap] Unicode and Pointing Device and Autocorect for drashna keymaps (#15415) | Drashna Jaelre | 2021-12-14 | 5 | -122/+38 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-12-15 | 1 | -29/+22 |
|\| | |||||
| * | [Keyboard] Fix Jot50 compilation errors (#15478) | Drashna Jaelre | 2021-12-14 | 1 | -29/+22 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | Drashna Jael're | 2021-12-14 | 32 | -475/+475 |
|\| | |||||
| * | Remove unnecessary backslash-escapes in default keymaps (#15472) | Ryan | 2021-12-14 | 32 | -475/+475 |
| | | | | | | | | | | | | | | * Remove unnecessary backslash-escapes in default keymaps * Remove unnecessary backslash-escapes in via keymaps * Remove unnecessary backslash-escapes in default-ish keymaps | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-12-13 | 26 | -27/+39 |
|\| | |||||
| * | Fix up build options comments (#15463) | Ryan | 2021-12-12 | 26 | -27/+39 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' into develop | fauxpark | 2021-12-09 | 182 | -320/+182 |
|\| | |||||
| * | Tidy up NKRO_ENABLE rules (#15382) | Ryan | 2021-12-09 | 182 | -319/+182 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-12-09 | 19 | -283/+0 |
|\| | |||||
| * | Remove empty config.h from default-ish keymaps (#15429) | Ryan | 2021-12-09 | 19 | -283/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | Drashna Jael're | 2021-12-08 | 18 | -91/+13 |
|\| | |||||
| * | Remove references to Makefile in keyboard-level rules.mk (#15427) | Ryan | 2021-12-07 | 19 | -93/+14 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-12-06 | 3 | -73/+137 |
|\| | |||||
| * | [Keymap] updates to own dactyl keymap (#14223) | Christian Eiden | 2021-12-06 | 3 | -73/+137 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-12-02 | 1 | -1/+0 |
|\| | |||||
| * | Remove pointless `CUSTOM_MATRIX = no` (#15383) | Ryan | 2021-12-02 | 1 | -1/+0 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' into develop | fauxpark | 2021-12-02 | 174 | -339/+2 |
|\| | |||||
| * | Tidy up `SLEEP_LED_ENABLE` rules (#15362) | Ryan | 2021-12-01 | 174 | -339/+2 |
| | | |||||
* | | Convert not_so_minidox to SPLIT_KEYBOARD (#15306) | Joel Challis | 2021-12-01 | 10 | -929/+21 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-11-30 | 1 | -0/+2 |
|\| | |||||
| * | [Keyboard] Add missng define for 4x6 Tractyl Manuform (#15363) | Drashna Jaelre | 2021-12-01 | 1 | -0/+2 |
| | | |||||
* | | [Keyboard] Added Wakizashi 40 (#15336) | xiao | 2021-11-29 | 7 | -0/+268 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | [Core] Remove matrix_is_modified() and debounce_is_active() (#15349) | Stefan Kerkmann | 2021-11-29 | 5 | -36/+0 |
|/ | |||||
* | [Keymap] Unicode and cursor sync - drashna keymap (#15328) | Drashna Jaelre | 2021-11-28 | 8 | -37/+113 |
| | |||||
* | [Keyboard] Add Nozbe Macropad (#14803) | Leon Omelan | 2021-11-27 | 8 | -0/+193 |
| | | | | 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 | 2021-11-24 | 3 | -130/+33 |
|\ | |||||
| * | Revert "handwired/split89 Layout Macro Refactor (#15210)" (#15284) | James Young | 2021-11-23 | 3 | -130/+33 |
| | | | | | | | | | | This reverts commit 26ae43219001dfe20aa525b6fb35f2aeb2b76617. Requested by jurassic73. | ||||
* | | Macros in JSON keymaps (#14374) | Zach White | 2021-11-22 | 5 | -0/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * macros in json keymaps * add advanced macro support to json * add a note about escaping macro strings * add simple examples * format json * add support for language specific keymap extras * switch to dictionaries instead of inline text for macros * use SS_TAP on the innermost tap keycode * add the new macro format to the schema * document the macro limit * add the json keyword for syntax highlighting * fix format that vscode screwed up * Update feature_macros.md * add tests for macros * change ding to beep * add json support for SENDSTRING_BELL * update doc based on feedback from sigprof * document host_layout * remove unused var * improve carriage return handling * support tab characters as well * Update docs/feature_macros.md Co-authored-by: Nick Brassel <nick@tzarc.org> * escape backslash characters * format * flake8 * Update quantum/quantum_keycodes.h Co-authored-by: Nick Brassel <nick@tzarc.org> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-11-19 | 1 | -61/+53 |
|\| | |||||
| * | Handwired Split65: Fix QMK Configurator Implementation (#15209) | James Young | 2021-11-19 | 1 | -61/+53 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | Drashna Jael're | 2021-11-19 | 3 | -33/+130 |
|\| |