summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrashna Jael're <drashna@live.com>2021-11-13 09:32:14 -0800
committerDrashna Jael're <drashna@live.com>2021-11-13 09:32:14 -0800
commit7e86c37962935e2f791864201b684345995f0b82 (patch)
tree8a11223e43dc8115fd6a083ff29026f76e78d36a
parent4ceb5947f9f3fc47de9c4f4b6b785bdc13db15e5 (diff)
parent0ee9c41cc631d498591408fe2fcc4c1ac57d854d (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--docs/_langs.md2
-rw-r--r--keyboards/cradio/info.json44
-rw-r--r--quantum/process_keycode/process_unicode_common.c1
3 files changed, 24 insertions, 23 deletions
diff --git a/docs/_langs.md b/docs/_langs.md
index f7b375fb94..3fecd72da6 100644
--- a/docs/_langs.md
+++ b/docs/_langs.md
@@ -3,7 +3,7 @@
- [:cn: 中文](/zh-cn/)
- [:es: Español](/es/)
- [:fr: Français](/fr-fr/)
- - [:he: עברית](/he-il/)
+ - [:israel: עברית](/he-il/)
- [:brazil: Português](/pt-br/)
- [:ru: Русский](/ru-ru/)
- [:jp: 日本語](/ja/)
diff --git a/keyboards/cradio/info.json b/keyboards/cradio/info.json
index 7a46c69113..c553810656 100644
--- a/keyboards/cradio/info.json
+++ b/keyboards/cradio/info.json
@@ -5,47 +5,47 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x": 0, "y": 0.95},
+ {"x": 0, "y": 1.27},
{"x": 1, "y": 0.31},
{"x": 2, "y": 0},
{"x": 3, "y": 0.28},
{"x": 4, "y": 0.42},
- {"x": 7, "y": 0.42},
- {"x": 8, "y": 0.28},
- {"x": 9, "y": 0},
- {"x": 10, "y": 0.31},
- {"x": 11, "y": 0.95},
+ {"x": 8, "y": 0.42},
+ {"x": 9, "y": 0.28},
+ {"x": 10, "y": 0},
+ {"x": 11, "y": 0.31},
+ {"x": 12, "y": 1.27},
- {"x": 0, "y": 1.95},
+ {"x": 0, "y": 2.27},
{"x": 1, "y": 1.31},
{"x": 2, "y": 1},
{"x": 3, "y": 1.28},
{"x": 4, "y": 1.42},
- {"x": 7, "y": 1.42},
- {"x": 8, "y": 1.28},
- {"x": 9, "y": 1},
- {"x": 10, "y": 1.31},
- {"x": 11, "y": 1.95},
+ {"x": 8, "y": 1.42},
+ {"x": 9, "y": 1.28},
+ {"x": 10, "y": 1},
+ {"x": 11, "y": 1.31},
+ {"x": 12, "y": 2.27},
- {"x": 0, "y": 2.95},
+ {"x": 0, "y": 3.27},
{"x": 1, "y": 2.31},
{"x": 2, "y": 2},
{"x": 3, "y": 2.28},
{"x": 4, "y": 2.42},
- {"x": 7, "y": 2.42},
- {"x": 8, "y": 2.28},
- {"x": 9, "y": 2},
- {"x": 10, "y": 2.31},
- {"x": 11, "y": 2.95},
+ {"x": 8, "y": 2.42},
+ {"x": 9, "y": 2.28},
+ {"x": 10, "y": 2},
+ {"x": 11, "y": 2.31},
+ {"x": 12, "y": 3.27},
- {"x": 4, "y": 3.6},
- {"x": 5, "y": 3.4},
+ {"x": 4, "y": 3.9},
+ {"x": 5, "y": 3.7},
- {"x": 6, "y": 3.4},
- {"x": 7, "y": 3.6}
+ {"x": 7, "y": 3.7},
+ {"x": 8, "y": 3.9}
]
}
}
diff --git a/quantum/process_keycode/process_unicode_common.c b/quantum/process_keycode/process_unicode_common.c
index 9c82571c7d..7685bb1c99 100644
--- a/quantum/process_keycode/process_unicode_common.c
+++ b/quantum/process_keycode/process_unicode_common.c
@@ -106,6 +106,7 @@ __attribute__((weak)) void unicode_input_start(void) {
tap_code(KC_NUM_LOCK);
}
register_code(KC_LEFT_ALT);
+ wait_ms(UNICODE_TYPE_DELAY);
tap_code(KC_KP_PLUS);
break;
case UC_WINC: