summaryrefslogtreecommitdiff
path: root/quantum/process_keycode/process_combo.h
diff options
context:
space:
mode:
authorOfer Plesser2016-12-16 21:50:28 +0200
committerOfer Plesser2016-12-16 21:50:28 +0200
commit6e7cfa83b9424061914793b02757fa4ec75b356b (patch)
tree8ddb3fd03ce5666ad75ebfd5c4abce7d3b737d86 /quantum/process_keycode/process_combo.h
parentb6bf4e0dce062a535685c4e772f613252d401ed3 (diff)
Refactored as well as added support for action keys in combos
Diffstat (limited to 'quantum/process_keycode/process_combo.h')
-rw-r--r--quantum/process_keycode/process_combo.h34
1 files changed, 19 insertions, 15 deletions
diff --git a/quantum/process_keycode/process_combo.h b/quantum/process_keycode/process_combo.h
index c475acd33..847f2b737 100644
--- a/quantum/process_keycode/process_combo.h
+++ b/quantum/process_keycode/process_combo.h
@@ -5,35 +5,39 @@
#include "progmem.h"
#include "quantum.h"
-#ifndef COMBO_TERM
-#define COMBO_TERM TAPPING_TERM
-#endif
-
typedef struct
{
const uint16_t *keys;
- uint16_t action;
+ uint16_t keycode;
+#ifdef EXTRA_EXTRA_LONG_COMBOS
uint32_t state;
-#if COMBO_TERM
+#elif EXTRA_LONG_COMBOS
+ uint16_t state;
+#else
+ uint8_t state;
+#endif
uint16_t timer;
- uint16_t key;
+#ifdef COMBO_ALLOW_ACTION_KEYS
+ keyrecord_t prev_record;
+#else
+ uint16_t prev_key;
#endif
} combo_t;
-#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(ck, ca) {.keys = &(ck)[0], .keycode = (ca)}
+#define COMBO_ACTION(ck) {.keys = &(ck)[0]}
+
#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);
-#endif \ No newline at end of file
+#endif