aboutsummaryrefslogtreecommitdiff
path: root/quantum/process_keycode
diff options
context:
space:
mode:
authorRené Werner <mail@renewerner.net>2016-08-25 12:27:29 +0200
committerRené Werner <mail@renewerner.net>2016-08-25 12:27:29 +0200
commit22ef0bbac55215965c7fc6246d20d4591fbf14f4 (patch)
tree6ed3453403f91b273d771c9ce2141408d0f7bad6 /quantum/process_keycode
parent1bbd3c1eea78abf0b36a289fb37f80dfc4f9c8bb (diff)
parentad206155aa6f87de3fb9f0aefe60685ec12905a8 (diff)
downloadqmk_firmware-22ef0bbac55215965c7fc6246d20d4591fbf14f4.tar.gz
qmk_firmware-22ef0bbac55215965c7fc6246d20d4591fbf14f4.zip
Merge remote-tracking branch 'upstream/master' into kitten_paw
Diffstat (limited to 'quantum/process_keycode')
-rw-r--r--quantum/process_keycode/process_unicode.c2
-rw-r--r--quantum/process_keycode/process_unicode.h6
2 files changed, 6 insertions, 2 deletions
diff --git a/quantum/process_keycode/process_unicode.c b/quantum/process_keycode/process_unicode.c
index a1be8d2fc..06c1694f2 100644
--- a/quantum/process_keycode/process_unicode.c
+++ b/quantum/process_keycode/process_unicode.c
@@ -74,6 +74,8 @@ bool process_unicode(uint16_t keycode, keyrecord_t *record) {
74} 74}
75 75
76#ifdef UCIS_ENABLE 76#ifdef UCIS_ENABLE
77qk_ucis_state_t qk_ucis_state;
78
77void qk_ucis_start(void) { 79void qk_ucis_start(void) {
78 qk_ucis_state.count = 0; 80 qk_ucis_state.count = 0;
79 qk_ucis_state.in_progress = true; 81 qk_ucis_state.in_progress = true;
diff --git a/quantum/process_keycode/process_unicode.h b/quantum/process_keycode/process_unicode.h
index 85364e8eb..02ce3dd7e 100644
--- a/quantum/process_keycode/process_unicode.h
+++ b/quantum/process_keycode/process_unicode.h
@@ -29,11 +29,13 @@ typedef struct {
29 char *code; 29 char *code;
30} qk_ucis_symbol_t; 30} qk_ucis_symbol_t;
31 31
32struct { 32typedef struct {
33 uint8_t count; 33 uint8_t count;
34 uint16_t codes[UCIS_MAX_SYMBOL_LENGTH]; 34 uint16_t codes[UCIS_MAX_SYMBOL_LENGTH];
35 bool in_progress:1; 35 bool in_progress:1;
36} qk_ucis_state; 36} qk_ucis_state_t;
37
38extern qk_ucis_state_t qk_ucis_state;
37 39
38#define UCIS_TABLE(...) {__VA_ARGS__, {NULL, NULL}} 40#define UCIS_TABLE(...) {__VA_ARGS__, {NULL, NULL}}
39#define UCIS_SYM(name, code) {name, #code} 41#define UCIS_SYM(name, code) {name, #code}