]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge pull request #1 from jackhumbert/master
authorDamien <Dbroqua@users.noreply.github.com>
Thu, 25 Aug 2016 06:58:04 +0000 (08:58 +0200)
committerGitHub <noreply@github.com>
Thu, 25 Aug 2016 06:58:04 +0000 (08:58 +0200)
Merge from jackhumbert

quantum/process_keycode/process_unicode.c
quantum/process_keycode/process_unicode.h
readme.md

index a1be8d2fc396b89d0b367781fa19b33d7330b163..06c1694f2e7b1753f714998a6a8ae758df610263 100644 (file)
@@ -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;
index 85364e8eb3bd721a5a017a02ed1a9cb0396b24f3..02ce3dd7e05c4dadef3443536872419c5fc4f214 100644 (file)
@@ -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}
index 05c55110904517b15178b72f4684326b43bf3bb2..b1808b6d13a9f851ff35617c0c0f5c2b2d5153fe 100644 (file)
--- 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/)