summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-08-24 17:21:17 +0200
committerGitHub <noreply@github.com>2016-08-24 17:21:17 +0200
commitad206155aa6f87de3fb9f0aefe60685ec12905a8 (patch)
tree0f6a37e08a0221970f4184109a32a173efe657dd
parentd2990645ca82d84b571c1c6c99080ed57ef8771e (diff)
parenta058ae40e268b34ba5db45f5fd5d557d50fa5437 (diff)
downloadqmk_firmware-ad206155aa6f87de3fb9f0aefe60685ec12905a8.tar.gz
qmk_firmware-ad206155aa6f87de3fb9f0aefe60685ec12905a8.tar.xz
Merge pull request #679 from algernon/h/ucis/subproject-fix
quantum: Move qk_ucis_state to process_unicode.c
-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) {
}
#ifdef UCIS_ENABLE
+qk_ucis_state_t qk_ucis_state;
+
void qk_ucis_start(void) {
qk_ucis_state.count = 0;
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 {
char *code;
} qk_ucis_symbol_t;
-struct {
+typedef struct {
uint8_t count;
uint16_t codes[UCIS_MAX_SYMBOL_LENGTH];
bool in_progress:1;
-} qk_ucis_state;
+} qk_ucis_state_t;
+
+extern qk_ucis_state_t qk_ucis_state;
#define UCIS_TABLE(...) {__VA_ARGS__, {NULL, NULL}}
#define UCIS_SYM(name, code) {name, #code}