From 09a977f582540559141195415675b67aa6e409f3 Mon Sep 17 00:00:00 2001 From: Matt Skalecki Date: Fri, 23 Feb 2024 19:36:01 -0500 Subject: [PATCH] Fix symbols and wordbreaks --- .../moonlander/keymaps/ikcelaks/config.h | 2 - .../ikcelaks/magic_sturdy/context_magic.c | 38 ++- .../keymaps/ikcelaks/magickey_config.json | 2 +- .../keymaps/ikcelaks/magickey_data.h | 247 +++++++++++------- .../keymaps/ikcelaks/magickey_dict.txt | 89 +++++-- .../moonlander/keymaps/ikcelaks/rules.mk | 2 +- 6 files changed, 250 insertions(+), 130 deletions(-) diff --git a/keyboards/moonlander/keymaps/ikcelaks/config.h b/keyboards/moonlander/keymaps/ikcelaks/config.h index 28ea1bdd..814bbccf 100644 --- a/keyboards/moonlander/keymaps/ikcelaks/config.h +++ b/keyboards/moonlander/keymaps/ikcelaks/config.h @@ -23,5 +23,3 @@ // User Added #define COMBO_COUNT 10 #define TAPPING_TOGGLE 2 -#define USER_PRINT -#define DEBUG diff --git a/keyboards/moonlander/keymaps/ikcelaks/magic_sturdy/context_magic.c b/keyboards/moonlander/keymaps/ikcelaks/magic_sturdy/context_magic.c index bcc22e8e..d5ab8dcf 100644 --- a/keyboards/moonlander/keymaps/ikcelaks/magic_sturdy/context_magic.c +++ b/keyboards/moonlander/keymaps/ikcelaks/magic_sturdy/context_magic.c @@ -77,9 +77,15 @@ bool process_check(uint16_t *keycode, keyrecord_t *record, uint8_t *mods) case QK_ONE_SHOT_MOD ... QK_ONE_SHOT_MOD_MAX: return false; - // Mask for base keycode from shifted keys. - case QK_LSFT ... QK_LSFT + 255: - case QK_RSFT ... QK_RSFT + 255: + // bake shift mod into keycode symbols + case KC_1 ... KC_SLASH: + if (*mods & MOD_MASK_SHIFT) { + *keycode |= QK_LSFT; + } + return true; + // Clear shift for alphas + case LSFT(KC_A) ... LSFT(KC_Z): + case RSFT(KC_A) ... RSFT(KC_Z): if (*keycode >= QK_LSFT && *keycode <= (QK_LSFT + 255)) { *mods |= MOD_LSFT; } else { @@ -109,6 +115,9 @@ bool process_check(uint16_t *keycode, keyrecord_t *record, uint8_t *mods) return false; } *keycode = QK_MOD_TAP_GET_TAP_KEYCODE(*keycode); + if (*mods & MOD_MASK_SHIFT) { + *keycode |= QK_LSFT; + } break; #else case QK_MOD_TAP ... QK_MOD_TAP_MAX: @@ -290,9 +299,13 @@ void handle_result(trie_t *trie, trie_search_result_t *res) // Send backspaces multi_tap(KC_BSPC, res->num_backspaces); // Send completion string + bool ends_with_wordbreak = false; for (int i = res->completion_offset; i < trie->completions_size; ++i) { char ascii_code = CDATA(i); if (!ascii_code) { + if (i > 0 && CDATA(i-1) == KC_SPC) { + ends_with_wordbreak = true; + } break; } tap_code16(char_to_keycode(ascii_code)); @@ -301,10 +314,16 @@ void handle_result(trie_t *trie, trie_search_result_t *res) switch (res->func_code) { case 1: // repeat handle_repeat_key(); - return; + break; case 2: // set one-shot shift set_oneshot_mods(MOD_LSFT); - return; + break; + case 3: // disable auto-wordbreak + ends_with_wordbreak = false; + } + + if (ends_with_wordbreak) { + enqueue_keycode(KC_SPC); } } @@ -363,16 +382,13 @@ bool process_context_magic(uint16_t keycode, keyrecord_t *record) keycode = 0x0100 + keycode - US_MAG1; break; case KC_A ... KC_0: - // process normally - break; + case S(KC_1) ... S(KC_0): case KC_MINUS ...KC_SLASH: - // treat " (shifted ') as a word boundary - if (keycode == KC_QUOTE && (mods & MOD_MASK_SHIFT) != 0) - keycode = KC_SPC; + // process normally break; case S(KC_MINUS) ...S(KC_SLASH): // treat " (shifted ') as a word boundary - if (S(KC_QUOTE)) + if (keycode == S(KC_QUOTE)) keycode = KC_SPC; break; case KC_BSPC: diff --git a/keyboards/moonlander/keymaps/ikcelaks/magickey_config.json b/keyboards/moonlander/keymaps/ikcelaks/magickey_config.json index 2e66dd03..fa4fd617 100644 --- a/keyboards/moonlander/keymaps/ikcelaks/magickey_config.json +++ b/keyboards/moonlander/keymaps/ikcelaks/magickey_config.json @@ -1,7 +1,7 @@ { "rules_file_name": "./magickey_dict.txt", "magic_chars": "πŸ‘†πŸ‘β˜…βœͺ", - "wordbreak_char": ":", + "wordbreak_char": "⎡", "output_func_chars": "↻⇑", "comment_char": "#", "separator": "β‡’" diff --git a/keyboards/moonlander/keymaps/ikcelaks/magickey_data.h b/keyboards/moonlander/keymaps/ikcelaks/magickey_data.h index 61a75312..47259be2 100644 --- a/keyboards/moonlander/keymaps/ikcelaks/magickey_data.h +++ b/keyboards/moonlander/keymaps/ikcelaks/magickey_data.h @@ -26,103 +26,168 @@ #pragma once // Autocorrection dictionary with longest match semantics: -// Autocorrection dictionary (59 entries): -// πŸ‘ -> ↻ -// jπŸ‘† -> just -// jπŸ‘†πŸ‘† -> justment -// πŸ‘†πŸ‘† -> πŸ‘†n -// jπŸ‘ -> join -// judπŸ‘† -> judge -// judπŸ‘†πŸ‘† -> judgment -// dβ˜… -> develop -// dβ˜…t -> development -// dβ˜…r -> developer -// dβ˜…d -> developed -// :iπŸ‘ -> I -// :iπŸ‘m -> I'm -// :iπŸ‘d -> I'd -// :iπŸ‘l -> I'll -// :πŸ‘† -> the -// vπŸ‘† -> ver -// sπŸ‘† -> sk -// xπŸ‘† -> es -// mπŸ‘† -> ment -// tπŸ‘† -> tment -// kπŸ‘† -> ks -// lπŸ‘† -> lk -// rπŸ‘† -> rl -// cπŸ‘† -> cy -// pπŸ‘† -> py -// dπŸ‘† -> dy -// yπŸ‘† -> yp -// gπŸ‘† -> gy -// wπŸ‘† -> which -// qπŸ‘† -> question -// bπŸ‘† -> before -// fπŸ‘† -> first -// zπŸ‘† -> zone -// nπŸ‘† -> nion -// hπŸ‘† -> however -// uπŸ‘† -> eu -// eπŸ‘† -> ue -// oπŸ‘† -> oa -// aπŸ‘† -> abo -// ,πŸ‘† -> ,:but -// iπŸ‘† -> ion -// .πŸ‘† -> .\ [escape] -// :πŸ‘ -> for -// aπŸ‘ -> and -// xπŸ‘ -> xer -// kπŸ‘ -> know -// iπŸ‘ -> ing -// yπŸ‘ -> you -// qπŸ‘ -> quick -// wπŸ‘ -> would -// cπŸ‘ -> ck -// nπŸ‘ -> nf -// hπŸ‘ -> hn -// ,πŸ‘ -> ,:and -// .πŸ‘ -> .:⇑ -// ?πŸ‘ -> ?:⇑ -// ;πŸ‘ -> ;:⇑ -// !πŸ‘ -> !:⇑ +// Autocorrection dictionary (98 entries): +// πŸ‘ -> ↻ +// dβ˜… -> develop +// dβ˜…t -> development +// dβ˜…r -> developer +// dβ˜…d -> developed +// ⎡iπŸ‘ -> I +// ⎡iπŸ‘m -> I'm +// ⎡iπŸ‘d -> I'd +// ⎡iπŸ‘l -> I'll +// ⎡cπŸ‘ -> come +// ⎡sπŸ‘ -> some +// ⎡cπŸ‘u -> could +// ⎡wπŸ‘u -> would +// ⎡sπŸ‘u -> should +// ⎡cπŸ‘ut -> couldn't +// ⎡wπŸ‘ut -> wouldn't +// ⎡sπŸ‘ut -> shouldn't +// ⎡cπŸ‘uv -> could've +// ⎡wπŸ‘uv -> would've +// ⎡sπŸ‘uv -> should've +// βŽ΅πŸ‘† -> the +// βŽ΅πŸ‘†r -> there +// βŽ΅πŸ‘†rs -> there's +// βŽ΅πŸ‘†i -> their +// βŽ΅πŸ‘†yr -> they're +// βŽ΅πŸ‘†yl -> they'll +// βŽ΅πŸ‘†d -> they'd +// βŽ΅πŸ‘†s -> these +// βŽ΅πŸ‘†t -> that +// βŽ΅πŸ‘†a -> than +// βŽ΅πŸ‘†o -> those +// ⎡tπŸ‘ -> time +// ⎡tπŸ‘g -> though +// ⎡tπŸ‘t -> thought +// ⎡tπŸ‘r -> through +// ⎡tπŸ‘c -> technology +// ⎡tπŸ‘a -> take +// ⎡wπŸ‘ -> why +// ⎡wπŸ‘n -> when +// ⎡wπŸ‘e -> where +// ⎡wπŸ‘t -> what +// ⎡wπŸ‘r -> we're +// ⎡wπŸ‘d -> we'd +// ⎡wπŸ‘l -> we'll +// ⎡wπŸ‘v -> we've +// aπŸ‘† -> abo +// aπŸ‘†πŸ‘ -> about +// aπŸ‘†πŸ‘† -> above +// vπŸ‘† -> ver +// sπŸ‘† -> sk +// xπŸ‘† -> es +// mπŸ‘† -> ment +// tπŸ‘† -> tment +// kπŸ‘† -> ks +// lπŸ‘† -> lk +// rπŸ‘† -> rl +// jπŸ‘† -> just +// jπŸ‘†πŸ‘† -> justment +// ⎡jπŸ‘ -> join +// ⎡jπŸ‘d -> judge +// ⎡jπŸ‘dt -> judgment +// ⎡jπŸ‘dta -> judgmental +// cπŸ‘† -> cy +// pπŸ‘† -> py +// dπŸ‘† -> dy +// yπŸ‘† -> yp +// gπŸ‘† -> gy +// wπŸ‘† -> which +// qπŸ‘† -> question +// bπŸ‘† -> before +// fπŸ‘† -> first +// zπŸ‘† -> zone +// πŸ‘†πŸ‘† -> πŸ‘†n +// nπŸ‘† -> nion +// hπŸ‘† -> however +// uπŸ‘† -> ue +// eπŸ‘† -> eu +// oπŸ‘† -> oa +// ,πŸ‘† -> ,⎡but +// iπŸ‘† -> ion +// .πŸ‘† -> .\ [escape] +// βŽ΅πŸ‘ -> for +// aπŸ‘ -> and +// xπŸ‘ -> xer +// kπŸ‘ -> know +// iπŸ‘ -> ing +// yπŸ‘ -> you +// qπŸ‘ -> quick +// jπŸ‘ -> join +// cπŸ‘ -> ck +// nπŸ‘ -> nf +// hπŸ‘ -> hn +// ,πŸ‘ -> ,⎡and +// .πŸ‘ -> .βŽ΅β‡‘ +// ?πŸ‘ -> ?βŽ΅β‡‘ +// :πŸ‘ -> :βŽ΅β‡‘ +// ;πŸ‘ -> ;βŽ΅β‡‘ +// !πŸ‘ -> !βŽ΅β‡‘ #define MAGICKEY_MIN_LENGTH 1 // "πŸ‘" -#define MAGICKEY_MAX_LENGTH 5 // "judπŸ‘†πŸ‘†" -#define DICTIONARY_SIZE 270 -#define COMPLETIONS_SIZE 161 +#define MAGICKEY_MAX_LENGTH 6 // "⎡jπŸ‘dta" +#define DICTIONARY_SIZE 558 +#define COMPLETIONS_SIZE 295 #define MAGICKEY_COUNT 4 static const uint16_t magickey_data[DICTIONARY_SIZE] PROGMEM = { - 0x4007, 0x0011, 0x000F, 0x001F, 0x0010, 0x0025, 0x0015, 0x002B, 0x0017, 0x0030, 0x0102, 0x0035, 0x0100, 0x0039, 0x0101, 0x00C3, - 0x0000, 0x4102, 0x0016, 0x0101, 0x001A, 0x0000, 0x0007, 0x0000, 0x8000, 0x0000, 0x000C, 0x002C, 0x0000, 0x8000, 0x0003, 0x0101, - 0x000C, 0x002C, 0x0000, 0x8000, 0x0006, 0x0101, 0x000C, 0x002C, 0x0000, 0x8000, 0x000A, 0x0102, 0x0007, 0x0000, 0x8000, 0x000D, - 0x0102, 0x0007, 0x0000, 0x8000, 0x0010, 0x0007, 0x0000, 0x8000, 0x0015, 0x4036, 0x0076, 0x0037, 0x0078, 0x002C, 0x007A, 0x0004, - 0x007C, 0x0005, 0x007E, 0x0006, 0x0080, 0x0007, 0x0082, 0x0008, 0x0089, 0x0009, 0x008B, 0x000A, 0x008D, 0x000B, 0x008F, 0x000C, - 0x0091, 0x000D, 0x0093, 0x000E, 0x0095, 0x000F, 0x0097, 0x0010, 0x0099, 0x0011, 0x009B, 0x0012, 0x009D, 0x0013, 0x009F, 0x0014, - 0x00A1, 0x0015, 0x00A3, 0x0016, 0x00A5, 0x0017, 0x00A7, 0x0018, 0x00A9, 0x0019, 0x00AB, 0x001A, 0x00AD, 0x001B, 0x00AF, 0x001C, - 0x00B1, 0x001D, 0x00B3, 0x0100, 0x00B5, 0x0000, 0x8000, 0x001C, 0x8000, 0x0021, 0x8000, 0x0023, 0x8000, 0x0027, 0x8000, 0x002A, - 0x8000, 0x0030, 0xC000, 0x0030, 0x0018, 0x000D, 0x0000, 0x8000, 0x0032, 0x8001, 0x0035, 0x8000, 0x0038, 0x8000, 0x0030, 0x8000, - 0x003D, 0x8000, 0x0044, 0x8000, 0x0047, 0x8000, 0x004B, 0x8000, 0x004D, 0x8000, 0x004F, 0x8000, 0x0053, 0x8000, 0x0057, 0x8000, - 0x0030, 0x8000, 0x0059, 0x8000, 0x0061, 0x8000, 0x004D, 0x8000, 0x0010, 0x8001, 0x0063, 0x8000, 0x000D, 0x8000, 0x0066, 0x8001, - 0x006B, 0x8000, 0x006E, 0x8000, 0x0070, 0xC000, 0x0074, 0x4007, 0x00BC, 0x000D, 0x00C1, 0x0000, 0x0018, 0x000D, 0x0000, 0x8001, - 0x0010, 0x8000, 0x0010, 0xC800, 0x0076, 0x421E, 0x00E8, 0x0036, 0x00EA, 0x0037, 0x00EC, 0x002C, 0x00EE, 0x0033, 0x00F0, 0x0238, - 0x00F2, 0x0004, 0x00F4, 0x0006, 0x00F6, 0x000B, 0x00F8, 0x000C, 0x00FA, 0x000D, 0x0100, 0x000E, 0x0102, 0x0011, 0x0104, 0x0014, - 0x0106, 0x001A, 0x0108, 0x001B, 0x010A, 0x001C, 0x010C, 0x0000, 0x9000, 0x0077, 0x8000, 0x0079, 0x9000, 0x0077, 0x8000, 0x007E, - 0x9000, 0x0077, 0x9000, 0x0077, 0x8000, 0x0082, 0x8000, 0x004D, 0x8000, 0x0074, 0xC000, 0x0085, 0x002C, 0x0000, 0x8001, 0x0088, - 0x8000, 0x008A, 0x8000, 0x008E, 0x8000, 0x0092, 0x8000, 0x0094, 0x8000, 0x0099, 0x8000, 0x000D, 0x8000, 0x009E + 0x4004, 0x0025, 0x0006, 0x003C, 0x0007, 0x0042, 0x0008, 0x0064, 0x000A, 0x006A, 0x000C, 0x0070, 0x000F, 0x0075, 0x0010, 0x008C, + 0x0011, 0x0092, 0x0012, 0x0098, 0x0015, 0x009D, 0x0016, 0x00C0, 0x0017, 0x00CE, 0x0018, 0x0109, 0x0019, 0x011E, 0x0102, 0x013D, + 0x0100, 0x0141, 0x0101, 0x01C3, 0x0000, 0x4017, 0x002C, 0x0100, 0x0033, 0x0101, 0x0037, 0x0000, 0x0007, 0x0101, 0x000D, 0x002C, + 0x0000, 0x8000, 0x0000, 0x002C, 0x0000, 0x8001, 0x0003, 0x0017, 0x002C, 0x0000, 0x8003, 0x0006, 0x0101, 0x0017, 0x002C, 0x0000, + 0x8003, 0x000A, 0x4102, 0x0049, 0x0100, 0x004D, 0x0101, 0x0051, 0x0000, 0x0007, 0x0000, 0x8000, 0x0014, 0x002C, 0x0000, 0x8000, + 0x0017, 0x400C, 0x0058, 0x000D, 0x005C, 0x001A, 0x0060, 0x0000, 0x002C, 0x0000, 0x8000, 0x001B, 0x002C, 0x0000, 0x8003, 0x001E, + 0x002C, 0x0000, 0x8002, 0x0023, 0x0101, 0x001A, 0x002C, 0x0000, 0x8001, 0x0027, 0x0101, 0x0017, 0x002C, 0x0000, 0x8003, 0x002B, + 0x0100, 0x002C, 0x0000, 0x8000, 0x0031, 0x401C, 0x007A, 0x0101, 0x007F, 0x0000, 0x0100, 0x002C, 0x0000, 0x8003, 0x0034, 0x400C, + 0x0084, 0x001A, 0x0088, 0x0000, 0x002C, 0x0000, 0x8000, 0x0039, 0x002C, 0x0000, 0x8002, 0x003D, 0x0101, 0x000C, 0x002C, 0x0000, + 0x8000, 0x0042, 0x0101, 0x001A, 0x002C, 0x0000, 0x8001, 0x0045, 0x0100, 0x002C, 0x0000, 0x8001, 0x0048, 0x401C, 0x00A6, 0x0102, + 0x00AB, 0x0100, 0x00AF, 0x0101, 0x00B3, 0x0000, 0x0100, 0x002C, 0x0000, 0x8003, 0x004C, 0x0007, 0x0000, 0x8000, 0x0051, 0x002C, + 0x0000, 0x8000, 0x0054, 0x4017, 0x00B8, 0x001A, 0x00BC, 0x0000, 0x002C, 0x0000, 0x8003, 0x0057, 0x002C, 0x0000, 0x8002, 0x005E, + 0x4015, 0x00C5, 0x0100, 0x00CA, 0x0000, 0x0100, 0x002C, 0x0000, 0x8000, 0x0063, 0x002C, 0x0000, 0x8000, 0x0066, 0x4007, 0x00D9, + 0x0018, 0x00DF, 0x0102, 0x00F4, 0x0100, 0x00F8, 0x0101, 0x00FC, 0x0000, 0x0101, 0x000D, 0x002C, 0x0000, 0x8001, 0x0069, 0x0101, + 0x0000, 0x4006, 0x00E8, 0x0016, 0x00EC, 0x001A, 0x00F0, 0x0000, 0x002C, 0x0000, 0x8000, 0x006E, 0x002C, 0x0000, 0x8000, 0x006E, + 0x002C, 0x0000, 0x8000, 0x006E, 0x0007, 0x0000, 0x8000, 0x0069, 0x002C, 0x0000, 0x8001, 0x0072, 0x4017, 0x0101, 0x001A, 0x0105, + 0x0000, 0x002C, 0x0000, 0x8003, 0x0075, 0x002C, 0x0000, 0x8001, 0x0072, 0x0101, 0x0000, 0x4006, 0x0112, 0x0016, 0x0116, 0x001A, + 0x011A, 0x0000, 0x002C, 0x0000, 0x8002, 0x007C, 0x002C, 0x0000, 0x8003, 0x0080, 0x002C, 0x0000, 0x8002, 0x0086, 0x4018, 0x0123, + 0x0101, 0x0138, 0x0000, 0x0101, 0x0000, 0x4006, 0x012C, 0x0016, 0x0130, 0x001A, 0x0134, 0x0000, 0x002C, 0x0000, 0x8000, 0x008B, + 0x002C, 0x0000, 0x8000, 0x008B, 0x002C, 0x0000, 0x8000, 0x008B, 0x001A, 0x002C, 0x0000, 0x8002, 0x008F, 0x0007, 0x0000, 0x8000, + 0x0094, 0x4036, 0x017E, 0x0037, 0x0180, 0x0004, 0x0182, 0x0005, 0x0184, 0x0006, 0x0186, 0x0007, 0x0188, 0x0008, 0x018A, 0x0009, + 0x018C, 0x000A, 0x018E, 0x000B, 0x0190, 0x000C, 0x0192, 0x000D, 0x0194, 0x000E, 0x0196, 0x000F, 0x0198, 0x0010, 0x019A, 0x0011, + 0x019C, 0x0012, 0x019E, 0x0013, 0x01A0, 0x0014, 0x01A2, 0x0015, 0x01A4, 0x0016, 0x01A6, 0x0017, 0x01A8, 0x0018, 0x01AA, 0x0019, + 0x01AC, 0x001A, 0x01AE, 0x001B, 0x01B0, 0x001C, 0x01B2, 0x001D, 0x01B4, 0x002C, 0x01B6, 0x0100, 0x01B8, 0x0000, 0x8000, 0x009B, + 0x8000, 0x00A0, 0x8000, 0x00A2, 0x8000, 0x00A5, 0x8000, 0x00AB, 0x8000, 0x00AB, 0x8000, 0x00AD, 0x8000, 0x00AF, 0x8000, 0x00AB, + 0x8000, 0x00B4, 0x8000, 0x00BB, 0x8000, 0x00BE, 0x8000, 0x00C2, 0x8000, 0x00C4, 0x8000, 0x00C6, 0x8000, 0x00CA, 0x8000, 0x00CE, + 0x8000, 0x00AB, 0x8000, 0x00D0, 0x8000, 0x00D8, 0x8000, 0x00C4, 0x8000, 0x0069, 0x8000, 0x00DA, 0x8000, 0x0051, 0x8000, 0x00DC, + 0x8001, 0x00E1, 0x8000, 0x00E4, 0x8000, 0x00E6, 0x8000, 0x00EA, 0xC000, 0x00EE, 0x4004, 0x01BF, 0x000D, 0x01C1, 0x0000, 0x8000, + 0x00F0, 0x8000, 0x0069, 0xC800, 0x00F3, 0x421E, 0x01F0, 0x0036, 0x01F2, 0x0037, 0x01F4, 0x0233, 0x01F6, 0x0033, 0x01F8, 0x0238, + 0x01FA, 0x0004, 0x01FC, 0x0006, 0x01FE, 0x000B, 0x0204, 0x000C, 0x0206, 0x000D, 0x020C, 0x000E, 0x0212, 0x0011, 0x0214, 0x0014, + 0x0216, 0x0016, 0x0218, 0x0017, 0x021C, 0x001A, 0x0220, 0x001B, 0x0224, 0x001C, 0x0226, 0x002C, 0x0228, 0x0100, 0x022A, 0x0000, + 0x9000, 0x00F4, 0x8000, 0x00F6, 0x9000, 0x00F4, 0x9000, 0x00F4, 0x9000, 0x00F4, 0x9000, 0x00F4, 0x8000, 0x00FB, 0xC000, 0x00C4, + 0x002C, 0x0000, 0x8000, 0x00FE, 0x8000, 0x00EE, 0xC000, 0x0102, 0x002C, 0x0000, 0x8001, 0x0105, 0xC000, 0x0107, 0x002C, 0x0000, + 0x8000, 0x0107, 0x8000, 0x010B, 0x8000, 0x010F, 0x8000, 0x0111, 0x002C, 0x0000, 0x8000, 0x00FE, 0x002C, 0x0000, 0x8000, 0x0116, + 0x002C, 0x0000, 0x8000, 0x011A, 0x8000, 0x0051, 0x8000, 0x011D, 0x8000, 0x0120, 0x0004, 0x0000, 0x8000, 0x0124 }; static const uint8_t magickey_completions_data[COMPLETIONS_SIZE] PROGMEM = { - 0x65, 0x64, 0x00, 0x27, 0x64, 0x00, 0x27, 0x6C, 0x6C, 0x00, 0x27, 0x6D, 0x00, 0x65, 0x72, 0x00, - 0x6D, 0x65, 0x6E, 0x74, 0x00, 0x65, 0x76, 0x65, 0x6C, 0x6F, 0x70, 0x00, 0x20, 0x62, 0x75, 0x74, - 0x00, 0x5C, 0x00, 0x74, 0x68, 0x65, 0x00, 0x62, 0x6F, 0x00, 0x65, 0x66, 0x6F, 0x72, 0x65, 0x00, - 0x79, 0x00, 0x67, 0x65, 0x00, 0x75, 0x65, 0x00, 0x69, 0x72, 0x73, 0x74, 0x00, 0x6F, 0x77, 0x65, - 0x76, 0x65, 0x72, 0x00, 0x6F, 0x6E, 0x00, 0x75, 0x73, 0x74, 0x00, 0x73, 0x00, 0x6B, 0x00, 0x65, - 0x6E, 0x74, 0x00, 0x69, 0x6F, 0x6E, 0x00, 0x61, 0x00, 0x75, 0x65, 0x73, 0x74, 0x69, 0x6F, 0x6E, - 0x00, 0x6C, 0x00, 0x65, 0x75, 0x00, 0x68, 0x69, 0x63, 0x68, 0x00, 0x65, 0x73, 0x00, 0x70, 0x00, - 0x6F, 0x6E, 0x65, 0x00, 0x6E, 0x00, 0x00, 0x20, 0x00, 0x20, 0x61, 0x6E, 0x64, 0x00, 0x66, 0x6F, - 0x72, 0x00, 0x6E, 0x64, 0x00, 0x6E, 0x67, 0x00, 0x49, 0x00, 0x6F, 0x69, 0x6E, 0x00, 0x6E, 0x6F, - 0x77, 0x00, 0x66, 0x00, 0x75, 0x69, 0x63, 0x6B, 0x00, 0x6F, 0x75, 0x6C, 0x64, 0x00, 0x6F, 0x75, - 0x00 + 0x61, 0x6C, 0x00, 0x61, 0x6E, 0x00, 0x61, 0x6B, 0x65, 0x00, 0x65, 0x63, 0x68, 0x6E, 0x6F, 0x6C, + 0x6F, 0x67, 0x79, 0x00, 0x65, 0x64, 0x00, 0x79, 0x27, 0x64, 0x00, 0x27, 0x64, 0x00, 0x75, 0x64, + 0x67, 0x65, 0x00, 0x65, 0x27, 0x64, 0x00, 0x65, 0x72, 0x65, 0x00, 0x68, 0x6F, 0x75, 0x67, 0x68, + 0x00, 0x69, 0x72, 0x00, 0x79, 0x27, 0x6C, 0x6C, 0x00, 0x27, 0x6C, 0x6C, 0x00, 0x65, 0x27, 0x6C, + 0x6C, 0x00, 0x27, 0x6D, 0x00, 0x65, 0x6E, 0x00, 0x6F, 0x73, 0x65, 0x00, 0x79, 0x27, 0x72, 0x65, + 0x00, 0x65, 0x72, 0x00, 0x72, 0x65, 0x00, 0x68, 0x72, 0x6F, 0x75, 0x67, 0x68, 0x00, 0x65, 0x27, + 0x72, 0x65, 0x00, 0x27, 0x73, 0x00, 0x73, 0x65, 0x00, 0x6D, 0x65, 0x6E, 0x74, 0x00, 0x6E, 0x27, + 0x74, 0x00, 0x61, 0x74, 0x00, 0x68, 0x6F, 0x75, 0x67, 0x68, 0x74, 0x00, 0x75, 0x6C, 0x64, 0x00, + 0x68, 0x6F, 0x75, 0x6C, 0x64, 0x00, 0x6F, 0x75, 0x6C, 0x64, 0x00, 0x27, 0x76, 0x65, 0x00, 0x65, + 0x27, 0x76, 0x65, 0x00, 0x65, 0x76, 0x65, 0x6C, 0x6F, 0x70, 0x00, 0x20, 0x62, 0x75, 0x74, 0x00, + 0x5C, 0x00, 0x62, 0x6F, 0x00, 0x65, 0x66, 0x6F, 0x72, 0x65, 0x00, 0x79, 0x00, 0x75, 0x00, 0x69, + 0x72, 0x73, 0x74, 0x00, 0x6F, 0x77, 0x65, 0x76, 0x65, 0x72, 0x00, 0x6F, 0x6E, 0x00, 0x75, 0x73, + 0x74, 0x00, 0x73, 0x00, 0x6B, 0x00, 0x65, 0x6E, 0x74, 0x00, 0x69, 0x6F, 0x6E, 0x00, 0x61, 0x00, + 0x75, 0x65, 0x73, 0x74, 0x69, 0x6F, 0x6E, 0x00, 0x6C, 0x00, 0x65, 0x00, 0x68, 0x69, 0x63, 0x68, + 0x00, 0x65, 0x73, 0x00, 0x70, 0x00, 0x6F, 0x6E, 0x65, 0x00, 0x74, 0x68, 0x65, 0x00, 0x6E, 0x00, + 0x76, 0x65, 0x00, 0x00, 0x20, 0x00, 0x20, 0x61, 0x6E, 0x64, 0x00, 0x6E, 0x64, 0x00, 0x6F, 0x6D, + 0x65, 0x00, 0x6E, 0x67, 0x00, 0x49, 0x00, 0x6F, 0x69, 0x6E, 0x00, 0x6E, 0x6F, 0x77, 0x00, 0x66, + 0x00, 0x75, 0x69, 0x63, 0x6B, 0x00, 0x69, 0x6D, 0x65, 0x00, 0x68, 0x79, 0x00, 0x6F, 0x75, 0x00, + 0x66, 0x6F, 0x72, 0x00, 0x75, 0x74, 0x00 }; diff --git a/keyboards/moonlander/keymaps/ikcelaks/magickey_dict.txt b/keyboards/moonlander/keymaps/ikcelaks/magickey_dict.txt index c38a4a9f..30926bbf 100644 --- a/keyboards/moonlander/keymaps/ikcelaks/magickey_dict.txt +++ b/keyboards/moonlander/keymaps/ikcelaks/magickey_dict.txt @@ -3,25 +3,62 @@ πŸ‘ β‡’ ↻ -jπŸ‘† β‡’ just -jπŸ‘†πŸ‘† β‡’ justment -πŸ‘†πŸ‘† β‡’ πŸ‘†n -jπŸ‘ β‡’ join -judπŸ‘† β‡’ judge -judπŸ‘†πŸ‘† β‡’ judgment dβ˜… β‡’ develop dβ˜…t β‡’ development dβ˜…r β‡’ developer dβ˜…d β‡’ developed -:iπŸ‘ β‡’ I -:iπŸ‘m β‡’ I'm -:iπŸ‘d β‡’ I'd -:iπŸ‘l β‡’ I'll +⎡iπŸ‘ β‡’ I +⎡iπŸ‘m β‡’ I'm +⎡iπŸ‘d β‡’ I'd +⎡iπŸ‘l β‡’ I'll -# final -:πŸ‘† β‡’ the +⎡cπŸ‘ β‡’ come +⎡sπŸ‘ β‡’ some + +⎡cπŸ‘u β‡’ could +⎡wπŸ‘u β‡’ would +⎡sπŸ‘u β‡’ should +⎡cπŸ‘ut β‡’ couldn't +⎡wπŸ‘ut β‡’ wouldn't +⎡sπŸ‘ut β‡’ shouldn't +⎡cπŸ‘uv β‡’ could've +⎡wπŸ‘uv β‡’ would've +⎡sπŸ‘uv β‡’ should've + + +βŽ΅πŸ‘† β‡’ the +βŽ΅πŸ‘†r β‡’ there +βŽ΅πŸ‘†rs β‡’ there's +βŽ΅πŸ‘†i β‡’ their +βŽ΅πŸ‘†yr β‡’ they're +βŽ΅πŸ‘†yl β‡’ they'll +βŽ΅πŸ‘†d β‡’ they'd +βŽ΅πŸ‘†s β‡’ these +βŽ΅πŸ‘†t β‡’ that +βŽ΅πŸ‘†a β‡’ than +βŽ΅πŸ‘†o β‡’ those + +⎡tπŸ‘ β‡’ time +⎡tπŸ‘g β‡’ though +⎡tπŸ‘t β‡’ thought +⎡tπŸ‘r β‡’ through +⎡tπŸ‘c β‡’ technology +⎡tπŸ‘a β‡’ take + +⎡wπŸ‘ β‡’ why +⎡wπŸ‘n β‡’ when +⎡wπŸ‘e β‡’ where +⎡wπŸ‘t β‡’ what +⎡wπŸ‘r β‡’ we're +⎡wπŸ‘d β‡’ we'd +⎡wπŸ‘l β‡’ we'll +⎡wπŸ‘v β‡’ we've + +aπŸ‘† β‡’ abo +aπŸ‘†πŸ‘ β‡’ about +aπŸ‘†πŸ‘† β‡’ above vπŸ‘† β‡’ ver sπŸ‘† β‡’ sk @@ -33,7 +70,13 @@ kπŸ‘† β‡’ ks lπŸ‘† β‡’ lk rπŸ‘† β‡’ rl + jπŸ‘† β‡’ just +jπŸ‘†πŸ‘† β‡’ justment +⎡jπŸ‘ β‡’ join +⎡jπŸ‘d β‡’ judge +⎡jπŸ‘dt β‡’ judgment +⎡jπŸ‘dta β‡’ judgmental cπŸ‘† β‡’ cy pπŸ‘† β‡’ py @@ -50,17 +93,16 @@ zπŸ‘† β‡’ zone nπŸ‘† β‡’ nion hπŸ‘† β‡’ however -uπŸ‘† β‡’ eu -eπŸ‘† β‡’ ue +uπŸ‘† β‡’ ue +eπŸ‘† β‡’ eu oπŸ‘† β‡’ oa -aπŸ‘† β‡’ abo -,πŸ‘† β‡’ ,:but +,πŸ‘† β‡’ ,⎡but iπŸ‘† β‡’ ion .πŸ‘† β‡’ .\ -:πŸ‘ β‡’ for +βŽ΅πŸ‘ β‡’ for aπŸ‘ β‡’ and xπŸ‘ β‡’ xer kπŸ‘ β‡’ know @@ -68,13 +110,12 @@ iπŸ‘ β‡’ ing yπŸ‘ β‡’ you qπŸ‘ β‡’ quick jπŸ‘ β‡’ join -wπŸ‘ β‡’ would cπŸ‘ β‡’ ck nπŸ‘ β‡’ nf hπŸ‘ β‡’ hn -,πŸ‘ β‡’ ,:and -.πŸ‘ β‡’ .:⇑ -?πŸ‘ β‡’ ?:⇑ -:πŸ‘ β‡’ ::⇑ -;πŸ‘ β‡’ ;:⇑ -!πŸ‘ β‡’ !:⇑ +,πŸ‘ β‡’ ,⎡and +.πŸ‘ β‡’ .βŽ΅β‡‘ +?πŸ‘ β‡’ ?βŽ΅β‡‘ +:πŸ‘ β‡’ :βŽ΅β‡‘ +;πŸ‘ β‡’ ;βŽ΅β‡‘ +!πŸ‘ β‡’ !βŽ΅β‡‘ diff --git a/keyboards/moonlander/keymaps/ikcelaks/rules.mk b/keyboards/moonlander/keymaps/ikcelaks/rules.mk index 1a7b709d..23cbe047 100644 --- a/keyboards/moonlander/keymaps/ikcelaks/rules.mk +++ b/keyboards/moonlander/keymaps/ikcelaks/rules.mk @@ -1,6 +1,6 @@ # Set any rules.mk overrides for your specific keymap here. # See rules at https://docs.qmk.fm/#/config_options?id=the-rulesmk-file -CONSOLE_ENABLE = yes +CONSOLE_ENABLE = no COMMAND_ENABLE = no SPACE_CADET_ENABLE = no COMBO_ENABLE = yes