summaryrefslogtreecommitdiff
path: root/quantum
AgeCommit message (Collapse)Author
2021-08-06Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-06Avoid name conflicts with usb_hid Arduino code (#13870)Joel Challis
* Avoid name conflicts with usb_hid Arduino code * Fix tests
2021-08-06Process combos earlier & overlapping combos (#8591)Pete Sevander
* Combo processing improvements. Now it is possible to use ModTap and LayerTap keys as part of combos. Overlapping combos also don't trigger all the combos, just exactly the one that you press. New settings: - COMBO_MUST_HOLD_MODS - COMBO_MOD_TERM - COMBO_TERM_PER_COMBO - COMBO_MUST_HOLD_PER_COMBO - COMBO_STRICT_TIMER - COMBO_NO_TIMER * Remove the size flags from combo_t struct boolean members. This in the end actually saves space as the members are accessed so many times. The amount of operations needed to access the bits uses more memory than setting the size saves. * Fix `process_combo_key_release` not called correctly with tap-only combos * Fix not passing a pointer when NO_ACTION_TAPPING is defined. * Docs for `COMBO_ONLY_FROM_LAYER` * Update docs/feature_combo.md Co-authored-by: precondition <57645186+precondition@users.noreply.github.com> * Update quantum/process_keycode/process_combo.c Co-authored-by: precondition <57645186+precondition@users.noreply.github.com> * Add `EXTRA_SHORT_COMBOS` option. Stuff combo's `disabled` and `active` flags into `state`. Possibly can save some space. * Add more examples and clarify things with dict management system. - Simple examples now has a combo that has modifiers included. - The slightly more advanced examples now are actually more advanced instead of just `tap_code16(<modded-keycode>)`. - Added a note that `COMBO_ACTION`s are not needed anymore as you can just use custom keycodes. - Added a note that the `g/keymap_combo.h` macros use the `process_combo_event` function and that it is not usable in one's keymap afterwards. * Update docs/feature_combo.md Co-authored-by: precondition <57645186+precondition@users.noreply.github.com> * Update docs/feature_combo.md Co-authored-by: precondition <57645186+precondition@users.noreply.github.com> * Update docs/feature_combo.md Co-authored-by: precondition <57645186+precondition@users.noreply.github.com> * Update docs/feature_combo.md Co-authored-by: precondition <57645186+precondition@users.noreply.github.com> * Update docs/feature_combo.md Co-authored-by: precondition <57645186+precondition@users.noreply.github.com> * Change "the" combo action example to "email" example. * Update docs/feature_combo.md Co-authored-by: precondition <57645186+precondition@users.noreply.github.com> * Fix sneaky infinite loop with `combo_disable()` No need to call `dump_key_buffer` when disabling combos because the buffer is either being dumped if a combo-key was pressed, or the buffer is empty if a non-combo-key is pressed. * Update docs/feature_combo.md Co-authored-by: precondition <57645186+precondition@users.noreply.github.com> * Update docs/feature_combo.md Co-authored-by: precondition <57645186+precondition@users.noreply.github.com> Co-authored-by: precondition <57645186+precondition@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-08-04Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-04Add bootloader section to keyboard template (#13774)Drashna Jaelre
* Add bootloader section to keyboard template * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-04Fix overflows in WPM calculations (#13128)Joakim Tufvegren
* Fix overflow in WPM calculations. First, the "fresh" WPM calculation could end up being up to 12000 (with default `WPM_ESTIMATED_WORD_SIZE`) if keys were pressed more or less simultaneously. This value has now been clamped down to 255, in effect clamping WPM to its max value of 255. Second, with `WPM_ALLOW_COUNT_REGRESSION` enabled, it was possible to regress the WPM below 0 (i.e. to 255) by just repeatedly pressing backspace. * Fix WPM being limited to 235 due to float/int logic.
2021-08-03Move print/debug files to quantum (#12069)Joel Challis
* move print/debug files to quantum * Update comments
2021-08-03Unconditionally call led_init_ports (#12116)Joel Challis
* Unconditionally call led_init_ports * Another call to led_init_ports
2021-08-01[BUG] Fix Key Override includes (#13831)Drashna Jaelre
* [BUG] Fix Key Override includes * simplify includes
2021-07-28Minor tidy up of key overrides (#13747)Joel Challis
* Minor tidy up of key overrides * Update quantum/quantum.c * Update quantum/quantum.c
2021-07-28matrix_scan_x -> x_task (#13748)Joel Challis
2021-07-27Align AW20216 driver (#13712)Joel Challis
* Align AW20216 driver * Update drivers/awinic/aw20216.h Co-authored-by: Ryan <fauxpark@gmail.com> * Review comments * formatting fixes * stop if start failed? * review comments Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-25Haptic: driver-> feature (#13713)Joel Challis
2021-07-25Merge remote-tracking branch 'upstream/master' into developNick Brassel
2021-07-24Refactor some platform dependent logic (#13675)Joel Challis
2021-07-24Avoid LTO conficts on arm_atsam (#13676)Joel Challis
2021-07-24Disables rgblight twinkle by default. (#13677)Nick Brassel
This takes up about 700 bytes of space, and needs to be swapped to opt-in, rather than opt-out. Build failures in general on AVR due to the scarcity of available flash. People can re-enable it by adding to their keymap's config.h files: ``` #define RGBLIGHT_EFFECT_TWINKLE ```
2021-07-21Retain brightness with lighting layers (#13025)Patrick Stadler
Add guard `RGBLIGHT_LAYERS_RETAIN_VAL` to retain the currently used val when applying lighting layers.
2021-07-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-20Adds Swedish Mac ISO and ANSI keymaps (#13055)Carl-Fredrik Arvidson
* Adds Swedish Mac ISO and ANSI keymaps * Replaces NBSP with space * Adds missing keys * Remove duplicates * Remove duplicates * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Change case and remove whitespace * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Fix uppercase * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Add specific files for Swedish Pro * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Remove whitespace Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_pro_osx_ansi.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/keymap_extras/keymap_swedish_osx_iso.h Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-19Switch Ergodox Infinity over to split_common (#13481)Joakim Tufvegren
2021-07-17Revert "Add rgblight to RGB Matrix VPATH" (#13559)Ryan
2021-07-17Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-17remove `RGBLIGHT_H_DUMMY_DEFINE` macro from rgblight.h (#13569)Takeshi ISHII
2021-07-16Move `SENDSTRING_BELL` code to `send_string.h` (#13566)Ryan
2021-07-16Fix LED Hit Counter for LED/RGB Matrix (#12674)Johannes Choo
2021-07-16Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-16remove `#include "rgblight.h"` when `defined(RGB_MATRIX_ENABLE)` from ↵Takeshi ISHII
quantum.h (#13555)
2021-07-15Dual RGB Matrix IS31FL3737 driver support to address #13442 (#13457)Chris Cullin
* initial commit * removed changes to write_pwm_buffer * backward compatbility added * fixed issue with backward compatibility * documentation update * removed unneccessary comment. branched from master * updated per comments #13457 * removed blank line * cformat on diff files
2021-07-13[Feature] Key Overrides (#11422)Jonas Gessner
2021-07-13Change the prototype of matrix_output_unselect_delay() (#13045)Takeshi ISHII
The prototype of matrix_output_unselect_delay() has been changed as follows. ```c void matrix_output_unselect_delay(uint8_t line, bool key_pressed); ``` Currently, no keyboard seems to be redefining `matrix_output_unselect_delay()`, so there is no change in the system behavior. With this change, the keyboard level code can get some optimization hints, for example, the following. ```c void matrix_output_unselect_delay(uint8_t line, bool key_pressed) { /* If none of the keys are pressed, * there is no need to wait for time for the next line. */ if (key_pressed) { #ifdef MATRIX_IO_DELAY # if MATRIX_IO_DELAY > 0 wait_us(MATRIX_IO_DELAY); # endif #else wait_us(30); #endif } } ```
2021-07-12Fix two out of bounds accesses from #13330. (#13525)Joakim Tufvegren
Two occurrences of `MATRIX_ROWS` weren't properly changed to `ROWS_PER_HAND` in #13330, causing a crash during boot on at least my Ergodox Infinity (including #13481).
2021-07-11Unify matrix for split common and regular matrix (#13330)Drashna Jaelre
2021-07-06`keymap_extras`: Remove deprecated defines (#12949)Ryan
2021-07-05Allow invert of SPLIT_HAND_PIN logic (#13433)Jameson Thatcher
* added support for inverting the hand pin for split keyboards * Added docs about SPLIT_HAND_LOW_IS_LEFT * Update docs/feature_split_keyboard.md bring #define for split hand pin low for left half name in line with grid pin define Co-authored-by: Joel Challis <git@zvecr.com> * Update quantum/split_common/split_util.c update split hand pin low is left name to match split hand grid define Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Joel Challis <git@zvecr.com>
2021-07-03mousekey: expose current report to users (#13069)Thomas Weißschuh
2021-07-03Add support for NO_PIN to all matrix types (#12238)Drashna Jaelre
Co-authored-by: Nick Brassel <nick@tzarc.org>
2021-07-03Improve layer mask handling (#13065)Drashna Jaelre
2021-07-02Switch split_common to CRC subsystem (#13418)Stefan Kerkmann
2021-07-01Convert Dip Switch callbacks to boolean functions (#13399)Drashna Jaelre
2021-07-01Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-01Cleanup junk chars, part 4 (#13345)Ryan
2021-06-30Adds support for STM32L412xB, STM32L422xB. (#13383)Nick Brassel
* Adds support for STM32L412xB, STM32L422xB. * Add to list of supported MCUs. * Disable SPI1 by default.
2021-06-29Relocate RGB/HSV color defs to a more fitting place (#13377)Ryan
2021-06-28Move RGBLight code into its own folder (#13312)Ryan
2021-06-23Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-06-23Fix zero condition of reactive runners that will suspend RGB animation (#12710)Albert Y
* Avoid zero or overflow from user's rgb_matrix_config.speed * Avoid zero tick for reactive splash. * Avoid zero time for animation runner. Co-authored-by: filterpaper <filterpaper@localhost>
2021-06-23Remove rgblight stubs (#13302)Ryan
2021-06-22Move LED/RGB Matrix code into their own directories (#13257)Ryan