summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-291-1/+3
|\
| * Document swap-hands tap-toggle feature (#15229)Albert Y2021-11-291-1/+3
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-2912-9/+104
|\|
| * [Keyboard] Add swap hands support for 3w6 rev2 (#15230)Albert Y2021-11-291-0/+17
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
| * [Keyboard] Fix layout + led state for Krush (#15231)Sắn2021-11-2911-9/+87
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-291-0/+5
|\|
| * [Keyboard] Add define GPIO into Dosa40RGB (#15252)Dao Tak Isaac2021-11-291-0/+5
| | | | | | Co-authored-by: NOOB Maker <93704375+noobmakers@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-2912-2/+444
|\|
| * [Keyboard] Add mousekey support for Technik variants (#15258)Albert Y2021-11-292-2/+2
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
| * [Keyboard] Add "DogTag" (#15259)takashicompany2021-11-2910-0/+442
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-292-4/+39
|\|
| * [Keyboard] Sweep swap hand feature and pin documentation (#15264)Albert Y2021-11-292-4/+39
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-299-67/+65
|\|
| * [Keyboard] Code updates for macro3 (#15280)Albert Y2021-11-296-67/+32
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
| * feat: adding carlosala keymap (#15281)Carlo Sala2021-11-293-0/+33
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-2920-0/+661
|\|
| * [Keyboard] Add Galatea TKL PCB. (#15290)studiokestra2021-11-2920-0/+661
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-299-0/+465
|\|
| * [Keyboard] Add Vertex 40% (#15323)kb-elmo2021-11-299-0/+465
| |
* | Added cancel_key_lock function (#15321)wheredoesyourmindgo2021-11-293-1/+8
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-2917-98/+459
|\|
| * [Keymap] Unicode and cursor sync - drashna keymap (#15328)Drashna Jaelre2021-11-2817-98/+459
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-286-7/+7
|\|
| * Fix keyboard level use of OLED_DRIVER_ENABLE (#15343)Joel Challis2021-11-286-7/+7
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-283-3/+2
|\|
| * fixed oled in bongocat keymap and fixed encoder direction (#15232)Conor Burns2021-11-283-3/+2
| | | | | | | | | | * fixed oled in bongocat keymap (#13454) and fixed encoder direction for prod parts * updated readme for launch later today
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-282-8/+8
|\|
| * Add TRNS to LOWER layer (#15288)Gastón Jorquera2021-11-282-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit makes the mode keys transparent in the LOWER layer instead of disabled. Before this commit, the following sequence of key presses `LGUI+LOWER+l` would translate into `Cmd+right` in macOS and, therefore, move the cursor to the end of line. But, pressing `LOWER+LGUI+l` would completely ignore the `LGUI` and, therefore, move the cursor one letter to the right. With this change, pressing `LOWER+LGUI+l` produces the same result as `LGUI+LOWER+l`. This is also true for multiple other combinations, like `RALT+SHIFT+LOWER+l`, `LOWER+RALT+SHIFT+l`, `SHIFT+LOWER+RALT+l`, etc. Co-authored-by: Gaston Jorquera <gjorquera@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-281-2/+8
|\|
| * Enable RGB Matrix animations being used (#15338)stanrc852021-11-281-2/+8
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-288-0/+193
|\|
| * [Keyboard] Add Nozbe Macropad (#14803)Leon Omelan2021-11-278-0/+193
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-286-3/+123
|\|
| * Meridian LED update (#15329)Álvaro A. Volpato2021-11-286-3/+123
| | | | | | | | | | | | | | * Meridian first update * Update README, adjust timing settings * Update README
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-2815-0/+428
|\|
| * [Keyboard] Add 40percent.club's 'polypad' PCB (#15158)ryjelsum2021-11-2715-0/+428
| | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Sergey Vlasov <sigprof@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-281-1/+1
|\|
| * Fix last merge date (#15327)Charly Delay2021-11-281-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-283-9/+9
|\|
| * [Bug] Xelus Keyboards 400kHz i2c fix (#15315)Xelus222021-11-283-9/+9
| | | | | | | | | | | | | | * 400khz fix * fix valor rev2 timing * keep consistent
* | Start `develop` for 2022q1.Nick Brassel2021-11-281-0/+4
|/
* Changelog 2021q4 (#15325)Nick Brassel2021-11-286-11/+487
| | | | | | | | | | | | | | | | | | | | | | | | | * Changelog. * Remove the asymmetric encoder PR from listing due to revert. * More docs * More docs * More docs * Links to changelog, updated schedule, slotted in 2 weeks of testing at the end so that there's no ambiguity with PR merge dates. * Clarify keyboard moves. * Fix dates * Sidebar * Fixup dates. * Fixup dates. * Wording.
* fix typos (#15316)Dasky2021-11-282-3/+3
|
* Fix HOLD_ON_OTHER_KEY_PRESS after #11059 (#15307)Stefan Kerkmann2021-11-281-4/+4
| | | | that broke compilation because of a typo: KEYPRESS should have been KEY_PRESS
* Fix build. (#15322)Nick Brassel2021-11-286-1/+1
|
* [Keyboard] Fix call to `pointing_device_handle_buttons` (#15313)Charly Delay2021-11-271-1/+1
|
* Re-add encoder tests (#15312)Drashna Jaelre2021-11-279-0/+462
| | | Co-authored-by: Balz Guenat <balz.guenat@gmail.com>
* [Bug] Revert Assymmetrical Split Encoder support (#12090) (#15311)Drashna Jaelre2021-11-2714-576/+58
| | | | | | | | | * Revert "fix broken macro in transport.h (#15239)" This reverts commit 06f18e22d9aff0afa4dce101a6a1b2cae5511365. * Revert "Rework encoders to enable asymmetric split keyboards (#12090)" This reverts commit 32215d5bff52262542a2f8d2a221b0303f02c019.
* WB32F3G71 config migration with removal of unnecessary items. (#15309)Nick Brassel2021-11-272-1289/+0
| | | | | * Config migration with removal of unnecessary items. * Removed as per suggestion.
* Westberrytech pr (#14422)Joy Lee2021-11-2720-4/+1763
| | | | | | | * Added support for WB32 MCU * Modified eeprom_wb32.c * Remove the eeprom_wb32-related code
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 00:18:11 +0000