Merge pull request #960 from ofples/feature/combos

Keyboard combination triggers

1 files changed, 8 insertions, 0 deletions

diff --git a/quantum/quantum.c b/quantum/quantum.c
index 0aecd238e..b83ae433e 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();
 }