summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien <Dbroqua@users.noreply.github.com>2016-08-25 08:58:04 +0200
committerGitHub <noreply@github.com>2016-08-25 08:58:04 +0200
commitc51862b2374baedd50e461de2bbb7d382b053f63 (patch)
treeb23b8dbdcba46206243056d9fad360ad06ee7193
parentc34399c5924c321d037e154bb3d5781dcc5c433a (diff)
parentad206155aa6f87de3fb9f0aefe60685ec12905a8 (diff)
downloadqmk_firmware-c51862b2374baedd50e461de2bbb7d382b053f63.tar.gz
qmk_firmware-c51862b2374baedd50e461de2bbb7d382b053f63.tar.xz
Merge pull request #1 from jackhumbert/master
Merge from jackhumbert
-rw-r--r--quantum/process_keycode/process_unicode.c2
-rw-r--r--quantum/process_keycode/process_unicode.h6
-rw-r--r--readme.md2
3 files changed, 7 insertions, 3 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}
diff --git a/readme.md b/readme.md
index 05c551109..b1808b6d1 100644
--- a/readme.md
+++ b/readme.md
@@ -13,7 +13,7 @@ For an easy-to-read version of this document and the repository, check out [http
* [Planck](/keyboards/planck/)
* [Preonic](/keyboards/preonic/)
* [Atomic](/keyboards/atomic/)
-* [ErgoDox EZ](/keyboards/ergodox/ez/)
+* [ErgoDox EZ](/keyboards/ergodox/)
* [Clueboard](/keyboards/clueboard/)
* [Cluepad](/keyboards/cluepad/)