X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=quantum%2Fprocess_keycode%2Fprocess_combo.h;h=aab2849572808011dc9fbee9589333f6b660c879;hb=c44fc68297029da87233777aff6978d39caebbb1;hp=c475acd33296244ed6fae77f2201723e28e6d5a9;hpb=b6bf4e0dce062a535685c4e772f613252d401ed3;p=qmk_firmware.git

diff --git a/quantum/process_keycode/process_combo.h b/quantum/process_keycode/process_combo.h
index c475acd33..aab284957 100644
--- a/quantum/process_keycode/process_combo.h
+++ b/quantum/process_keycode/process_combo.h
@@ -1,39 +1,66 @@
+/* Copyright 2016 Jack Humbert
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef PROCESS_COMBO_H
 #define PROCESS_COMBO_H
 
-#include <stdint.h>
 #include "progmem.h"
 #include "quantum.h"
+#include <stdint.h>
 
-#ifndef COMBO_TERM
-#define COMBO_TERM TAPPING_TERM
+#ifdef EXTRA_EXTRA_LONG_COMBOS
+#define MAX_COMBO_LENGTH 32
+#elif EXTRA_LONG_COMBOS
+#define MAX_COMBO_LENGTH 16
+#else
+#define MAX_COMBO_LENGTH 8
 #endif
 
-typedef struct
-{
-    const uint16_t *keys;
-    uint16_t action;        
-    uint32_t state;
-#if COMBO_TERM
-    uint16_t timer;
-    uint16_t key;
+typedef struct {
+  const uint16_t *keys;
+  uint16_t keycode;
+#ifdef EXTRA_EXTRA_LONG_COMBOS
+  uint32_t state;
+#elif EXTRA_LONG_COMBOS
+  uint16_t state;
+#else
+  uint8_t state;
 #endif
 } combo_t;
 
+#define COMBO(ck, ca)                                                          \
+  { .keys = &(ck)[0], .keycode = (ca) }
+#define COMBO_ACTION(ck)                                                       \
+  { .keys = &(ck)[0] }
 
-#if COMBO_TERM
-#define COMBO(ck, ca) {.keys = &(ck)[0], .action = (ca), .state = 0, .timer = 0, .key = 0}
-#else
-#define COMBO(ck, ca) {.keys = &(ck)[0], .action = (ca), .state = 0 }
-#endif
 #define COMBO_END 0
 #ifndef COMBO_COUNT
 #define COMBO_COUNT 0
 #endif
-
-extern combo_t key_combos[COMBO_COUNT];
+#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);
+
+void combo_enable(void);
+void combo_disable(void);
+void combo_toggle(void);
+bool is_combo_enabled(void);
 
-#endif
\ No newline at end of file
+#endif