diff options
author | Jack Humbert <[email protected]> | 2017-02-06 19:31:45 -0500 |
---|---|---|
committer | GitHub <[email protected]> | 2017-02-06 19:31:45 -0500 |
commit | 4348fb54d6eb80e8d82c0724be647631bdd524d3 (patch) | |
tree | 7e51344981e0e9daef487c3cbe7b4508735f91bf /quantum/quantum.c | |
parent | b6ffda484971306264c8c95facf75eec4c85b62a (diff) | |
parent | 40abf8bc9ce22cab472f79e3a97c413ac5648986 (diff) | |
download | qmk_firmware-4348fb54d6eb80e8d82c0724be647631bdd524d3.tar.gz qmk_firmware-4348fb54d6eb80e8d82c0724be647631bdd524d3.zip |
Merge pull request #960 from ofples/feature/combos0.5.6
Keyboard combination triggers
Diffstat (limited to 'quantum/quantum.c')
-rw-r--r-- | quantum/quantum.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c index 0aecd238e4..b83ae433e3 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -158,6 +158,9 @@ bool process_record_quantum(keyrecord_t *record) { #ifndef DISABLE_CHORDING process_chording(keycode, record) && #endif + #ifdef COMBO_ENABLE + process_combo(keycode, record) && + #endif #ifdef UNICODE_ENABLE process_unicode(keycode, record) && #endif @@ -536,6 +539,11 @@ void matrix_scan_quantum() { #ifdef TAP_DANCE_ENABLE matrix_scan_tap_dance(); #endif + + #ifdef COMBO_ENABLE + matrix_scan_combo(); + #endif + matrix_scan_kb(); } |