summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Add script for performing compilation size regression investigations. (#15303)Nick Brassel2021-11-271-0/+79
| | | | | | | | | | | | | | | | | * Add script for performing compilation size regression investigations. * Print deltas * Correct scoping. * Concurrency control * Job count control, skip zeros (unless no build output), fix usage. * Add usage under -h arg. * Updated usage output. * Copyright header.
* More headroom. (#15302)Nick Brassel2021-11-251-3/+3
|
* More headroom. (#15301)Nick Brassel2021-11-261-3/+3
|
* Documentation typo fix (#15298)Álvaro A. Volpato2021-11-251-2/+2
| | | * Fix WS2812 driver docs typo
* New feature: `DYNAMIC_TAPPING_TERM_ENABLE` (#11036)precondition2021-11-2613-4/+191
| | | | | | | | | * New feature: `DYNAMIC_TAPPING_TERM_ENABLE` 3 new quantum keys to configure the tapping term on the fly. * Replace sprintf call in tapping_term_report by get_u16_str * Replace tab with 4 spaces
* Tidy up adjustable ws2812 timing (#15299)Joel Challis2021-11-256-58/+55
|
* Add ifndef to WS2812 timing constraints (#14678)Jordan Banasik2021-11-252-12/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add ifndef to WS2812 timing constraints Due to the way that the PrimeKB Meridian PCB was designed, this change is needed in order to properly adjust the LEDs. Testing: * Compiled primekb/meridian:default successfully * Compiled random board (walletburner/neuron:default) successfully * Fix linting errors Missed some spacing * More linting fixes Spacing on the comments... really? * Rename WS2812 timing parameters for clarity; add comments * Add docs update for the WS2812 timing macros * Fix typo on comment * Add ifndef for WS2812_RES * Update double backticks and table with parameters * Move timing adjustments documentation to ws2812_drivers * Move timings adjustment discussion to bitbang section * Update T0H and T1H definitions in subtractions * format Co-authored-by: Gondolindrim <alvaro.volpato@usp.br> Co-authored-by: zvecr <git@zvecr.com>
* Add Retro Shift (Auto Shift for Tap Hold via Retro Tapping) and Custom Auto ↵Isaac Elenbaas2021-11-256-125/+621
| | | | | | | Shifts (#11059) * Add Retro Shift and Custom Auto Shifts * Fix compilation errors with no RETRO_SHIFT value
* Remove use of __flash due to LTO issues (#15268)Joel Challis2021-11-2499-117/+131
|
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-243-130/+33
|\
| * Revert "handwired/split89 Layout Macro Refactor (#15210)" (#15284)James Young2021-11-233-130/+33
| | | | | | | | | | This reverts commit 26ae43219001dfe20aa525b6fb35f2aeb2b76617. Requested by jurassic73.
* | New Keyboard: TGR Jane CE (#14713)MechMerlin2021-11-2423-0/+330
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * move ce and v2ce into their own directories * update copyright notices * change LAYOUT macro names * remove community layout support for the original layouts * fix LAYOUT macro names * change info.json for the common layouts * fix tsangan LAYOUT * fix layout all * Update keyboards/tgr/jane/v2ce/keymaps/via/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/tgr/jane/v2ce/v2ce.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/tgr/jane/v2ce/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * remove unneeded file * one more time for good measure * Update keyboards/tgr/jane/v2ce/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/tgr/jane/v2ce/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-2310-72/+301
|\|
| * Portal 66 Layout Macro Refactor (#15255)James Young2021-11-2310-72/+301
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * soldered.h: use QMK 3-character notation * soldered.h: add matrix diagram * portal_66/soldered: rename LAYOUT_65_ansi_split_bs to LAYOUT_65_ansi_blocker_split_bs * portal_66/soldered: rename LAYOUT_65_ansi to LAYOUT_65_ansi_blocker * portal_66/soldered: rename LAYOUT_65_tsangan_split_bs to LAYOUT_65_ansi_blocker_tsangan_split_bs * portal_66/soldered: rename LAYOUT_65_iso to LAYOUT_65_iso_blocker * portal_66/soldered: add LAYOUT_65_iso_blocker_split_bs * portal_66/soldered: add LAYOUT_65_iso_blocker_tsangan_split_bs * portal_66/soldered: enable Community Layout support * hotswap.h: use QMK 3-character notation * hotswap.h: add matrix diagram * portal_66/hotswap: rename LAYOUT to LAYOUT_65_ansi_blocker * portal_66/hotswap: enable Community Layout support
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-234-150/+273
|\|
| * Pluckey: Fix QMK Configurator Implementation (#15254)James Young2021-11-234-150/+273
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rename LAYOUT to LAYOUT_all * pluckey.h: add matrix diagram * pluckey.h: use XXX for KC_NO * add LAYOUT_ergo macro with keymap `info.json` had layout data for this macro, but the macro was not present in the source code. * info.json: correct key sequence Fixes incorrect key assignments in QMK Configurator.
* | [Tests] Increase QMK test coverage take 2 (#15269)Stefan Kerkmann2021-11-2348-246/+2703
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add per-test keymaps * Add better trace and info logs for failed unit-tests * Add layer state assertion with tracing message * Use individual test binaries configuration options * Add basic qmk functionality tests * Add tap hold configurations tests * Add auto shift tests Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-231-4/+3
|\|
| * Ignore exit codes for formatters (#15276)Joel Challis2021-11-231-4/+3
| |