Merge pull request #1069 from hot-leaf-juice/master

[qmk_firmware.git] / quantum / process_keycode / process_combo.h

diff --git a/quantum/process_keycode/process_combo.h b/quantum/process_keycode/process_combo.h
index 68786c0f198d3afcd349b03f982dd746207b10c7..847f2b7376c190cb95dc6e02871a35c8133bbf23 100644 (file)
--- a/quantum/process_keycode/process_combo.h
+++ b/quantum/process_keycode/process_combo.h
@@ -5,21 +5,39 @@
 #include "progmem.h"
 #include "quantum.h"
 
-
 typedef struct
 {
     const uint16_t *keys;
-    uint16_t action;        
+    uint16_t keycode;        
+#ifdef EXTRA_EXTRA_LONG_COMBOS
     uint32_t state;
+#elif EXTRA_LONG_COMBOS
+    uint16_t state;
+#else
+    uint8_t state;
+#endif
+    uint16_t timer;
+#ifdef COMBO_ALLOW_ACTION_KEYS
+    keyrecord_t prev_record;
+#else
+    uint16_t prev_key;
+#endif
 } combo_t;
 
 
-#define COMBO_END 0
-#define NUM_ELEMS(a) (sizeof(a)/sizeof 0[a])
-
+#define COMBO(ck, ca)       {.keys = &(ck)[0], .keycode = (ca)}
+#define COMBO_ACTION(ck)    {.keys = &(ck)[0]}
 
-extern combo_t key_combos[1];
+#define COMBO_END 0
+#ifndef COMBO_COUNT
+#define COMBO_COUNT 0
+#endif
+#ifndef COMBO_TERM
+#define COMBO_TERM TAPPING_TERM
+#endif
 
 bool process_combo(uint16_t keycode, keyrecord_t *record);
+void matrix_scan_combo(void);
+void process_combo_event(uint8_t combo_index, bool pressed);
 
-#endif
\ No newline at end of file
+#endif