aboutsummaryrefslogtreecommitdiff
path: root/users
diff options
context:
space:
mode:
authorManna Harbour <51143715+manna-harbour@users.noreply.github.com>2021-10-16 16:33:45 +1100
committerGitHub <noreply@github.com>2021-10-15 22:33:45 -0700
commit6b299fab6e6a3143c061b9ea005253361fcd524b (patch)
tree51040e29ff94703830d366f1ec0d8ee1dc300586 /users
parent9a0addc77e3e48b908b846fc78326d4a20c30bc9 (diff)
downloadqmk_firmware-6b299fab6e6a3143c061b9ea005253361fcd524b.tar.gz
qmk_firmware-6b299fab6e6a3143c061b9ea005253361fcd524b.zip
[Keymap] Update Miryoku (#14827)
Diffstat (limited to 'users')
l---------users/manna-harbour_miryoku/README.org1
-rw-r--r--users/manna-harbour_miryoku/config.h2
-rw-r--r--users/manna-harbour_miryoku/manna-harbour_miryoku.c77
-rw-r--r--users/manna-harbour_miryoku/manna-harbour_miryoku.h4
-rw-r--r--users/manna-harbour_miryoku/readme.org (renamed from users/manna-harbour_miryoku/miryoku.org)802
-rw-r--r--users/manna-harbour_miryoku/rules.mk2
6 files changed, 483 insertions, 405 deletions
diff --git a/users/manna-harbour_miryoku/README.org b/users/manna-harbour_miryoku/README.org
deleted file mode 120000
index b6caaade1..000000000
--- a/users/manna-harbour_miryoku/README.org
+++ /dev/null
@@ -1 +0,0 @@
1miryoku.org \ No newline at end of file
diff --git a/users/manna-harbour_miryoku/config.h b/users/manna-harbour_miryoku/config.h
index 38d363299..d24f52eda 100644
--- a/users/manna-harbour_miryoku/config.h
+++ b/users/manna-harbour_miryoku/config.h
@@ -1,6 +1,6 @@
1// Copyright 2019 Manna Harbour 1// Copyright 2019 Manna Harbour
2// https://github.com/manna-harbour/miryoku 2// https://github.com/manna-harbour/miryoku
3// generated from users/manna-harbour_miryoku/miryoku.org -*- buffer-read-only: t -*- 3// generated -*- buffer-read-only: t -*-
4 4
5// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. 5// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
6 6
diff --git a/users/manna-harbour_miryoku/manna-harbour_miryoku.c b/users/manna-harbour_miryoku/manna-harbour_miryoku.c
index ff25b7793..634718341 100644
--- a/users/manna-harbour_miryoku/manna-harbour_miryoku.c
+++ b/users/manna-harbour_miryoku/manna-harbour_miryoku.c
@@ -1,6 +1,6 @@
1// Copyright 2019 Manna Harbour 1// Copyright 2019 Manna Harbour
2// https://github.com/manna-harbour/miryoku 2// https://github.com/manna-harbour/miryoku
3// generated from users/manna-harbour_miryoku/miryoku.org -*- buffer-read-only: t -*- 3// generated -*- buffer-read-only: t -*-
4 4
5// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. 5// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
6 6
@@ -9,40 +9,50 @@
9const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 9const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
10#if defined MIRYOKU_LAYERS_FLIP 10#if defined MIRYOKU_LAYERS_FLIP
11 [BASE] = LAYOUT_miryoku( 11 [BASE] = LAYOUT_miryoku(
12 #if defined MIRYOKU_ALPHAS_COLEMAK 12 #if defined MIRYOKU_ALPHAS_AZERTY
13 KC_A, KC_Z, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
14 LGUI_T(KC_Q), LALT_T(KC_S), LCTL_T(KC_D), LSFT_T(KC_F), KC_G, KC_H, LSFT_T(KC_J), LCTL_T(KC_K), LALT_T(KC_L), LGUI_T(KC_M),
15 LT(BUTTON, KC_W), ALGR_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_COMM, KC_DOT, ALGR_T(KC_SLSH), LT(BUTTON, KC_QUOT),
16 U_NP, U_NP, LT(FUN, KC_DEL), LT(NUM, KC_BSPC), LT(SYM, KC_ENT), LT(MOUSE, KC_TAB), LT(NAV, KC_SPC), LT(MEDIA, KC_ESC), U_NP, U_NP
17 #elif defined MIRYOKU_ALPHAS_COLEMAK
13 KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, 18 KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_QUOT,
14 LGUI_T(KC_A), LALT_T(KC_R), LCTL_T(KC_S), LSFT_T(KC_T), KC_D, KC_H, LSFT_T(KC_N), LCTL_T(KC_E), LALT_T(KC_I), LGUI_T(KC_O), 19 LGUI_T(KC_A), LALT_T(KC_R), LCTL_T(KC_S), LSFT_T(KC_T), KC_D, KC_H, LSFT_T(KC_N), LCTL_T(KC_E), LALT_T(KC_I), LGUI_T(KC_O),
15 KC_Z, ALGR_T(KC_X), KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, ALGR_T(KC_DOT), KC_SLSH, 20 LT(BUTTON, KC_Z), ALGR_T(KC_X), KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, ALGR_T(KC_DOT), LT(BUTTON, KC_SLSH),
16 U_NP, U_NP, LT(FUN, KC_DEL), LT(NUM, KC_BSPC), LT(SYM, KC_ENT), LT(MOUSE, KC_TAB), LT(NAV, KC_SPC), LT(MEDIA, KC_ESC), U_NP, U_NP 21 U_NP, U_NP, LT(FUN, KC_DEL), LT(NUM, KC_BSPC), LT(SYM, KC_ENT), LT(MOUSE, KC_TAB), LT(NAV, KC_SPC), LT(MEDIA, KC_ESC), U_NP, U_NP
17 #elif defined MIRYOKU_ALPHAS_COLEMAKDHK 22 #elif defined MIRYOKU_ALPHAS_COLEMAKDHK
18 KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, 23 KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_QUOT,
19 LGUI_T(KC_A), LALT_T(KC_R), LCTL_T(KC_S), LSFT_T(KC_T), KC_G, KC_K, LSFT_T(KC_N), LCTL_T(KC_E), LALT_T(KC_I), LGUI_T(KC_O), 24 LGUI_T(KC_A), LALT_T(KC_R), LCTL_T(KC_S), LSFT_T(KC_T), KC_G, KC_K, LSFT_T(KC_N), LCTL_T(KC_E), LALT_T(KC_I), LGUI_T(KC_O),
20 KC_Z, ALGR_T(KC_X), KC_C, KC_D, KC_V, KC_M, KC_H, KC_COMM, ALGR_T(KC_DOT), KC_SLSH, 25 LT(BUTTON, KC_Z), ALGR_T(KC_X), KC_C, KC_D, KC_V, KC_M, KC_H, KC_COMM, ALGR_T(KC_DOT), LT(BUTTON, KC_SLSH),
21 U_NP, U_NP, LT(FUN, KC_DEL), LT(NUM, KC_BSPC), LT(SYM, KC_ENT), LT(MOUSE, KC_TAB), LT(NAV, KC_SPC), LT(MEDIA, KC_ESC), U_NP, U_NP 26 U_NP, U_NP, LT(FUN, KC_DEL), LT(NUM, KC_BSPC), LT(SYM, KC_ENT), LT(MOUSE, KC_TAB), LT(NAV, KC_SPC), LT(MEDIA, KC_ESC), U_NP, U_NP
22 #elif defined MIRYOKU_ALPHAS_DVORAK 27 #elif defined MIRYOKU_ALPHAS_DVORAK
23 KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, 28 KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L,
24 LGUI_T(KC_A), LALT_T(KC_O), LCTL_T(KC_E), LSFT_T(KC_U), KC_I, KC_D, LSFT_T(KC_H), LCTL_T(KC_T), LALT_T(KC_N), LGUI_T(KC_S), 29 LGUI_T(KC_A), LALT_T(KC_O), LCTL_T(KC_E), LSFT_T(KC_U), KC_I, KC_D, LSFT_T(KC_H), LCTL_T(KC_T), LALT_T(KC_N), LGUI_T(KC_S),
25 KC_SLSH, ALGR_T(KC_Q), KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, ALGR_T(KC_V), KC_Z, 30 LT(BUTTON, KC_SLSH), ALGR_T(KC_Q), KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, ALGR_T(KC_V), LT(BUTTON, KC_Z),
26 U_NP, U_NP, LT(FUN, KC_DEL), LT(NUM, KC_BSPC), LT(SYM, KC_ENT), LT(MOUSE, KC_TAB), LT(NAV, KC_SPC), LT(MEDIA, KC_ESC), U_NP, U_NP 31 U_NP, U_NP, LT(FUN, KC_DEL), LT(NUM, KC_BSPC), LT(SYM, KC_ENT), LT(MOUSE, KC_TAB), LT(NAV, KC_SPC), LT(MEDIA, KC_ESC), U_NP, U_NP
27 #elif defined MIRYOKU_ALPHAS_HALMAK 32 #elif defined MIRYOKU_ALPHAS_HALMAK
28 KC_W, KC_L, KC_R, KC_B, KC_Z, KC_QUOT, KC_Q, KC_U, KC_D, KC_J, 33 KC_W, KC_L, KC_R, KC_B, KC_Z, KC_QUOT, KC_Q, KC_U, KC_D, KC_J,
29 LGUI_T(KC_S), LALT_T(KC_H), LCTL_T(KC_N), LSFT_T(KC_T), KC_COMM, KC_DOT, LSFT_T(KC_A), LCTL_T(KC_E), LALT_T(KC_O), LGUI_T(KC_I), 34 LGUI_T(KC_S), LALT_T(KC_H), LCTL_T(KC_N), LSFT_T(KC_T), KC_COMM, KC_DOT, LSFT_T(KC_A), LCTL_T(KC_E), LALT_T(KC_O), LGUI_T(KC_I),
30 KC_F, ALGR_T(KC_M), KC_V, KC_C, KC_SLSH, KC_G, KC_P, KC_X, ALGR_T(KC_K), KC_Y, 35 LT(BUTTON, KC_F), ALGR_T(KC_M), KC_V, KC_C, KC_SLSH, KC_G, KC_P, KC_X, ALGR_T(KC_K), LT(BUTTON, KC_Y),
31 U_NP, U_NP, LT(FUN, KC_DEL), LT(NUM, KC_BSPC), LT(SYM, KC_ENT), LT(MOUSE, KC_TAB), LT(NAV, KC_SPC), LT(MEDIA, KC_ESC), U_NP, U_NP 36 U_NP, U_NP, LT(FUN, KC_DEL), LT(NUM, KC_BSPC), LT(SYM, KC_ENT), LT(MOUSE, KC_TAB), LT(NAV, KC_SPC), LT(MEDIA, KC_ESC), U_NP, U_NP
32 #elif defined MIRYOKU_ALPHAS_WORKMAN 37 #elif defined MIRYOKU_ALPHAS_WORKMAN
33 KC_Q, KC_D, KC_R, KC_W, KC_B, KC_J, KC_F, KC_U, KC_P, KC_QUOT, 38 KC_Q, KC_D, KC_R, KC_W, KC_B, KC_J, KC_F, KC_U, KC_P, KC_QUOT,
34 LGUI_T(KC_A), LALT_T(KC_S), LCTL_T(KC_H), LSFT_T(KC_T), KC_G, KC_Y, LSFT_T(KC_N), LCTL_T(KC_E), LALT_T(KC_O), LGUI_T(KC_I), 39 LGUI_T(KC_A), LALT_T(KC_S), LCTL_T(KC_H), LSFT_T(KC_T), KC_G, KC_Y, LSFT_T(KC_N), LCTL_T(KC_E), LALT_T(KC_O), LGUI_T(KC_I),
35 KC_Z, ALGR_T(KC_X), KC_M, KC_C, KC_V, KC_K, KC_L, KC_COMM, ALGR_T(KC_DOT), KC_SLSH, 40 LT(BUTTON, KC_Z), ALGR_T(KC_X), KC_M, KC_C, KC_V, KC_K, KC_L, KC_COMM, ALGR_T(KC_DOT), LT(BUTTON, KC_SLSH),
36 U_NP, U_NP, LT(FUN, KC_DEL), LT(NUM, KC_BSPC), LT(SYM, KC_ENT), LT(MOUSE, KC_TAB), LT(NAV, KC_SPC), LT(MEDIA, KC_ESC), U_NP, U_NP 41 U_NP, U_NP, LT(FUN, KC_DEL), LT(NUM, KC_BSPC), LT(SYM, KC_ENT), LT(MOUSE, KC_TAB), LT(NAV, KC_SPC), LT(MEDIA, KC_ESC), U_NP, U_NP
37 #elif defined MIRYOKU_ALPHAS_QWERTY 42 #elif defined MIRYOKU_ALPHAS_QWERTY
38 KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, 43 KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
39 LGUI_T(KC_A), LALT_T(KC_S), LCTL_T(KC_D), LSFT_T(KC_F), KC_G, KC_H, LSFT_T(KC_J), LCTL_T(KC_K), LALT_T(KC_L), LGUI_T(KC_QUOT), 44 LGUI_T(KC_A), LALT_T(KC_S), LCTL_T(KC_D), LSFT_T(KC_F), KC_G, KC_H, LSFT_T(KC_J), LCTL_T(KC_K), LALT_T(KC_L), LGUI_T(KC_QUOT),
40 KC_Z, ALGR_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, ALGR_T(KC_DOT), KC_SLSH, 45 LT(BUTTON, KC_Z), ALGR_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, ALGR_T(KC_DOT), LT(BUTTON, KC_SLSH),
46 U_NP, U_NP, LT(FUN, KC_DEL), LT(NUM, KC_BSPC), LT(SYM, KC_ENT), LT(MOUSE, KC_TAB), LT(NAV, KC_SPC), LT(MEDIA, KC_ESC), U_NP, U_NP
47 #elif defined MIRYOKU_ALPHAS_QWERTZ
48 KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U, KC_I, KC_O, KC_P,
49 LGUI_T(KC_A), LALT_T(KC_S), LCTL_T(KC_D), LSFT_T(KC_F), KC_G, KC_H, LSFT_T(KC_J), LCTL_T(KC_K), LALT_T(KC_L), LGUI_T(KC_QUOT),
50 LT(BUTTON, KC_Y), ALGR_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, ALGR_T(KC_DOT), LT(BUTTON, KC_SLSH),
41 U_NP, U_NP, LT(FUN, KC_DEL), LT(NUM, KC_BSPC), LT(SYM, KC_ENT), LT(MOUSE, KC_TAB), LT(NAV, KC_SPC), LT(MEDIA, KC_ESC), U_NP, U_NP 51 U_NP, U_NP, LT(FUN, KC_DEL), LT(NUM, KC_BSPC), LT(SYM, KC_ENT), LT(MOUSE, KC_TAB), LT(NAV, KC_SPC), LT(MEDIA, KC_ESC), U_NP, U_NP
42 #else 52 #else
43 KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, 53 KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_QUOT,
44 LGUI_T(KC_A), LALT_T(KC_R), LCTL_T(KC_S), LSFT_T(KC_T), KC_G, KC_M, LSFT_T(KC_N), LCTL_T(KC_E), LALT_T(KC_I), LGUI_T(KC_O), 54 LGUI_T(KC_A), LALT_T(KC_R), LCTL_T(KC_S), LSFT_T(KC_T), KC_G, KC_M, LSFT_T(KC_N), LCTL_T(KC_E), LALT_T(KC_I), LGUI_T(KC_O),
45 KC_Z, ALGR_T(KC_X), KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, ALGR_T(KC_DOT), KC_SLSH, 55 LT(BUTTON, KC_Z), ALGR_T(KC_X), KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, ALGR_T(KC_DOT), LT(BUTTON, KC_SLSH),
46 U_NP, U_NP, LT(FUN, KC_DEL), LT(NUM, KC_BSPC), LT(SYM, KC_ENT), LT(MOUSE, KC_TAB), LT(NAV, KC_SPC), LT(MEDIA, KC_ESC), U_NP, U_NP 56 U_NP, U_NP, LT(FUN, KC_DEL), LT(NUM, KC_BSPC), LT(SYM, KC_ENT), LT(MOUSE, KC_TAB), LT(NAV, KC_SPC), LT(MEDIA, KC_ESC), U_NP, U_NP
47 #endif 57 #endif
48 ), 58 ),
@@ -85,12 +95,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
85 U_NP, U_NP, KC_MUTE, KC_MPLY, KC_MSTP, U_NA, U_NA, U_NA, U_NP, U_NP 95 U_NP, U_NP, KC_MUTE, KC_MPLY, KC_MSTP, U_NA, U_NA, U_NA, U_NP, U_NP
86 ), 96 ),
87 #endif 97 #endif
88 [MBO] = LAYOUT_miryoku(
89 U_RDO, U_PST, U_CPY, U_CUT, U_UND, U_RDO, U_PST, U_CPY, U_CUT, U_UND,
90 KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, KC_TRNS, KC_TRNS, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI,
91 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
92 U_NP, U_NP, KC_BTN2, KC_BTN3, KC_BTN1, KC_BTN1, KC_BTN3, KC_BTN2, U_NP, U_NP
93 ),
94 [NUM] = LAYOUT_miryoku( 98 [NUM] = LAYOUT_miryoku(
95 RESET, U_NA, U_NA, U_NA, U_NA, KC_LBRC, KC_7, KC_8, KC_9, KC_RBRC, 99 RESET, U_NA, U_NA, U_NA, U_NA, KC_LBRC, KC_7, KC_8, KC_9, KC_RBRC,
96 KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, U_NA, KC_EQL, KC_4, KC_5, KC_6, KC_SCLN, 100 KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, U_NA, KC_EQL, KC_4, KC_5, KC_6, KC_SCLN,
@@ -108,44 +112,53 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
108 KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, U_NA, KC_SLCK, KC_F4, KC_F5, KC_F6, KC_F11, 112 KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, U_NA, KC_SLCK, KC_F4, KC_F5, KC_F6, KC_F11,
109 U_NA, KC_ALGR, U_NA, U_NA, U_NA, KC_PAUS, KC_F1, KC_F2, KC_F3, KC_F10, 113 U_NA, KC_ALGR, U_NA, U_NA, U_NA, KC_PAUS, KC_F1, KC_F2, KC_F3, KC_F10,
110 U_NP, U_NP, U_NA, U_NA, U_NA, KC_TAB, KC_SPC, KC_APP, U_NP, U_NP 114 U_NP, U_NP, U_NA, U_NA, U_NA, KC_TAB, KC_SPC, KC_APP, U_NP, U_NP
111 ) 115 ),
112,
113#else 116#else
114 [BASE] = LAYOUT_miryoku( 117 [BASE] = LAYOUT_miryoku(
115 #if defined MIRYOKU_ALPHAS_COLEMAK 118 #if defined MIRYOKU_ALPHAS_AZERTY
119 KC_A, KC_Z, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
120 LGUI_T(KC_Q), LALT_T(KC_S), LCTL_T(KC_D), LSFT_T(KC_F), KC_G, KC_H, LSFT_T(KC_J), LCTL_T(KC_K), LALT_T(KC_L), LGUI_T(KC_M),
121 LT(BUTTON, KC_W), ALGR_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_COMM, KC_DOT, ALGR_T(KC_SLSH), LT(BUTTON, KC_QUOT),
122 U_NP, U_NP, LT(MEDIA, KC_ESC), LT(NAV, KC_SPC), LT(MOUSE, KC_TAB), LT(SYM, KC_ENT), LT(NUM, KC_BSPC), LT(FUN, KC_DEL), U_NP, U_NP
123 #elif defined MIRYOKU_ALPHAS_COLEMAK
116 KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, 124 KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_QUOT,
117 LGUI_T(KC_A), LALT_T(KC_R), LCTL_T(KC_S), LSFT_T(KC_T), KC_D, KC_H, LSFT_T(KC_N), LCTL_T(KC_E), LALT_T(KC_I), LGUI_T(KC_O), 125 LGUI_T(KC_A), LALT_T(KC_R), LCTL_T(KC_S), LSFT_T(KC_T), KC_D, KC_H, LSFT_T(KC_N), LCTL_T(KC_E), LALT_T(KC_I), LGUI_T(KC_O),
118 KC_Z, ALGR_T(KC_X), KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, ALGR_T(KC_DOT), KC_SLSH, 126 LT(BUTTON, KC_Z), ALGR_T(KC_X), KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, ALGR_T(KC_DOT), LT(BUTTON, KC_SLSH),
119 U_NP, U_NP, LT(MEDIA, KC_ESC), LT(NAV, KC_SPC), LT(MOUSE, KC_TAB), LT(SYM, KC_ENT), LT(NUM, KC_BSPC), LT(FUN, KC_DEL), U_NP, U_NP 127 U_NP, U_NP, LT(MEDIA, KC_ESC), LT(NAV, KC_SPC), LT(MOUSE, KC_TAB), LT(SYM, KC_ENT), LT(NUM, KC_BSPC), LT(FUN, KC_DEL), U_NP, U_NP
120 #elif defined MIRYOKU_ALPHAS_COLEMAKDHK 128 #elif defined MIRYOKU_ALPHAS_COLEMAKDHK
121 KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, 129 KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_QUOT,
122 LGUI_T(KC_A), LALT_T(KC_R), LCTL_T(KC_S), LSFT_T(KC_T), KC_G, KC_K, LSFT_T(KC_N), LCTL_T(KC_E), LALT_T(KC_I), LGUI_T(KC_O), 130 LGUI_T(KC_A), LALT_T(KC_R), LCTL_T(KC_S), LSFT_T(KC_T), KC_G, KC_K, LSFT_T(KC_N), LCTL_T(KC_E), LALT_T(KC_I), LGUI_T(KC_O),
123 KC_Z, ALGR_T(KC_X), KC_C, KC_D, KC_V, KC_M, KC_H, KC_COMM, ALGR_T(KC_DOT), KC_SLSH, 131 LT(BUTTON, KC_Z), ALGR_T(KC_X), KC_C, KC_D, KC_V, KC_M, KC_H, KC_COMM, ALGR_T(KC_DOT), LT(BUTTON, KC_SLSH),
124 U_NP, U_NP, LT(MEDIA, KC_ESC), LT(NAV, KC_SPC), LT(MOUSE, KC_TAB), LT(SYM, KC_ENT), LT(NUM, KC_BSPC), LT(FUN, KC_DEL), U_NP, U_NP 132 U_NP, U_NP, LT(MEDIA, KC_ESC), LT(NAV, KC_SPC), LT(MOUSE, KC_TAB), LT(SYM, KC_ENT), LT(NUM, KC_BSPC), LT(FUN, KC_DEL), U_NP, U_NP
125 #elif defined MIRYOKU_ALPHAS_DVORAK 133 #elif defined MIRYOKU_ALPHAS_DVORAK
126 KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, 134 KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L,
127 LGUI_T(KC_A), LALT_T(KC_O), LCTL_T(KC_E), LSFT_T(KC_U), KC_I, KC_D, LSFT_T(KC_H), LCTL_T(KC_T), LALT_T(KC_N), LGUI_T(KC_S), 135 LGUI_T(KC_A), LALT_T(KC_O), LCTL_T(KC_E), LSFT_T(KC_U), KC_I, KC_D, LSFT_T(KC_H), LCTL_T(KC_T), LALT_T(KC_N), LGUI_T(KC_S),
128 KC_SLSH, ALGR_T(KC_Q), KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, ALGR_T(KC_V), KC_Z, 136 LT(BUTTON, KC_SLSH), ALGR_T(KC_Q), KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, ALGR_T(KC_V), LT(BUTTON, KC_Z),
129 U_NP, U_NP, LT(MEDIA, KC_ESC), LT(NAV, KC_SPC), LT(MOUSE, KC_TAB), LT(SYM, KC_ENT), LT(NUM, KC_BSPC), LT(FUN, KC_DEL), U_NP, U_NP 137 U_NP, U_NP, LT(MEDIA, KC_ESC), LT(NAV, KC_SPC), LT(MOUSE, KC_TAB), LT(SYM, KC_ENT), LT(NUM, KC_BSPC), LT(FUN, KC_DEL), U_NP, U_NP
130 #elif defined MIRYOKU_ALPHAS_HALMAK 138 #elif defined MIRYOKU_ALPHAS_HALMAK
131 KC_W, KC_L, KC_R, KC_B, KC_Z, KC_QUOT, KC_Q, KC_U, KC_D, KC_J, 139 KC_W, KC_L, KC_R, KC_B, KC_Z, KC_QUOT, KC_Q, KC_U, KC_D, KC_J,
132 LGUI_T(KC_S), LALT_T(KC_H), LCTL_T(KC_N), LSFT_T(KC_T), KC_COMM, KC_DOT, LSFT_T(KC_A), LCTL_T(KC_E), LALT_T(KC_O), LGUI_T(KC_I), 140 LGUI_T(KC_S), LALT_T(KC_H), LCTL_T(KC_N), LSFT_T(KC_T), KC_COMM, KC_DOT, LSFT_T(KC_A), LCTL_T(KC_E), LALT_T(KC_O), LGUI_T(KC_I),
133 KC_F, ALGR_T(KC_M), KC_V, KC_C, KC_SLSH, KC_G, KC_P, KC_X, ALGR_T(KC_K), KC_Y, 141 LT(BUTTON, KC_F), ALGR_T(KC_M), KC_V, KC_C, KC_SLSH, KC_G, KC_P, KC_X, ALGR_T(KC_K), LT(BUTTON, KC_Y),
134 U_NP, U_NP, LT(MEDIA, KC_ESC), LT(NAV, KC_SPC), LT(MOUSE, KC_TAB), LT(SYM, KC_ENT), LT(NUM, KC_BSPC), LT(FUN, KC_DEL), U_NP, U_NP 142 U_NP, U_NP, LT(MEDIA, KC_ESC), LT(NAV, KC_SPC), LT(MOUSE, KC_TAB), LT(SYM, KC_ENT), LT(NUM, KC_BSPC), LT(FUN, KC_DEL), U_NP, U_NP
135 #elif defined MIRYOKU_ALPHAS_WORKMAN 143 #elif defined MIRYOKU_ALPHAS_WORKMAN
136 KC_Q, KC_D, KC_R, KC_W, KC_B, KC_J, KC_F, KC_U, KC_P, KC_QUOT, 144 KC_Q, KC_D, KC_R, KC_W, KC_B, KC_J, KC_F, KC_U, KC_P, KC_QUOT,
137 LGUI_T(KC_A), LALT_T(KC_S), LCTL_T(KC_H), LSFT_T(KC_T), KC_G, KC_Y, LSFT_T(KC_N), LCTL_T(KC_E), LALT_T(KC_O), LGUI_T(KC_I), 145 LGUI_T(KC_A), LALT_T(KC_S), LCTL_T(KC_H), LSFT_T(KC_T), KC_G, KC_Y, LSFT_T(KC_N), LCTL_T(KC_E), LALT_T(KC_O), LGUI_T(KC_I),
138 KC_Z, ALGR_T(KC_X), KC_M, KC_C, KC_V, KC_K, KC_L, KC_COMM, ALGR_T(KC_DOT), KC_SLSH, 146 LT(BUTTON, KC_Z), ALGR_T(KC_X), KC_M, KC_C, KC_V, KC_K, KC_L, KC_COMM, ALGR_T(KC_DOT), LT(BUTTON, KC_SLSH),
139 U_NP, U_NP, LT(MEDIA, KC_ESC), LT(NAV, KC_SPC), LT(MOUSE, KC_TAB), LT(SYM, KC_ENT), LT(NUM, KC_BSPC), LT(FUN, KC_DEL), U_NP, U_NP 147 U_NP, U_NP, LT(MEDIA, KC_ESC), LT(NAV, KC_SPC), LT(MOUSE, KC_TAB), LT(SYM, KC_ENT), LT(NUM, KC_BSPC), LT(FUN, KC_DEL), U_NP, U_NP
140 #elif defined MIRYOKU_ALPHAS_QWERTY 148 #elif defined MIRYOKU_ALPHAS_QWERTY
141 KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, 149 KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
142 LGUI_T(KC_A), LALT_T(KC_S), LCTL_T(KC_D), LSFT_T(KC_F), KC_G, KC_H, LSFT_T(KC_J), LCTL_T(KC_K), LALT_T(KC_L), LGUI_T(KC_QUOT), 150 LGUI_T(KC_A), LALT_T(KC_S), LCTL_T(KC_D), LSFT_T(KC_F), KC_G, KC_H, LSFT_T(KC_J), LCTL_T(KC_K), LALT_T(KC_L), LGUI_T(KC_QUOT),
143 KC_Z, ALGR_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, ALGR_T(KC_DOT), KC_SLSH, 151 LT(BUTTON, KC_Z), ALGR_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, ALGR_T(KC_DOT), LT(BUTTON, KC_SLSH),
152 U_NP, U_NP, LT(MEDIA, KC_ESC), LT(NAV, KC_SPC), LT(MOUSE, KC_TAB), LT(SYM, KC_ENT), LT(NUM, KC_BSPC), LT(FUN, KC_DEL), U_NP, U_NP
153 #elif defined MIRYOKU_ALPHAS_QWERTZ
154 KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U, KC_I, KC_O, KC_P,
155 LGUI_T(KC_A), LALT_T(KC_S), LCTL_T(KC_D), LSFT_T(KC_F), KC_G, KC_H, LSFT_T(KC_J), LCTL_T(KC_K), LALT_T(KC_L), LGUI_T(KC_QUOT),
156 LT(BUTTON, KC_Y), ALGR_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, ALGR_T(KC_DOT), LT(BUTTON, KC_SLSH),
144 U_NP, U_NP, LT(MEDIA, KC_ESC), LT(NAV, KC_SPC), LT(MOUSE, KC_TAB), LT(SYM, KC_ENT), LT(NUM, KC_BSPC), LT(FUN, KC_DEL), U_NP, U_NP 157 U_NP, U_NP, LT(MEDIA, KC_ESC), LT(NAV, KC_SPC), LT(MOUSE, KC_TAB), LT(SYM, KC_ENT), LT(NUM, KC_BSPC), LT(FUN, KC_DEL), U_NP, U_NP
145 #else 158 #else
146 KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, 159 KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_QUOT,
147 LGUI_T(KC_A), LALT_T(KC_R), LCTL_T(KC_S), LSFT_T(KC_T), KC_G, KC_M, LSFT_T(KC_N), LCTL_T(KC_E), LALT_T(KC_I), LGUI_T(KC_O), 160 LGUI_T(KC_A), LALT_T(KC_R), LCTL_T(KC_S), LSFT_T(KC_T), KC_G, KC_M, LSFT_T(KC_N), LCTL_T(KC_E), LALT_T(KC_I), LGUI_T(KC_O),
148 KC_Z, ALGR_T(KC_X), KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, ALGR_T(KC_DOT), KC_SLSH, 161 LT(BUTTON, KC_Z), ALGR_T(KC_X), KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, ALGR_T(KC_DOT), LT(BUTTON, KC_SLSH),
149 U_NP, U_NP, LT(MEDIA, KC_ESC), LT(NAV, KC_SPC), LT(MOUSE, KC_TAB), LT(SYM, KC_ENT), LT(NUM, KC_BSPC), LT(FUN, KC_DEL), U_NP, U_NP 162 U_NP, U_NP, LT(MEDIA, KC_ESC), LT(NAV, KC_SPC), LT(MOUSE, KC_TAB), LT(SYM, KC_ENT), LT(NUM, KC_BSPC), LT(FUN, KC_DEL), U_NP, U_NP
150 #endif 163 #endif
151 ), 164 ),
@@ -188,12 +201,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
188 U_NP, U_NP, U_NA, U_NA, U_NA, KC_MSTP, KC_MPLY, KC_MUTE, U_NP, U_NP 201 U_NP, U_NP, U_NA, U_NA, U_NA, KC_MSTP, KC_MPLY, KC_MUTE, U_NP, U_NP
189 ), 202 ),
190 #endif 203 #endif
191 [MBO] = LAYOUT_miryoku(
192 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
193 KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, KC_TRNS, KC_TRNS, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI,
194 U_RDO, U_PST, U_CPY, U_CUT, U_UND, U_RDO, U_PST, U_CPY, U_CUT, U_UND,
195 U_NP, U_NP, KC_BTN2, KC_BTN3, KC_BTN1, KC_BTN1, KC_BTN3, KC_BTN2, U_NP, U_NP
196 ),
197 [NUM] = LAYOUT_miryoku( 204 [NUM] = LAYOUT_miryoku(
198 KC_LBRC, KC_7, KC_8, KC_9, KC_RBRC, U_NA, U_NA, U_NA, U_NA, RESET, 205 KC_LBRC, KC_7, KC_8, KC_9, KC_RBRC, U_NA, U_NA, U_NA, U_NA, RESET,
199 KC_SCLN, KC_4, KC_5, KC_6, KC_EQL, U_NA, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, 206 KC_SCLN, KC_4, KC_5, KC_6, KC_EQL, U_NA, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI,
@@ -211,6 +218,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
211 KC_F11, KC_F4, KC_F5, KC_F6, KC_SLCK, U_NA, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, 218 KC_F11, KC_F4, KC_F5, KC_F6, KC_SLCK, U_NA, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI,
212 KC_F10, KC_F1, KC_F2, KC_F3, KC_PAUS, U_NA, U_NA, U_NA, KC_ALGR, U_NA, 219 KC_F10, KC_F1, KC_F2, KC_F3, KC_PAUS, U_NA, U_NA, U_NA, KC_ALGR, U_NA,
213 U_NP, U_NP, KC_APP, KC_SPC, KC_TAB, U_NA, U_NA, U_NA, U_NP, U_NP 220 U_NP, U_NP, KC_APP, KC_SPC, KC_TAB, U_NA, U_NA, U_NA, U_NP, U_NP
214 ) 221 ),
215#endif 222#endif
223 [BUTTON] = LAYOUT_miryoku(
224 U_UND, U_CUT, U_CPY, U_PST, U_RDO, U_RDO, U_PST, U_CPY, U_CUT, U_UND,
225 KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, KC_TRNS, KC_TRNS, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI,
226 U_UND, U_CUT, U_CPY, U_PST, U_RDO, U_RDO, U_PST, U_CPY, U_CUT, U_UND,
227 U_NP, U_NP, KC_BTN2, KC_BTN3, KC_BTN1, KC_BTN1, KC_BTN3, KC_BTN2, U_NP, U_NP
228 )
216}; 229};
diff --git a/users/manna-harbour_miryoku/manna-harbour_miryoku.h b/users/manna-harbour_miryoku/manna-harbour_miryoku.h
index 4d62c1707..1d14f6171 100644
--- a/users/manna-harbour_miryoku/manna-harbour_miryoku.h
+++ b/users/manna-harbour_miryoku/manna-harbour_miryoku.h
@@ -1,6 +1,6 @@
1// Copyright 2019 Manna Harbour 1// Copyright 2019 Manna Harbour
2// https://github.com/manna-harbour/miryoku 2// https://github.com/manna-harbour/miryoku
3// generated from users/manna-harbour_miryoku/miryoku.org -*- buffer-read-only: t -*- 3// generated -*- buffer-read-only: t -*-
4 4
5// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. 5// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
6 6
@@ -12,7 +12,7 @@
12#define U_NA KC_NO // present but not available for use 12#define U_NA KC_NO // present but not available for use
13#define U_NU KC_NO // available but not used 13#define U_NU KC_NO // available but not used
14 14
15enum layers { BASE, MBO, MEDIA, NAV, MOUSE, SYM, NUM, FUN }; 15enum layers { BASE, BUTTON, MEDIA, NAV, MOUSE, SYM, NUM, FUN };
16 16
17#if defined MIRYOKU_CLIPBOARD_FUN 17#if defined MIRYOKU_CLIPBOARD_FUN
18#define U_RDO KC_AGIN 18#define U_RDO KC_AGIN
diff --git a/users/manna-harbour_miryoku/miryoku.org b/users/manna-harbour_miryoku/readme.org
index 2f6b1d5a8..b904738a6 100644
--- a/users/manna-harbour_miryoku/miryoku.org
+++ b/users/manna-harbour_miryoku/readme.org
@@ -1,100 +1,41 @@
1# After making changes to code or tables call org-babel-tangle (C-c C-v t). 1# After making changes to code or tables call org-babel-tangle (C-c C-v t).
2 2
3#+Title: Miryoku [[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/logos/miryoku-roa-32.png]] 3* Miryoku QMK [[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/logos/miryoku-roa-32.png]]
4 4
5[[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/cover/miryoku-kle-cover.png]] 5[[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/cover/miryoku-kle-cover.png]]
6 6
7Miryoku is an ergonomic, minimal, orthogonal layout for ergo or ortho keyboards, 7[[https://github.com/manna-harbour/miryoku/][Miryoku]] is an ergonomic, minimal, orthogonal, and universal keyboard layout. This is the Miryoku implementation for [[https://qmk.fm][QMK]].
8implemented as part of the QMK firmware.
9 8
10The layout is maintained in emacs org-mode tables and converted to QMK keymap 9** Branches
11data structures using embedded python scripts. It is mapped onto keyboards with 10
12different physical layouts as a subset without code duplication using the QMK 11
13userspace feature and C macros. 12*** QMK master
13
14Miryoku QMK is periodically merged upstream into QMK master and it is generally recommended to build directly from QMK master.
15
16QMK master is at https://github.com/qmk/qmk_firmware/tree/master, and the corresponding Miryoku QMK readme is at https://github.com/qmk/qmk_firmware/tree/master/users/manna-harbour_miryoku.
17
18
19*** Miryoku QMK development branch
20
21The Miryoku QMK development branch is ~miryoku~ and may contain new commits not yet merged into QMK master.
14 22
15Please see the [[https://github.com/manna-harbour/qmk_firmware/blob/miryoku/users/manna-harbour_miryoku/miryoku.org][development branch]] for any [[https://github.com/qmk/qmk_firmware/compare/master...manna-harbour:miryoku][updates not yet merged into QMK]]. 23~miryoku~ is at https://github.com/manna-harbour/miryoku_qmk/tree/miryoku, and the corresponding Miryoku QMK readme is at https://github.com/manna-harbour/miryoku_qmk/tree/miryoku/users/manna-harbour_miryoku.
16 24
17To checkout the development branch in your existing QMK build environment: 25New commits can be seen at the top of the [[https://github.com/manna-harbour/miryoku_qmk/commits/miryoku][history]] with commit messages beginning ~[miryoku]~. After the new commits are squashed and merged upstream into QMK master by pull request the ~miryoku~ branch is renamed and a new ~miryoku~ branch is created from QMK master.
26
27To checkout the ~miryoku~ branch in your existing QMK build environment:
18#+BEGIN_SRC sh :tangle no 28#+BEGIN_SRC sh :tangle no
19git remote add manna-harbour git@github.com:manna-harbour/qmk_firmware.git # ssh 29git remote add miryoku_qmk git@github.com:manna-harbour/miryoku_qmk.git # if using SSH
20git remote add manna-harbour https://github.com/manna-harbour/qmk_firmware.git # https 30git remote add miryoku_qmk https://github.com/manna-harbour/miryoku_qmk.git # if using HTTPS
21git fetch manna-harbour 31git fetch miryoku_qmk
22git checkout --track manna-harbour/miryoku 32git checkout --track miryoku_qmk/miryoku
23#+END_SRC 33#+END_SRC
24 34
25Additional implementations and visualisations are provided outside QMK in the 35
26[[https://github.com/manna-harbour/miryoku/blob/master/README.org][Miryoku (Extras) repository]]. 36** Layout
27 37
28 38*** General Principles
29* Contents :TOC_3:
30- [[#layout][Layout]]
31 - [[#general-principles][General Principles]]
32 - [[#details][Details]]
33 - [[#layers][Layers]]
34 - [[#base][Base]]
35 - [[#nav][Nav]]
36 - [[#mouse][Mouse]]
37 - [[#mouse-buttons-overlay][Mouse Buttons Overlay]]
38 - [[#media][Media]]
39 - [[#num][Num]]
40 - [[#sym][Sym]]
41 - [[#fun][Fun]]
42 - [[#alternative-layouts][Alternative Layouts]]
43- [[#code-generation][Code Generation]]
44 - [[#table-conversion-scripts][Table Conversion Scripts]]
45 - [[#table-layout-taphold][table-layout-taphold]]
46 - [[#table-layout-half][table-layout-half]]
47 - [[#table-layout-full][table-layout-full]]
48 - [[#table-enums][table-enums]]
49 - [[#table-keycode-mappings][table-keycode-mappings]]
50 - [[#data][Data]]
51 - [[#symbol-names][symbol-names]]
52 - [[#mods][mods]]
53 - [[#nonkc][nonkc]]
54 - [[#header][header]]
55 - [[#license-qmk][license-qmk]]
56- [[#subset-mapping][Subset Mapping]]
57 - [[#userspace][Userspace]]
58 - [[#usersmanna-harbour_miryokurulesmk][users/manna-harbour_miryoku/rules.mk]]
59 - [[#usersmanna-harbour_miryokuconfigh][users/manna-harbour_miryoku/config.h]]
60 - [[#usersmanna-harbour_miryokumanna-harbour_miryokuh][users/manna-harbour_miryoku/manna-harbour_miryoku.h]]
61 - [[#usersmanna-harbour_miryokumanna-harbour_miryokuc][users/manna-harbour_miryoku/manna-harbour_miryoku.c]]
62 - [[#layouts][Layouts]]
63 - [[#60_ansi][60_ansi]]
64 - [[#ergodox][ergodox]]
65 - [[#ortho_4x10][ortho_4x10]]
66 - [[#ortho_4x12][ortho_4x12]]
67 - [[#ortho_5x12][ortho_5x12]]
68 - [[#ortho_5x15][ortho_5x15]]
69 - [[#planck_mit][planck_mit]]
70 - [[#split_3x5_3][split_3x5_3]]
71 - [[#split_3x6_3][split_3x6_3]]
72 - [[#keyboards][Keyboards]]
73 - [[#atreus][atreus]]
74 - [[#ergotravel][ergotravel]]
75 - [[#for_science][for_science]]
76 - [[#gergo][gergo]]
77 - [[#handwireddactyl_manuform4x5][handwired/dactyl_manuform/4x5]]
78 - [[#handwireddactyl_manuform5x6][handwired/dactyl_manuform/5x6]]
79 - [[#keebioiris][keebio/iris]]
80 - [[#keyboardioatreus][keyboardio/atreus]]
81 - [[#kyria][kyria]]
82 - [[#lily58][lily58]]
83 - [[#moonlander][moonlander]]
84 - [[#redox_w][redox_w]]
85 - [[#sofle][sofle]]
86 - [[#torn][torn]]
87 - [[#customisation][Customisation]]
88 - [[#examples][Examples]]
89- [[#experimental-features][Experimental Features]]
90 - [[#bilateral-combinations][Bilateral Combinations]]
91 - [[#retro-shift][Retro Shift]]
92- [[#documentation][Documentation]]
93- [[#contact][Contact]]
94
95* Layout
96
97** General Principles
98 39
99- Use layers instead of reaching. 40- Use layers instead of reaching.
100- Use both hands instead of contortions. 41- Use both hands instead of contortions.
@@ -103,7 +44,7 @@ Additional implementations and visualisations are provided outside QMK in the
103- Avoid unnecessary complication. 44- Avoid unnecessary complication.
104 45
105 46
106** Details 47*** Details
107 48
108- 5 columns, 3 rows, 3 thumb keys, 2 hands. 49- 5 columns, 3 rows, 3 thumb keys, 2 hands.
109- Can be used on almost any split or non-split ergo or ortho keyboard. 50- Can be used on almost any split or non-split ergo or ortho keyboard.
@@ -133,7 +74,7 @@ Additional implementations and visualisations are provided outside QMK in the
133- Auto Shift for numbers and symbols. 74- Auto Shift for numbers and symbols.
134 75
135 76
136** Layers 77*** Layers
137 78
138[[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/layers/miryoku-kle-reference.png]] 79[[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/layers/miryoku-kle-reference.png]]
139 80
@@ -153,7 +94,7 @@ Mods (and reset) will be available on sub layers on the same hand as the layer
153change thumb key. Unknown names are considered to be layer names. 94change thumb key. Unknown names are considered to be layer names.
154 95
155 96
156*** Base 97**** Base
157 98
158[[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/layers/miryoku-kle-base.png]] 99[[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/layers/miryoku-kle-base.png]]
159 100
@@ -164,10 +105,10 @@ backspace, enter, delete on the right and space, tab, escape on the left.
164Alternative alpha arrangements are also available. 105Alternative alpha arrangements are also available.
165 106
166 107
167**** Tap 108***** Tap
168 109
169 110
170***** Alphas 111****** Alphas
171 112
172#+NAME: colemakdh 113#+NAME: colemakdh
173| Q | W | F | P | B | J | L | U | Y | ' | 114| Q | W | F | P | B | J | L | U | Y | ' |
@@ -175,22 +116,22 @@ Alternative alpha arrangements are also available.
175| Z | X | C | D | V | K | H | , | DOT | / | 116| Z | X | C | D | V | K | H | , | DOT | / |
176 117
177 118
178***** Thumbs 119****** Thumbs
179 120
180#+NAME: thumbs 121#+NAME: thumbs
181| U_NP | U_NP | ESC | SPC | TAB | ENT | BSPC | DEL | U_NP | U_NP | 122| U_NP | U_NP | ESC | SPC | TAB | ENT | BSPC | DEL | U_NP | U_NP |
182 123
183 124
184**** Hold 125***** Hold
185 126
186#+NAME: hold 127#+NAME: hold
187| RESET | | | | | | | | | RESET | 128| RESET | | | | | | | | | RESET |
188| LGUI | LALT | LCTL | LSFT | | | LSFT | LCTL | LALT | LGUI | 129| LGUI | LALT | LCTL | LSFT | | | LSFT | LCTL | LALT | LGUI |
189| | ALGR | | | | | | | ALGR | | 130| BUTTON | ALGR | | | | | | | ALGR | BUTTON |
190| U_NP | U_NP | MEDIA | NAV | MOUSE | SYM | NUM | FUN | U_NP | U_NP | 131| U_NP | U_NP | MEDIA | NAV | MOUSE | SYM | NUM | FUN | U_NP | U_NP |
191 132
192 133
193*** Nav 134**** Nav
194 135
195[[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/layers/miryoku-kle-nav.png]] 136[[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/layers/miryoku-kle-nav.png]]
196 137
@@ -209,7 +150,7 @@ available.
209| ENT | BSPC | DEL | U_NP | U_NP | 150| ENT | BSPC | DEL | U_NP | U_NP |
210 151
211 152
212*** Mouse 153**** Mouse
213 154
214[[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/layers/miryoku-kle-mouse.png]] 155[[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/layers/miryoku-kle-mouse.png]]
215 156
@@ -226,19 +167,24 @@ layer.
226| BTN1 | BTN3 | BTN2 | U_NP | U_NP | 167| BTN1 | BTN3 | BTN2 | U_NP | U_NP |
227 168
228 169
229*** Mouse Buttons Overlay 170**** Button
230 171
231Available for automatic activation depending on keyboard hardware and 172[[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/layers/miryoku-kle-button.png]]
232configuration. Not activated manually.
233 173
234#+NAME: mbo 174Provides mouse buttons, mods, and clipboard keys for use with integrated or
235| U_RDO | U_PST | U_CPY | U_CUT | U_UND | U_RDO | U_PST | U_CPY | U_CUT | U_UND | 175external pointing devices, used with either hand. The layer is available for
176automatic activation depending on hardware and configuration. It can also be
177activated manually by holding a bottom row pinkie key (however GUI and Undo will
178be unavailable).
179
180#+NAME: button
181| U_UND | U_CUT | U_CPY | U_PST | U_RDO | U_RDO | U_PST | U_CPY | U_CUT | U_UND |
236| LGUI | LALT | LCTL | LSFT | | | LSFT | LCTL | LALT | LGUI | 182| LGUI | LALT | LCTL | LSFT | | | LSFT | LCTL | LALT | LGUI |
237| | | | | | | | | | | 183| U_UND | U_CUT | U_CPY | U_PST | U_RDO | U_RDO | U_PST | U_CPY | U_CUT | U_UND |
238| U_NP | U_NP | BTN2 | BTN3 | BTN1 | BTN1 | BTN3 | BTN2 | U_NP | U_NP | 184| U_NP | U_NP | BTN2 | BTN3 | BTN1 | BTN1 | BTN3 | BTN2 | U_NP | U_NP |
239 185
240 186
241*** Media 187**** Media
242 188
243[[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/layers/miryoku-kle-media.png]] 189[[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/layers/miryoku-kle-media.png]]
244 190
@@ -254,7 +200,7 @@ available for other related functions.
254| MSTP | MPLY | MUTE | U_NP | U_NP | 200| MSTP | MPLY | MUTE | U_NP | U_NP |
255 201
256 202
257*** Num 203**** Num
258 204
259[[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/layers/miryoku-kle-num.png]] 205[[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/layers/miryoku-kle-num.png]]
260 206
@@ -269,7 +215,7 @@ Dot is duplicated from the base layer.
269| U_NP | U_NP | DOT | 0 | MINS | 215| U_NP | U_NP | DOT | 0 | MINS |
270 216
271 217
272*** Sym 218**** Sym
273 219
274[[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/layers/miryoku-kle-sym.png]] 220[[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/layers/miryoku-kle-sym.png]]
275 221
@@ -284,7 +230,7 @@ next to close parenthesis.
284| U_NP | U_NP | ( | ) | _ | 230| U_NP | U_NP | ( | ) | _ |
285 231
286 232
287*** Fun 233**** Fun
288 234
289[[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/layers/miryoku-kle-fun.png]] 235[[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/layers/miryoku-kle-fun.png]]
290 236
@@ -301,19 +247,29 @@ the base layer to enable auto-repeat.
301| U_NP | U_NP | APP | SPC | TAB | 247| U_NP | U_NP | APP | SPC | TAB |
302 248
303 249
304*** Alternative Layouts 250**** Alternative Layouts
305 251
306The defaults are recommended, but alternative layouts are provided to 252The defaults are recommended, but alternative layouts are provided to
307accommodate existing muscle memory and platform differences. 253accommodate existing muscle memory and platform differences.
308 254
309 255
310**** Alphas 256***** Alphas
311 257
312To select, append the corresponding option to the ~make~ command line when 258To select, append the corresponding option to the ~make~ command line when
313building, e.g. ~MIRYOKU_ALPHAS=QWERTY~. 259building, e.g. ~MIRYOKU_ALPHAS=QWERTY~.
314 260
315 261
316***** Colemak 262****** AZERTY
263
264~MIRYOKU_ALPHAS=AZERTY~
265
266#+NAME: azerty
267| A | Z | E | R | T | Y | U | I | O | P |
268| Q | S | D | F | G | H | J | K | L | M |
269| W | X | C | V | B | N | , | DOT | / | ' |
270
271
272****** Colemak
317 273
318~MIRYOKU_ALPHAS=COLEMAK~ 274~MIRYOKU_ALPHAS=COLEMAK~
319 275
@@ -323,7 +279,7 @@ building, e.g. ~MIRYOKU_ALPHAS=QWERTY~.
323| Z | X | C | V | B | K | M | , | DOT | / | 279| Z | X | C | V | B | K | M | , | DOT | / |
324 280
325 281
326***** Colemak Mod-DHk 282****** Colemak Mod-DHk
327 283
328~MIRYOKU_ALPHAS=COLEMAKDHK~ 284~MIRYOKU_ALPHAS=COLEMAKDHK~
329 285
@@ -333,7 +289,7 @@ building, e.g. ~MIRYOKU_ALPHAS=QWERTY~.
333| Z | X | C | D | V | M | H | , | DOT | / | 289| Z | X | C | D | V | M | H | , | DOT | / |
334 290
335 291
336***** Dvorak 292****** Dvorak
337 293
338~MIRYOKU_ALPHAS=DVORAK~ 294~MIRYOKU_ALPHAS=DVORAK~
339 295
@@ -343,7 +299,7 @@ building, e.g. ~MIRYOKU_ALPHAS=QWERTY~.
343| / | Q | J | K | X | B | M | W | V | Z | 299| / | Q | J | K | X | B | M | W | V | Z |
344 300
345 301
346***** Halmak 302****** Halmak
347 303
348~MIRYOKU_ALPHAS=HALMAK~ 304~MIRYOKU_ALPHAS=HALMAK~
349 305
@@ -353,7 +309,7 @@ building, e.g. ~MIRYOKU_ALPHAS=QWERTY~.
353| F | M | V | C | / | G | P | X | K | Y | 309| F | M | V | C | / | G | P | X | K | Y |
354 310
355 311
356***** Workman 312****** Workman
357 313
358~MIRYOKU_ALPHAS=WORKMAN~ 314~MIRYOKU_ALPHAS=WORKMAN~
359 315
@@ -363,7 +319,7 @@ building, e.g. ~MIRYOKU_ALPHAS=QWERTY~.
363| Z | X | M | C | V | K | L | , | DOT | / | 319| Z | X | M | C | V | K | L | , | DOT | / |
364 320
365 321
366***** QWERTY 322****** QWERTY
367 323
368~MIRYOKU_ALPHAS=QWERTY~ 324~MIRYOKU_ALPHAS=QWERTY~
369 325
@@ -373,16 +329,26 @@ building, e.g. ~MIRYOKU_ALPHAS=QWERTY~.
373| Z | X | C | V | B | N | M | , | DOT | / | 329| Z | X | C | V | B | N | M | , | DOT | / |
374 330
375 331
376**** Nav 332****** QWERTZ
333
334~MIRYOKU_ALPHAS=QWERTZ~
335
336#+NAME: qwertz
337| Q | W | E | R | T | Z | U | I | O | P |
338| A | S | D | F | G | H | J | K | L | ' |
339| Y | X | C | V | B | N | M | , | DOT | / |
377 340
378 341
379***** vi-Style 342***** Nav
343
344
345****** vi-Style
380 346
381To select, append ~MIRYOKU_NAV=VI~ to the ~make~ command line when building. 347To select, append ~MIRYOKU_NAV=VI~ to the ~make~ command line when building.
382Not available with ~MIRYOKU_LAYERS=FLIP~. 348Not available with ~MIRYOKU_LAYERS=FLIP~.
383 349
384 350
385****** Nav 351******* Nav
386 352
387#+NAME: nav-r-vi 353#+NAME: nav-r-vi
388| U_RDO | U_PST | U_CPY | U_CUT | U_UND | 354| U_RDO | U_PST | U_CPY | U_CUT | U_UND |
@@ -391,7 +357,7 @@ Not available with ~MIRYOKU_LAYERS=FLIP~.
391| ENT | BSPC | DEL | U_NP | U_NP | 357| ENT | BSPC | DEL | U_NP | U_NP |
392 358
393 359
394****** Mouse 360******* Mouse
395 361
396#+NAME: mouse-r-vi 362#+NAME: mouse-r-vi
397| U_RDO | U_PST | U_CPY | U_CUT | U_UND | 363| U_RDO | U_PST | U_CPY | U_CUT | U_UND |
@@ -400,7 +366,7 @@ Not available with ~MIRYOKU_LAYERS=FLIP~.
400| BTN1 | BTN3 | BTN2 | U_NP | U_NP | 366| BTN1 | BTN3 | BTN2 | U_NP | U_NP |
401 367
402 368
403****** Media 369******* Media
404 370
405#+NAME: media-r-vi 371#+NAME: media-r-vi
406| RGB_TOG | RGB_MOD | RGB_HUI | RGB_SAI | RGB_VAI | 372| RGB_TOG | RGB_MOD | RGB_HUI | RGB_SAI | RGB_VAI |
@@ -409,7 +375,7 @@ Not available with ~MIRYOKU_LAYERS=FLIP~.
409| MSTP | MPLY | MUTE | U_NP | U_NP | 375| MSTP | MPLY | MUTE | U_NP | U_NP |
410 376
411 377
412***** Inverted-T 378****** Inverted-T
413 379
414[[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/layers/miryoku-kle-reference-flip-invertedt.png]] 380[[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/layers/miryoku-kle-reference-flip-invertedt.png]]
415 381
@@ -417,7 +383,7 @@ To select, append ~MIRYOKU_NAV=INVERTEDT~ to the ~make~ command line when
417building. Only available with ~MIRYOKU_LAYERS=FLIP~. 383building. Only available with ~MIRYOKU_LAYERS=FLIP~.
418 384
419 385
420****** Nav 386******* Nav
421 387
422#+NAME: nav-l-invertedt 388#+NAME: nav-l-invertedt
423| PGUP | HOME | UP | END | INS | 389| PGUP | HOME | UP | END | INS |
@@ -426,7 +392,7 @@ building. Only available with ~MIRYOKU_LAYERS=FLIP~.
426| U_NP | U_NP | DEL | BSPC | ENT | 392| U_NP | U_NP | DEL | BSPC | ENT |
427 393
428 394
429****** Mouse 395******* Mouse
430 396
431#+NAME: mouse-l-invertedt 397#+NAME: mouse-l-invertedt
432| WH_U | WH_L | MS_U | WH_R | | 398| WH_U | WH_L | MS_U | WH_R | |
@@ -435,7 +401,7 @@ building. Only available with ~MIRYOKU_LAYERS=FLIP~.
435| U_NP | U_NP | BTN2 | BTN3 | BTN1 | 401| U_NP | U_NP | BTN2 | BTN3 | BTN1 |
436 402
437 403
438****** Media 404******* Media
439 405
440#+NAME: media-l-invertedt 406#+NAME: media-l-invertedt
441| | | VOLU | | | 407| | | VOLU | | |
@@ -444,7 +410,7 @@ building. Only available with ~MIRYOKU_LAYERS=FLIP~.
444| U_NP | U_NP | MUTE | MPLY | MSTP | 410| U_NP | U_NP | MUTE | MPLY | MSTP |
445 411
446 412
447**** Clipboard 413***** Clipboard
448 414
449Keycodes are translated according to the following tables. 415Keycodes are translated according to the following tables.
450 416
@@ -457,7 +423,7 @@ To select, append the corresponding option to the ~make~ command line when
457building, e.g. ~MIRYOKU_CLIPBOARD=WIN~. 423building, e.g. ~MIRYOKU_CLIPBOARD=WIN~.
458 424
459 425
460***** Default 426****** Default
461 427
462#+NAME: clipboard 428#+NAME: clipboard
463| U_RDO | AGIN | 429| U_RDO | AGIN |
@@ -467,7 +433,7 @@ building, e.g. ~MIRYOKU_CLIPBOARD=WIN~.
467| U_UND | UNDO | 433| U_UND | UNDO |
468 434
469 435
470***** Fun Cluster 436****** Fun Cluster
471 437
472~MIRYOKU_CLIPBOARD=FUN~ 438~MIRYOKU_CLIPBOARD=FUN~
473 439
@@ -479,7 +445,7 @@ building, e.g. ~MIRYOKU_CLIPBOARD=WIN~.
479| U_UND | UNDO | 445| U_UND | UNDO |
480 446
481 447
482***** Mac 448****** Mac
483 449
484~MIRYOKU_CLIPBOARD=MAC~ 450~MIRYOKU_CLIPBOARD=MAC~
485 451
@@ -491,7 +457,7 @@ building, e.g. ~MIRYOKU_CLIPBOARD=WIN~.
491| U_UND | LCMD(KC_Z) | 457| U_UND | LCMD(KC_Z) |
492 458
493 459
494***** Windows 460****** Windows
495 461
496~MIRYOKU_CLIPBOARD=WIN~ 462~MIRYOKU_CLIPBOARD=WIN~
497 463
@@ -503,32 +469,32 @@ building, e.g. ~MIRYOKU_CLIPBOARD=WIN~.
503| U_UND | C(KC_Z) | 469| U_UND | C(KC_Z) |
504 470
505 471
506**** Layers 472***** Layers
507 473
508 474
509***** Flip 475****** Flip
510 476
511Flip base layer thumb keys and sub layers between right and left hands. 477Flip base layer thumb keys and sub layers between right and left hands.
512 478
513To select, append ~MIRYOKU_LAYERS=FLIP~ to the ~make~ command line when building. 479To select, append ~MIRYOKU_LAYERS=FLIP~ to the ~make~ command line when building.
514 480
515 481
516****** Thumbs 482******* Thumbs
517 483
518#+NAME: thumbs-flip 484#+NAME: thumbs-flip
519| U_NP | U_NP | DEL | BSPC | ENT | TAB | SPC | ESC | U_NP | U_NP | 485| U_NP | U_NP | DEL | BSPC | ENT | TAB | SPC | ESC | U_NP | U_NP |
520 486
521 487
522****** Hold 488******* Hold
523 489
524#+NAME: hold-flip 490#+NAME: hold-flip
525| RESET | | | | | | | | | RESET | 491| RESET | | | | | | | | | RESET |
526| LGUI | LALT | LCTL | LSFT | | | LSFT | LCTL | LALT | LGUI | 492| LGUI | LALT | LCTL | LSFT | | | LSFT | LCTL | LALT | LGUI |
527| | ALGR | | | | | | | ALGR | | 493| BUTTON | ALGR | | | | | | | ALGR | BUTTON |
528| U_NP | U_NP | FUN | NUM | SYM | MOUSE | NAV | MEDIA | U_NP | U_NP | 494| U_NP | U_NP | FUN | NUM | SYM | MOUSE | NAV | MEDIA | U_NP | U_NP |
529 495
530 496
531****** Nav 497******* Nav
532 498
533#+NAME: nav-l 499#+NAME: nav-l
534| HOME | PGDN | PGUP | END | INS | 500| HOME | PGDN | PGUP | END | INS |
@@ -537,7 +503,7 @@ To select, append ~MIRYOKU_LAYERS=FLIP~ to the ~make~ command line when building
537| U_NP | U_NP | DEL | BSPC | ENT | 503| U_NP | U_NP | DEL | BSPC | ENT |
538 504
539 505
540****** Mouse 506******* Mouse
541 507
542#+NAME: mouse-l 508#+NAME: mouse-l
543| WH_L | WH_D | WH_U | WH_R | | 509| WH_L | WH_D | WH_U | WH_R | |
@@ -546,16 +512,7 @@ To select, append ~MIRYOKU_LAYERS=FLIP~ to the ~make~ command line when building
546| U_NP | U_NP | BTN2 | BTN3 | BTN1 | 512| U_NP | U_NP | BTN2 | BTN3 | BTN1 |
547 513
548 514
549****** Mouse Buttons Overlay 515******* Media
550
551#+NAME: mbo-flip
552| | | | | | | | | | |
553| LGUI | LALT | LCTL | LSFT | | | LSFT | LCTL | LALT | LGUI |
554| U_RDO | U_PST | U_CPY | U_CUT | U_UND | U_RDO | U_PST | U_CPY | U_CUT | U_UND |
555| U_NP | U_NP | BTN2 | BTN3 | BTN1 | BTN1 | BTN3 | BTN2 | U_NP | U_NP |
556
557
558****** Media
559 516
560#+NAME: media-l 517#+NAME: media-l
561| RGB_MOD | RGB_HUI | RGB_SAI | RGB_VAI | RGB_TOG | 518| RGB_MOD | RGB_HUI | RGB_SAI | RGB_VAI | RGB_TOG |
@@ -564,7 +521,7 @@ To select, append ~MIRYOKU_LAYERS=FLIP~ to the ~make~ command line when building
564| U_NP | U_NP | MUTE | MPLY | MSTP | 521| U_NP | U_NP | MUTE | MPLY | MSTP |
565 522
566 523
567****** Num 524******* Num
568 525
569#+NAME: num-r 526#+NAME: num-r
570| [ | 7 | 8 | 9 | ] | 527| [ | 7 | 8 | 9 | ] |
@@ -573,7 +530,7 @@ To select, append ~MIRYOKU_LAYERS=FLIP~ to the ~make~ command line when building
573| MINS | 0 | DOT | U_NP | U_NP | 530| MINS | 0 | DOT | U_NP | U_NP |
574 531
575 532
576****** Sym 533******* Sym
577 534
578#+NAME: sym-r 535#+NAME: sym-r
579| { | & | * | ( | } | 536| { | & | * | ( | } |
@@ -582,7 +539,7 @@ To select, append ~MIRYOKU_LAYERS=FLIP~ to the ~make~ command line when building
582| _ | ( | ) | U_NP | U_NP | 539| _ | ( | ) | U_NP | U_NP |
583 540
584 541
585****** Fun 542******* Fun
586 543
587#+NAME: fun-r 544#+NAME: fun-r
588| PSCR | F7 | F8 | F9 | F12 | 545| PSCR | F7 | F8 | F9 | F12 |
@@ -591,7 +548,7 @@ To select, append ~MIRYOKU_LAYERS=FLIP~ to the ~make~ command line when building
591| TAB | SPC | APP | U_NP | U_NP | 548| TAB | SPC | APP | U_NP | U_NP |
592 549
593 550
594*** COMMENT Templates 551**** COMMENT Templates
595 552
596#+NAME: tem 553#+NAME: tem
597| <l4> | <l4> | <l4> | <l4> | <l4> | <l4> | <l4> | <l4> | <l4> | <l4> | 554| <l4> | <l4> | <l4> | <l4> | <l4> | <l4> | <l4> | <l4> | <l4> | <l4> |
@@ -621,13 +578,16 @@ Duplicate base layer tap keys on thumbs rather than trans to enable auto-repeat.
621| U_NP | U_NP | ESC | SPC | TAB | 578| U_NP | U_NP | ESC | SPC | TAB |
622 579
623 580
624* Code Generation 581** Code Generation
582
583The layout is maintained in emacs org-mode tables and converted to QMK keymap
584data structures using embedded python scripts.
625 585
626 586
627** Table Conversion Scripts 587*** Table Conversion Scripts
628 588
629 589
630*** table-layout-taphold 590**** table-layout-taphold
631 591
632Produce base layer from separate tap and hold tables. 592Produce base layer from separate tap and hold tables.
633 593
@@ -669,7 +629,7 @@ return results
669: U_NP, U_NP, LT(MEDIA, KC_ESC), LT(NAV, KC_SPC), LT(MOUSE, KC_TAB), LT(SYM, KC_ENT), LT(NUM, KC_BSPC), LT(FUN, KC_DEL), U_NP, U_NP 629: U_NP, U_NP, LT(MEDIA, KC_ESC), LT(NAV, KC_SPC), LT(MOUSE, KC_TAB), LT(SYM, KC_ENT), LT(NUM, KC_BSPC), LT(FUN, KC_DEL), U_NP, U_NP
670 630
671 631
672*** table-layout-half 632**** table-layout-half
673 633
674Produce sub layers given layer name and corresponding table for single hand and 634Produce sub layers given layer name and corresponding table for single hand and
675incorporating mods and reset from base layer. Layer names must end with 'R' or 635incorporating mods and reset from base layer. Layer names must end with 'R' or
@@ -726,12 +686,12 @@ return results
726: U_NP, U_NP, U_NA, U_NA, U_NA, KC_ENT, KC_BSPC, KC_DEL, U_NP, U_NP 686: U_NP, U_NP, U_NA, U_NA, U_NA, KC_ENT, KC_BSPC, KC_DEL, U_NP, U_NP
727 687
728 688
729*** table-layout-full 689**** table-layout-full
730 690
731Produce full layer from single table. Fill for unused keys is configurable. 691Produce full layer from single table. Fill for unused keys is configurable.
732 692
733#+NAME: table-layout-full 693#+NAME: table-layout-full
734#+BEGIN_SRC python :var table=mbo :var fill="TRNS" :var symbol_names_table=symbol-names :var nonkc_table=nonkc :tangle no :results verbatim 694#+BEGIN_SRC python :var table=button :var fill="TRNS" :var symbol_names_table=symbol-names :var nonkc_table=nonkc :tangle no :results verbatim
735width = 9 695width = 9
736symbol_names_dict = {} 696symbol_names_dict = {}
737nonkc_tuple = tuple(nonkc_table[0]) 697nonkc_tuple = tuple(nonkc_table[0])
@@ -757,33 +717,33 @@ return results
757#+END_SRC 717#+END_SRC
758 718
759#+RESULTS: table-layout-full 719#+RESULTS: table-layout-full
760: U_RDO, U_PST, U_CPY, U_CUT, U_UND, U_RDO, U_PST, U_CPY, U_CUT, U_UND, 720: U_UND, U_CUT, U_CPY, U_PST, U_RDO, U_RDO, U_PST, U_CPY, U_CUT, U_UND,
761: KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, KC_TRNS, KC_TRNS, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, 721: KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, KC_TRNS, KC_TRNS, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI,
762: KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 722: U_UND, U_CUT, U_CPY, U_PST, U_RDO, U_RDO, U_PST, U_CPY, U_CUT, U_UND,
763: U_NP, U_NP, KC_BTN2, KC_BTN3, KC_BTN1, KC_BTN1, KC_BTN3, KC_BTN2, U_NP, U_NP 723: U_NP, U_NP, KC_BTN2, KC_BTN3, KC_BTN1, KC_BTN1, KC_BTN3, KC_BTN2, U_NP, U_NP
764 724
765 725
766*** table-enums 726**** table-enums
767 727
768Produce layer enums from layer names in hold table. 728Produce layer enums from layer names in hold table.
769 729
770#+NAME: table-enums 730#+NAME: table-enums
771#+BEGIN_SRC python :var hold_table=hold :var mods_table=mods :tangle no 731#+BEGIN_SRC python :var hold_table=hold :var mods_table=mods :tangle no
772mods_dict = dict.fromkeys(mods_table[0]) 732mods_dict = dict.fromkeys(mods_table[0])
773results = 'enum layers { BASE, MBO, ' 733layers = [ 'BASE', 'BUTTON' ]
774for hold_row in hold_table: 734for hold_row in hold_table:
775 for hold in hold_row: 735 for hold in hold_row:
776 if hold not in mods_dict and hold != '' and hold != 'U_NP' and hold != 'RESET': 736 if hold not in mods_dict and hold != '' and hold != 'U_NP' and hold != 'RESET' and hold not in layers:
777 results += hold + ', ' 737 layers.append(hold)
778results = results.rstrip(', ') + ' };' 738results = 'enum layers { ' + ', '.join(layers) + ' };'
779return results 739return results
780#+END_SRC 740#+END_SRC
781 741
782#+RESULTS: table-enums 742#+RESULTS: table-enums
783: enum layers { BASE, MBO, MEDIA, NAV, MOUSE, SYM, NUM, FUN }; 743: enum layers { BASE, BUTTON, MEDIA, NAV, MOUSE, SYM, NUM, FUN };
784 744
785 745
786*** table-keycode-mappings 746**** table-keycode-mappings
787 747
788Produce keycode mappings according to the provided table. 748Produce keycode mappings according to the provided table.
789 749
@@ -816,7 +776,7 @@ return results
816: #define U_UND KC_UNDO 776: #define U_UND KC_UNDO
817 777
818 778
819*** COMMENT python-version 779**** COMMENT python-version
820 780
821C-c C-c in code block to update 781C-c C-c in code block to update
822 782
@@ -831,10 +791,10 @@ return sys.version
831: [GCC 5.4.0 20160609] 791: [GCC 5.4.0 20160609]
832 792
833 793
834** Data 794*** Data
835 795
836 796
837*** symbol-names 797**** symbol-names
838 798
839Symbol, name, and shifted symbol mappings for use in tables. 799Symbol, name, and shifted symbol mappings for use in tables.
840 800
@@ -862,7 +822,7 @@ Symbol, name, and shifted symbol mappings for use in tables.
862| 0 | 0 | ) | RPRN | 822| 0 | 0 | ) | RPRN |
863 823
864 824
865*** mods 825**** mods
866 826
867Modifiers usable in hold table. Need to have the same name for ~KC_~ and ~_T~ 827Modifiers usable in hold table. Need to have the same name for ~KC_~ and ~_T~
868versions. 828versions.
@@ -871,7 +831,7 @@ versions.
871| LSFT | LCTL | LALT | LGUI | ALGR | 831| LSFT | LCTL | LALT | LGUI | ALGR |
872 832
873 833
874*** nonkc 834**** nonkc
875 835
876Keycodes that match any of these prefixes will not have ~KC_~ automatically 836Keycodes that match any of these prefixes will not have ~KC_~ automatically
877prepended. 837prepended.
@@ -880,7 +840,7 @@ prepended.
880| U_ | RGB_ | RESET | S( | C( | SCMD( | LCMD( | 840| U_ | RGB_ | RESET | S( | C( | SCMD( | LCMD( |
881 841
882 842
883*** header 843**** header
884 844
885Header for tangled files. 845Header for tangled files.
886 846
@@ -888,11 +848,11 @@ Header for tangled files.
888#+BEGIN_SRC C :main no :tangle no 848#+BEGIN_SRC C :main no :tangle no
889Copyright 2019 Manna Harbour 849Copyright 2019 Manna Harbour
890https://github.com/manna-harbour/miryoku 850https://github.com/manna-harbour/miryoku
891generated from users/manna-harbour_miryoku/miryoku.org -*- buffer-read-only: t -*- 851generated -*- buffer-read-only: t -*-
892#+END_SRC 852#+END_SRC
893 853
894 854
895*** license-qmk 855**** license-qmk
896 856
897License for tangled QMK C source files. 857License for tangled QMK C source files.
898 858
@@ -902,20 +862,21 @@ License for tangled QMK C source files.
902#+END_SRC 862#+END_SRC
903 863
904 864
905* Subset Mapping 865** Subset Mapping
906 866
907The keymap, build options, and configuration are shared between keyboards. The 867The keymap, build options, and configuration are shared between keyboards. The
908layout is mapped onto keyboards with different physical layouts as a subset. 868layout is mapped onto keyboards with different physical layouts as a subset
869without code duplication using the QMK userspace feature and C macros.
909 870
910 871
911** Userspace 872*** Userspace
912 873
913The keymap is defined for ~LAYOUT_miryoku~ which is 10x4, with the outer 2 874The keymap is defined for ~LAYOUT_miryoku~ which is 10x4, with the outer 2
914positions on the bottom row unused and the rest of the bottom row being the 875positions on the bottom row unused and the rest of the bottom row being the
915thumb keys. 876thumb keys.
916 877
917 878
918*** [[./rules.mk][users/manna-harbour_miryoku/rules.mk]] 879**** [[./rules.mk][users/manna-harbour_miryoku/rules.mk]]
919 880
920Build options. Automatically included. 881Build options. Automatically included.
921 882
@@ -957,7 +918,7 @@ endif
957#+END_SRC 918#+END_SRC
958 919
959 920
960*** [[./config.h][users/manna-harbour_miryoku/config.h]] 921**** [[./config.h][users/manna-harbour_miryoku/config.h]]
961 922
962Config options. Automatically included. 923Config options. Automatically included.
963 924
@@ -1000,7 +961,7 @@ Config options. Automatically included.
1000#+END_SRC 961#+END_SRC
1001 962
1002 963
1003*** [[./manna-harbour_miryoku.h][users/manna-harbour_miryoku/manna-harbour_miryoku.h]] 964**** [[./manna-harbour_miryoku.h][users/manna-harbour_miryoku/manna-harbour_miryoku.h]]
1004 965
1005Keymap-related definitions. Included from ~manna-harbour_miryoku.c~. Can be 966Keymap-related definitions. Included from ~manna-harbour_miryoku.c~. Can be
1006included from keymap or layout ~keymap.c~ if needed. 967included from keymap or layout ~keymap.c~ if needed.
@@ -1034,7 +995,7 @@ included from keymap or layout ~keymap.c~ if needed.
1034#+END_SRC 995#+END_SRC
1035 996
1036 997
1037*** [[./manna-harbour_miryoku.c][users/manna-harbour_miryoku/manna-harbour_miryoku.c]] 998**** [[./manna-harbour_miryoku.c][users/manna-harbour_miryoku/manna-harbour_miryoku.c]]
1038 999
1039Contains the keymap. Added from ~rules.mk~. 1000Contains the keymap. Added from ~rules.mk~.
1040 1001
@@ -1048,7 +1009,9 @@ Contains the keymap. Added from ~rules.mk~.
1048const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 1009const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1049#if defined MIRYOKU_LAYERS_FLIP 1010#if defined MIRYOKU_LAYERS_FLIP
1050 [BASE] = LAYOUT_miryoku( 1011 [BASE] = LAYOUT_miryoku(
1051 #if defined MIRYOKU_ALPHAS_COLEMAK 1012 #if defined MIRYOKU_ALPHAS_AZERTY
1013<<table-layout-taphold(alphas_table=azerty, thumbs_table=thumbs-flip, hold_table=hold-flip)>>
1014 #elif defined MIRYOKU_ALPHAS_COLEMAK
1052<<table-layout-taphold(alphas_table=colemak, thumbs_table=thumbs-flip, hold_table=hold-flip)>> 1015<<table-layout-taphold(alphas_table=colemak, thumbs_table=thumbs-flip, hold_table=hold-flip)>>
1053 #elif defined MIRYOKU_ALPHAS_COLEMAKDHK 1016 #elif defined MIRYOKU_ALPHAS_COLEMAKDHK
1054<<table-layout-taphold(alphas_table=colemakdhk, thumbs_table=thumbs-flip, hold_table=hold-flip)>> 1017<<table-layout-taphold(alphas_table=colemakdhk, thumbs_table=thumbs-flip, hold_table=hold-flip)>>
@@ -1060,6 +1023,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1060<<table-layout-taphold(alphas_table=workman, thumbs_table=thumbs-flip, hold_table=hold-flip)>> 1023<<table-layout-taphold(alphas_table=workman, thumbs_table=thumbs-flip, hold_table=hold-flip)>>
1061 #elif defined MIRYOKU_ALPHAS_QWERTY 1024 #elif defined MIRYOKU_ALPHAS_QWERTY
1062<<table-layout-taphold(alphas_table=qwerty, thumbs_table=thumbs-flip, hold_table=hold-flip)>> 1025<<table-layout-taphold(alphas_table=qwerty, thumbs_table=thumbs-flip, hold_table=hold-flip)>>
1026 #elif defined MIRYOKU_ALPHAS_QWERTZ
1027<<table-layout-taphold(alphas_table=qwertz, thumbs_table=thumbs-flip, hold_table=hold-flip)>>
1063 #else 1028 #else
1064<<table-layout-taphold(alphas_table=colemakdh, thumbs_table=thumbs-flip, hold_table=hold-flip)>> 1029<<table-layout-taphold(alphas_table=colemakdh, thumbs_table=thumbs-flip, hold_table=hold-flip)>>
1065 #endif 1030 #endif
@@ -1085,9 +1050,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1085<<table-layout-half(half_table=media-l, mode="l", hold_table=hold-flip)>> 1050<<table-layout-half(half_table=media-l, mode="l", hold_table=hold-flip)>>
1086 ), 1051 ),
1087 #endif 1052 #endif
1088 [MBO] = LAYOUT_miryoku(
1089<<table-layout-full(table=mbo, fill="TRNS")>>
1090 ),
1091 [NUM] = LAYOUT_miryoku( 1053 [NUM] = LAYOUT_miryoku(
1092<<table-layout-half(half_table=num-r, mode="r", hold_table=hold-flip)>> 1054<<table-layout-half(half_table=num-r, mode="r", hold_table=hold-flip)>>
1093 ), 1055 ),
@@ -1096,11 +1058,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1096 ), 1058 ),
1097 [FUN] = LAYOUT_miryoku( 1059 [FUN] = LAYOUT_miryoku(
1098<<table-layout-half(half_table=fun-r, mode="r", hold_table=hold-flip)>> 1060<<table-layout-half(half_table=fun-r, mode="r", hold_table=hold-flip)>>
1099 ) 1061 ),
1100,
1101#else 1062#else
1102 [BASE] = LAYOUT_miryoku( 1063 [BASE] = LAYOUT_miryoku(
1103 #if defined MIRYOKU_ALPHAS_COLEMAK 1064 #if defined MIRYOKU_ALPHAS_AZERTY
1065<<table-layout-taphold(alphas_table=azerty)>>
1066 #elif defined MIRYOKU_ALPHAS_COLEMAK
1104<<table-layout-taphold(alphas_table=colemak)>> 1067<<table-layout-taphold(alphas_table=colemak)>>
1105 #elif defined MIRYOKU_ALPHAS_COLEMAKDHK 1068 #elif defined MIRYOKU_ALPHAS_COLEMAKDHK
1106<<table-layout-taphold(alphas_table=colemakdhk)>> 1069<<table-layout-taphold(alphas_table=colemakdhk)>>
@@ -1112,6 +1075,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1112<<table-layout-taphold(alphas_table=workman)>> 1075<<table-layout-taphold(alphas_table=workman)>>
1113 #elif defined MIRYOKU_ALPHAS_QWERTY 1076 #elif defined MIRYOKU_ALPHAS_QWERTY
1114<<table-layout-taphold(alphas_table=qwerty)>> 1077<<table-layout-taphold(alphas_table=qwerty)>>
1078 #elif defined MIRYOKU_ALPHAS_QWERTZ
1079<<table-layout-taphold(alphas_table=qwertz)>>
1115 #else 1080 #else
1116<<table-layout-taphold(alphas_table=colemakdh)>> 1081<<table-layout-taphold(alphas_table=colemakdh)>>
1117 #endif 1082 #endif
@@ -1137,9 +1102,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1137<<table-layout-half(half_table=media-r, mode="r")>> 1102<<table-layout-half(half_table=media-r, mode="r")>>
1138 ), 1103 ),
1139 #endif 1104 #endif
1140 [MBO] = LAYOUT_miryoku(
1141<<table-layout-full(table=mbo-flip, fill="TRNS")>>
1142 ),
1143 [NUM] = LAYOUT_miryoku( 1105 [NUM] = LAYOUT_miryoku(
1144<<table-layout-half(half_table=num-l, mode="l")>> 1106<<table-layout-half(half_table=num-l, mode="l")>>
1145 ), 1107 ),
@@ -1148,13 +1110,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1148 ), 1110 ),
1149 [FUN] = LAYOUT_miryoku( 1111 [FUN] = LAYOUT_miryoku(
1150<<table-layout-half(half_table=fun-l, mode="l")>> 1112<<table-layout-half(half_table=fun-l, mode="l")>>
1151 ) 1113 ),
1152#endif 1114#endif
1115 [BUTTON] = LAYOUT_miryoku(
1116<<table-layout-full(table=button)>>
1117 )
1153}; 1118};
1154#+END_SRC 1119#+END_SRC
1155 1120
1156 1121
1157** Layouts 1122*** Layouts
1158 1123
1159To use the keymap on a keyboard supporting the layouts feature, ~LAYOUT_miryoku~ 1124To use the keymap on a keyboard supporting the layouts feature, ~LAYOUT_miryoku~
1160is defined as a macro mapping onto the layout's own ~LAYOUT~ macro, leaving the 1125is defined as a macro mapping onto the layout's own ~LAYOUT~ macro, leaving the
@@ -1170,7 +1135,7 @@ make planck/rev6:manna-harbour_miryoku:flash FORCE_LAYOUT=ortho_4x12 # ortho_4x1
1170#+END_SRC 1135#+END_SRC
1171 1136
1172 1137
1173*** 60_ansi 1138**** 60_ansi
1174 1139
1175An angled ortho split layout is mapped onto the row-staggered keyboard. The 1140An angled ortho split layout is mapped onto the row-staggered keyboard. The
1176rows are moved up to better position the thumb keys, the hands are separated as 1141rows are moved up to better position the thumb keys, the hands are separated as
@@ -1185,6 +1150,11 @@ command line when building.
1185 1150
1186[[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/mapping/miryoku-kle-mapping-60_ansi-noreverseangle.png]] 1151[[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/mapping/miryoku-kle-mapping-60_ansi-noreverseangle.png]]
1187 1152
1153Another alternative subset mapping is provided mapping only the 3x10 alphas,
1154plus spacebar for space / Nav, with the remainder being the default 60_ansi
1155keymap with semicolon in place of quote. To select this mapping, append
1156~MIRYOKU_MAPPING=LITE~ to the ~make~ command line when building.
1157
1188Keyboards supporting this layout: alps64, amj60, bakeneko60, bm60poker, bm60rgb, do60, dp60, dz60, facew, gskt00, infinity60, jm60, kc60, kc60se, ok60, org60, paladin64, panc60, reviung61, smk60, v60_type_r, yd60mq, 1upkeyboards/1up60hse, 1upkeyboards/1up60rgb, 40percentclub/luddite, acheron/keebspcb, acheron/lasgweloth, ai03/polaris, akegata_denki/device_one, atxkb/1894, bioi/g60ble, bt66tech/bt66tech60, cannonkeys/an_c, cannonkeys/instant60, cannonkeys/practice60, clawsome/coupe, dm9records/tartan, duck/eagle_viper, evyd13/plain60, exclusive/e6_rgb, gh60/revc, gh60/satan, gh60/v1p3, handwired/xealousbrown, hineybush/h60, hs60/v1, keebio/wtf60, noxary/260, playkbtw/pk60, ryloo_studio/m0110, thevankeyboards/bananasplit, wilba_tech/zeal60, xd60/rev2, xd60/rev3, cannonkeys/db60/hotswap, cannonkeys/db60/j02, cannonkeys/db60/rev2, exclusive/e6v2/le, exclusive/e6v2/oe, foxlab/leaf60/universal, handwired/co60/rev1, handwired/co60/rev7, handwired/swiftrax/nodu, hs60/v2/ansi, inett_studio/sqx/universal, melgeek/mj61/rev1, melgeek/mj61/rev2, melgeek/mj63/rev1, melgeek/mj63/rev2, sentraq/s60_x/default, sentraq/s60_x/rgb. 1158Keyboards supporting this layout: alps64, amj60, bakeneko60, bm60poker, bm60rgb, do60, dp60, dz60, facew, gskt00, infinity60, jm60, kc60, kc60se, ok60, org60, paladin64, panc60, reviung61, smk60, v60_type_r, yd60mq, 1upkeyboards/1up60hse, 1upkeyboards/1up60rgb, 40percentclub/luddite, acheron/keebspcb, acheron/lasgweloth, ai03/polaris, akegata_denki/device_one, atxkb/1894, bioi/g60ble, bt66tech/bt66tech60, cannonkeys/an_c, cannonkeys/instant60, cannonkeys/practice60, clawsome/coupe, dm9records/tartan, duck/eagle_viper, evyd13/plain60, exclusive/e6_rgb, gh60/revc, gh60/satan, gh60/v1p3, handwired/xealousbrown, hineybush/h60, hs60/v1, keebio/wtf60, noxary/260, playkbtw/pk60, ryloo_studio/m0110, thevankeyboards/bananasplit, wilba_tech/zeal60, xd60/rev2, xd60/rev3, cannonkeys/db60/hotswap, cannonkeys/db60/j02, cannonkeys/db60/rev2, exclusive/e6v2/le, exclusive/e6v2/oe, foxlab/leaf60/universal, handwired/co60/rev1, handwired/co60/rev7, handwired/swiftrax/nodu, hs60/v2/ansi, inett_studio/sqx/universal, melgeek/mj61/rev1, melgeek/mj61/rev2, melgeek/mj63/rev1, melgeek/mj63/rev2, sentraq/s60_x/default, sentraq/s60_x/rgb.
1189 1159
1190Example build command lines: 1160Example build command lines:
@@ -1192,10 +1162,11 @@ Example build command lines:
1192#+BEGIN_SRC sh :tangle no 1162#+BEGIN_SRC sh :tangle no
1193make dz60:manna-harbour_miryoku:flash # dz60 1163make dz60:manna-harbour_miryoku:flash # dz60
1194make dz60:manna-harbour_miryoku:flash MIRYOKU_MAPPING=NOREVERSEANGLE # dz60, without reverse column angle 1164make dz60:manna-harbour_miryoku:flash MIRYOKU_MAPPING=NOREVERSEANGLE # dz60, without reverse column angle
1165make dz60:manna-harbour_miryoku:flash MIRYOKU_MAPPING=LITE # dz60, with lite mapping
1195#+END_SRC 1166#+END_SRC
1196 1167
1197 1168
1198**** [[../../layouts/community/60_ansi/manna-harbour_miryoku/config.h][layouts/community/60_ansi/manna-harbour_miryoku/config.h]] 1169***** [[../../layouts/community/60_ansi/manna-harbour_miryoku/config.h][layouts/community/60_ansi/manna-harbour_miryoku/config.h]]
1199 1170
1200Contains subset mapping. 1171Contains subset mapping.
1201 1172
@@ -1209,7 +1180,7 @@ Contains subset mapping.
1209#define XXX KC_NO 1180#define XXX KC_NO
1210 1181
1211#if defined MIRYOKU_MAPPING_NOREVERSEANGLE 1182#if defined MIRYOKU_MAPPING_NOREVERSEANGLE
1212#define LAYOUT_miryoku(\ 1183 #define LAYOUT_miryoku(\
1213K00, K01, K02, K03, K04, K05, K06, K07, K08, K09,\ 1184K00, K01, K02, K03, K04, K05, K06, K07, K08, K09,\
1214K10, K11, K12, K13, K14, K15, K16, K17, K18, K19,\ 1185K10, K11, K12, K13, K14, K15, K16, K17, K18, K19,\
1215K20, K21, K22, K23, K24, K25, K26, K27, K28, K29,\ 1186K20, K21, K22, K23, K24, K25, K26, K27, K28, K29,\
@@ -1222,8 +1193,38 @@ K00, K01, K02, K03, K04, XXX, XXX, XXX, K05, K06, K07, K08, K09, XX
1222 XXX, K32, K33, K34, XXX, XXX, XXX, XXX, K35, K36, K37, XXX,\ 1193 XXX, K32, K33, K34, XXX, XXX, XXX, XXX, K35, K36, K37, XXX,\
1223 XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX\ 1194 XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX\
1224) 1195)
1196#elif defined MIRYOKU_MAPPING_LITE
1197 #if defined MIRYOKU_LAYERS_FLIP
1198 #define LAYOUT_miryoku( \
1199 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
1200 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
1201 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
1202 N30, N31, K32, K33, K34, K35, K36, K37, N38, N39 \
1203) \
1204LAYOUT_60_ansi( \
1205KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \
1206KC_TAB, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, KC_LBRC, KC_RBRC, KC_BSLS, \
1207KC_CAPS, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, KC_SCLN, KC_ENT, \
1208KC_LSFT, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, KC_RSFT, \
1209KC_LCTL, KC_LGUI, KC_LALT, K36, KC_RALT, KC_RGUI, KC_APP, KC_RCTL \
1210)
1211 #else
1212 #define LAYOUT_miryoku( \
1213 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
1214 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
1215 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
1216 N30, N31, K32, K33, K34, K35, K36, K37, N38, N39 \
1217) \
1218LAYOUT_60_ansi( \
1219KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \
1220KC_TAB, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, KC_LBRC, KC_RBRC, KC_BSLS, \
1221KC_CAPS, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, KC_SCLN, KC_ENT, \
1222KC_LSFT, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, KC_RSFT, \
1223KC_LCTL, KC_LGUI, KC_LALT, K33, KC_RALT, KC_RGUI, KC_APP, KC_RCTL \
1224)
1225 #endif
1225#else 1226#else
1226#define LAYOUT_miryoku(\ 1227 #define LAYOUT_miryoku(\
1227 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09,\ 1228 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09,\
1228 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19,\ 1229 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19,\
1229 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29,\ 1230 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29,\
@@ -1240,7 +1241,7 @@ XXX, XXX, K00, K01, K02, K03, K04, XXX, K05, K06, K07, K08, K09, XX
1240#+END_SRC 1241#+END_SRC
1241 1242
1242 1243
1243**** [[../../layouts/community/60_ansi/manna-harbour_miryoku/keymap.c][layouts/community/60_ansi/manna-harbour_miryoku/keymap.c]] 1244***** [[../../layouts/community/60_ansi/manna-harbour_miryoku/keymap.c][layouts/community/60_ansi/manna-harbour_miryoku/keymap.c]]
1244 1245
1245Required by the build system. 1246Required by the build system.
1246 1247
@@ -1251,7 +1252,7 @@ Required by the build system.
1251#+END_SRC 1252#+END_SRC
1252 1253
1253 1254
1254*** ergodox 1255**** ergodox
1255 1256
1256For the ergodox layout, the main 5x3 alphas are used as usual. The primary and 1257For the ergodox layout, the main 5x3 alphas are used as usual. The primary and
1257secondary thumb keys are the inner and outer 2u thumb keys and the tertiary 1258secondary thumb keys are the inner and outer 2u thumb keys and the tertiary
@@ -1270,7 +1271,7 @@ make ergodox_ez:manna-harbour_miryoku:flash # ergodox_ez
1270#+END_SRC 1271#+END_SRC
1271 1272
1272 1273
1273**** [[../../layouts/community/ergodox/manna-harbour_miryoku/config.h][layouts/community/ergodox/manna-harbour_miryoku/config.h]] 1274***** [[../../layouts/community/ergodox/manna-harbour_miryoku/config.h][layouts/community/ergodox/manna-harbour_miryoku/config.h]]
1274 1275
1275Contains subset mapping. 1276Contains subset mapping.
1276 1277
@@ -1302,7 +1303,7 @@ XXX, XXX, XXX, XXX, K32, K37, XXX, XXX, XXX, XXX,\
1302#+END_SRC 1303#+END_SRC
1303 1304
1304 1305
1305**** [[../../layouts/community/ergodox/manna-harbour_miryoku/keymap.c][layouts/community/ergodox/manna-harbour_miryoku/keymap.c]] 1306***** [[../../layouts/community/ergodox/manna-harbour_miryoku/keymap.c][layouts/community/ergodox/manna-harbour_miryoku/keymap.c]]
1306 1307
1307Required by the build system. 1308Required by the build system.
1308 1309
@@ -1313,7 +1314,9 @@ Required by the build system.
1313#+END_SRC 1314#+END_SRC
1314 1315
1315 1316
1316*** ortho_4x10 1317**** ortho_4x10
1318
1319An alternative with 180 degree rotation is also provided to enable the USB cable to be relocated for use with laptops. To select this mapping, append ~MIRYOKU_MAPPING=ROTATE~ to the ~make~ command line when building.
1317 1320
1318Keyboards supporting this layout: newgame40, nimrod, marksard/rhymestone, pabile/p40. 1321Keyboards supporting this layout: newgame40, nimrod, marksard/rhymestone, pabile/p40.
1319 1322
@@ -1321,10 +1324,11 @@ Example build command lines:
1321 1324
1322#+BEGIN_SRC sh :tangle no 1325#+BEGIN_SRC sh :tangle no
1323make marksard/rhymestone:manna-harbour_miryoku:flash # marksard/rhymestone 1326make marksard/rhymestone:manna-harbour_miryoku:flash # marksard/rhymestone
1327make pabile/p40:manna-harbour_miryoku:flash MIRYOKU_MAPPING=ROTATE # pabile/p40, rotate
1324#+END_SRC 1328#+END_SRC
1325 1329
1326 1330
1327**** [[../../layouts/community/ortho_4x10/manna-harbour_miryoku/config.h][layouts/community/ortho_4x10/manna-harbour_miryoku/config.h]] 1331***** [[../../layouts/community/ortho_4x10/manna-harbour_miryoku/config.h][layouts/community/ortho_4x10/manna-harbour_miryoku/config.h]]
1328 1332
1329Contains subset mapping. 1333Contains subset mapping.
1330 1334
@@ -1335,22 +1339,39 @@ Contains subset mapping.
1335 1339
1336#pragma once 1340#pragma once
1337 1341
1342#define XXX KC_NO
1343
1344#if defined MIRYOKU_MAPPING_ROTATE
1345#define LAYOUT_miryoku( \
1346K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
1347K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
1348K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
1349N30, N31, K32, K33, K34, K35, K36, K37, N38, N39 \
1350) \
1351LAYOUT_ortho_4x10( \
1352XXX, XXX, K37, K36, K35, K34, K33, K32, XXX, XXX, \
1353K29, K28, K27, K26, K25, K24, K23, K22, K21, K20, \
1354K19, K18, K17, K16, K15, K14, K13, K12, K11, K10, \
1355K09, K08, K07, K06, K05, K04, K03, K02, K01, K00 \
1356)
1357#else
1338#define LAYOUT_miryoku(\ 1358#define LAYOUT_miryoku(\
1339K00, K01, K02, K03, K04, K05, K06, K07, K08, K09,\ 1359K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
1340K10, K11, K12, K13, K14, K15, K16, K17, K18, K19,\ 1360K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
1341K20, K21, K22, K23, K24, K25, K26, K27, K28, K29,\ 1361K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
1342N30, N31, K32, K33, K34, K35, K36, K37, N38, N39\ 1362N30, N31, K32, K33, K34, K35, K36, K37, N38, N39 \
1343)\ 1363) \
1344LAYOUT_ortho_4x10(\ 1364LAYOUT_ortho_4x10( \
1345K00, K01, K02, K03, K04, K05, K06, K07, K08, K09,\ 1365K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
1346K10, K11, K12, K13, K14, K15, K16, K17, K18, K19,\ 1366K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
1347K20, K21, K22, K23, K24, K25, K26, K27, K28, K29,\ 1367K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
1348KC_NO, KC_NO, K32, K33, K34, K35, K36, K37, KC_NO, KC_NO\ 1368XXX, XXX, K32, K33, K34, K35, K36, K37, XXX, XXX \
1349) 1369)
1370#endif
1350#+END_SRC 1371#+END_SRC
1351 1372
1352 1373
1353**** [[../../layouts/community/ortho_4x10/manna-harbour_miryoku/keymap.c][layouts/community/ortho_4x10/manna-harbour_miryoku/keymap.c]] 1374***** [[../../layouts/community/ortho_4x10/manna-harbour_miryoku/keymap.c][layouts/community/ortho_4x10/manna-harbour_miryoku/keymap.c]]
1354 1375
1355Required by the build system. 1376Required by the build system.
1356 1377
@@ -1361,7 +1382,7 @@ Required by the build system.
1361#+END_SRC 1382#+END_SRC
1362 1383
1363 1384
1364*** ortho_4x12 1385**** ortho_4x12
1365 1386
1366For the ortho_4x12 layout, the middle two columns, and the 2 keys on each end of 1387For the ortho_4x12 layout, the middle two columns, and the 2 keys on each end of
1367the bottom row are unused. This allows the hands to be positioned without ulnar 1388the bottom row are unused. This allows the hands to be positioned without ulnar
@@ -1398,7 +1419,7 @@ make keebio/levinson:manna-harbour_miryoku:flash MIRYOKU_MAPPING=EXTENDED_THUMBS
1398#+END_SRC 1419#+END_SRC
1399 1420
1400 1421
1401**** [[../../layouts/community/ortho_4x12/manna-harbour_miryoku/config.h][layouts/community/ortho_4x12/manna-harbour_miryoku/config.h]] 1422***** [[../../layouts/community/ortho_4x12/manna-harbour_miryoku/config.h][layouts/community/ortho_4x12/manna-harbour_miryoku/config.h]]
1402 1423
1403Contains subset mapping. 1424Contains subset mapping.
1404 1425
@@ -1452,7 +1473,7 @@ KC_NO, KC_NO, K32, K33, K34, KC_NO, KC_NO, K35, K36, K37, KC_NO, KC_
1452#+END_SRC 1473#+END_SRC
1453 1474
1454 1475
1455**** [[../../layouts/community/ortho_4x12/manna-harbour_miryoku/keymap.c][layouts/community/ortho_4x12/manna-harbour_miryoku/keymap.c]] 1476***** [[../../layouts/community/ortho_4x12/manna-harbour_miryoku/keymap.c][layouts/community/ortho_4x12/manna-harbour_miryoku/keymap.c]]
1456 1477
1457Required by the build system. 1478Required by the build system.
1458 1479
@@ -1463,7 +1484,7 @@ Required by the build system.
1463#+END_SRC 1484#+END_SRC
1464 1485
1465 1486
1466*** ortho_5x12 1487**** ortho_5x12
1467 1488
1468As per ortho_4x12 but the top row is unused. 1489As per ortho_4x12 but the top row is unused.
1469 1490
@@ -1480,7 +1501,7 @@ make keebio/nyquist/rev3:manna-harbour_miryoku:flash MIRYOKU_MAPPING=EXTENDED_TH
1480#+END_SRC 1501#+END_SRC
1481 1502
1482 1503
1483**** [[../../layouts/community/ortho_5x12/manna-harbour_miryoku/config.h][layouts/community/ortho_5x12/manna-harbour_miryoku/config.h]] 1504***** [[../../layouts/community/ortho_5x12/manna-harbour_miryoku/config.h][layouts/community/ortho_5x12/manna-harbour_miryoku/config.h]]
1484 1505
1485Contains subset mapping. 1506Contains subset mapping.
1486 1507
@@ -1537,7 +1558,7 @@ KC_NO, KC_NO, K32, K33, K34, KC_NO, KC_NO, K35, K36, K37, KC_NO, KC_
1537#+END_SRC 1558#+END_SRC
1538 1559
1539 1560
1540**** [[../../layouts/community/ortho_5x12/manna-harbour_miryoku/keymap.c][layouts/community/ortho_5x12/manna-harbour_miryoku/keymap.c]] 1561***** [[../../layouts/community/ortho_5x12/manna-harbour_miryoku/keymap.c][layouts/community/ortho_5x12/manna-harbour_miryoku/keymap.c]]
1541 1562
1542Required by the build system. 1563Required by the build system.
1543 1564
@@ -1548,7 +1569,7 @@ Required by the build system.
1548#+END_SRC 1569#+END_SRC
1549 1570
1550 1571
1551*** ortho_5x15 1572**** ortho_5x15
1552 1573
1553For the ortho_5x15 layout, the top row, middle 5 columns, and the 2 keys on each 1574For the ortho_5x15 layout, the top row, middle 5 columns, and the 2 keys on each
1554end of the bottom row are unused. This allows the hands to be positioned 1575end of the bottom row are unused. This allows the hands to be positioned
@@ -1574,7 +1595,7 @@ make idobo:manna-harbour_miryoku:flash # idobo
1574#+END_SRC 1595#+END_SRC
1575 1596
1576 1597
1577**** [[../../layouts/community/ortho_5x15/manna-harbour_miryoku/config.h][layouts/community/ortho_5x15/manna-harbour_miryoku/config.h]] 1598***** [[../../layouts/community/ortho_5x15/manna-harbour_miryoku/config.h][layouts/community/ortho_5x15/manna-harbour_miryoku/config.h]]
1578 1599
1579Contains subset mapping. 1600Contains subset mapping.
1580 1601
@@ -1621,7 +1642,7 @@ XXX, XXX, K32, K33, K34, XXX, XXX, XXX, XXX, XXX, K35, K36, K37, XXX, XXX\
1621#+RESULTS: 1642#+RESULTS:
1622 1643
1623 1644
1624**** [[../../layouts/community/ortho_5x15/manna-harbour_miryoku/keymap.c][layouts/community/ortho_5x15/manna-harbour_miryoku/keymap.c]] 1645***** [[../../layouts/community/ortho_5x15/manna-harbour_miryoku/keymap.c][layouts/community/ortho_5x15/manna-harbour_miryoku/keymap.c]]
1625 1646
1626Required by the build system. 1647Required by the build system.
1627 1648
@@ -1632,7 +1653,7 @@ Required by the build system.
1632#+END_SRC 1653#+END_SRC
1633 1654
1634 1655
1635*** planck_mit 1656**** planck_mit
1636 1657
1637The middle two columns including the middle 2u key, and the 2 keys on each end 1658The middle two columns including the middle 2u key, and the 2 keys on each end
1638of the bottom row are unused. 1659of the bottom row are unused.
@@ -1647,7 +1668,7 @@ make planck/rev6:manna-harbour_miryoku:flash FORCE_LAYOUT=planck_mit # planck re
1647 1668
1648#+END_SRC 1669#+END_SRC
1649 1670
1650**** [[../../layouts/community/planck_mit/manna-harbour_miryoku/config.h][layouts/community/planck_mit/manna-harbour_miryoku/config.h]] 1671***** [[../../layouts/community/planck_mit/manna-harbour_miryoku/config.h][layouts/community/planck_mit/manna-harbour_miryoku/config.h]]
1651 1672
1652Contains subset mapping. 1673Contains subset mapping.
1653 1674
@@ -1673,7 +1694,7 @@ KC_NO, KC_NO, K32, K33, K34, KC_NO, K35, K36, K37, KC_NO, KC_
1673#+END_SRC 1694#+END_SRC
1674 1695
1675 1696
1676**** [[../../layouts/community/planck_mit/manna-harbour_miryoku/keymap.c][layouts/community/planck_mit/manna-harbour_miryoku/keymap.c]] 1697***** [[../../layouts/community/planck_mit/manna-harbour_miryoku/keymap.c][layouts/community/planck_mit/manna-harbour_miryoku/keymap.c]]
1677 1698
1678Required by the build system. 1699Required by the build system.
1679 1700
@@ -1684,7 +1705,7 @@ Required by the build system.
1684#+END_SRC 1705#+END_SRC
1685 1706
1686 1707
1687*** split_3x5_3 1708**** split_3x5_3
1688 1709
1689Keyboards supporting this layout: arch_36, boardsource/microdox, centromere, crkbd, eek, miniaxe, minidox/rev1, pteron36, squiggle/rev1, suihankey/split/rev1. 1710Keyboards supporting this layout: arch_36, boardsource/microdox, centromere, crkbd, eek, miniaxe, minidox/rev1, pteron36, squiggle/rev1, suihankey/split/rev1.
1690 1711
@@ -1696,7 +1717,7 @@ make minidox:manna-harbour_miryoku:flash # minidox
1696#+END_SRC 1717#+END_SRC
1697 1718
1698 1719
1699**** [[../../layouts/community/split_3x5_3/manna-harbour_miryoku/config.h][layouts/community/split_3x5_3/manna-harbour_miryoku/config.h]] 1720***** [[../../layouts/community/split_3x5_3/manna-harbour_miryoku/config.h][layouts/community/split_3x5_3/manna-harbour_miryoku/config.h]]
1700 1721
1701Contains subset mapping. 1722Contains subset mapping.
1702 1723
@@ -1722,7 +1743,7 @@ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29,\
1722#+END_SRC 1743#+END_SRC
1723 1744
1724 1745
1725**** [[../../layouts/community/split_3x5_3/manna-harbour_miryoku/keymap.c][layouts/community/split_3x5_3/manna-harbour_miryoku/keymap.c]] 1746***** [[../../layouts/community/split_3x5_3/manna-harbour_miryoku/keymap.c][layouts/community/split_3x5_3/manna-harbour_miryoku/keymap.c]]
1726 1747
1727Required by the build system. 1748Required by the build system.
1728 1749
@@ -1733,7 +1754,7 @@ Required by the build system.
1733#+END_SRC 1754#+END_SRC
1734 1755
1735 1756
1736*** split_3x6_3 1757**** split_3x6_3
1737 1758
1738The outer columns are unused. 1759The outer columns are unused.
1739 1760
@@ -1747,7 +1768,7 @@ make crkbd:manna-harbour_miryoku:flash # crkbd
1747#+END_SRC 1768#+END_SRC
1748 1769
1749 1770
1750**** [[../../layouts/community/split_3x6_3/manna-harbour_miryoku/config.h][layouts/community/split_3x6_3/manna-harbour_miryoku/config.h]] 1771***** [[../../layouts/community/split_3x6_3/manna-harbour_miryoku/config.h][layouts/community/split_3x6_3/manna-harbour_miryoku/config.h]]
1751 1772
1752Contains subset mapping. 1773Contains subset mapping.
1753 1774
@@ -1773,7 +1794,7 @@ KC_NO, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29
1773#+END_SRC 1794#+END_SRC
1774 1795
1775 1796
1776**** [[../../layouts/community/split_3x6_3/manna-harbour_miryoku/keymap.c][layouts/community/split_3x6_3/manna-harbour_miryoku/keymap.c]] 1797***** [[../../layouts/community/split_3x6_3/manna-harbour_miryoku/keymap.c][layouts/community/split_3x6_3/manna-harbour_miryoku/keymap.c]]
1777 1798
1778Required by the build system. 1799Required by the build system.
1779 1800
@@ -1784,14 +1805,14 @@ Required by the build system.
1784#+END_SRC 1805#+END_SRC
1785 1806
1786 1807
1787** Keyboards 1808*** Keyboards
1788 1809
1789To use the keymap on a keyboard which does not support the layouts feature, 1810To use the keymap on a keyboard which does not support the layouts feature,
1790~LAYOUT_miryoku~ is defined as a macro mapping onto the keyboard's own ~LAYOUT~ 1811~LAYOUT_miryoku~ is defined as a macro mapping onto the keyboard's own ~LAYOUT~
1791macro, leaving the unused keys as ~KC_NO~. 1812macro, leaving the unused keys as ~KC_NO~.
1792 1813
1793 1814
1794*** atreus 1815**** atreus
1795 1816
1796Only the main 5x3 alphas and the inner 3 thumb keys are used. 1817Only the main 5x3 alphas and the inner 3 thumb keys are used.
1797 1818
@@ -1802,7 +1823,7 @@ make atreus:manna-harbour_miryoku:flash
1802#+END_SRC 1823#+END_SRC
1803 1824
1804 1825
1805**** [[../../keyboards/atreus/keymaps/manna-harbour_miryoku/config.h][keyboards/atreus/keymaps/manna-harbour_miryoku/config.h]] 1826***** [[../../keyboards/atreus/keymaps/manna-harbour_miryoku/config.h][keyboards/atreus/keymaps/manna-harbour_miryoku/config.h]]
1806 1827
1807Contains subset mapping. 1828Contains subset mapping.
1808 1829
@@ -1830,7 +1851,7 @@ XXX, XXX, XXX, K32, K33, K34, K35, K36, K37, XXX, XXX, XXX\
1830#+END_SRC 1851#+END_SRC
1831 1852
1832 1853
1833**** [[../../keyboards/atreus/keymaps/manna-harbour_miryoku/keymap.c][keyboards/atreus/keymaps/manna-harbour_miryoku/keymap.c]] 1854***** [[../../keyboards/atreus/keymaps/manna-harbour_miryoku/keymap.c][keyboards/atreus/keymaps/manna-harbour_miryoku/keymap.c]]
1834 1855
1835Required by the build system. 1856Required by the build system.
1836 1857
@@ -1841,7 +1862,57 @@ Required by the build system.
1841#+END_SRC 1862#+END_SRC
1842 1863
1843 1864
1844*** ergotravel 1865**** bastardkb/scylla
1866
1867To build for this keyboard,
1868
1869#+BEGIN_SRC sh :tangle no
1870make bastardkb/scylla:manna-harbour_miryoku:flash
1871#+END_SRC
1872
1873
1874***** [[../../keyboards/bastardkb/scylla/keymaps/manna-harbour_miryoku/config.h][keyboards/bastardkb/scylla/keymaps/manna-harbour_miryoku/config.h]]
1875
1876Contains subset mapping.
1877
1878#+BEGIN_SRC C :main no :noweb yes :padline no :tangle ../../keyboards/bastardkb/scylla/keymaps/manna-harbour_miryoku/config.h
1879// <<header>>
1880
1881<<license-qmk>>
1882
1883#pragma once
1884
1885#define XXX KC_NO
1886
1887#define LAYOUT_miryoku( \
1888 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
1889 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
1890 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
1891 N30, N31, K32, K33, K34, K35, K36, K37, N38, N39 \
1892) \
1893LAYOUT_split_4x6_5( \
1894XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, \
1895XXX, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, XXX, \
1896XXX, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, XXX, \
1897XXX, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, XXX, \
1898 K32, K33, K34, K35, K36, K37, \
1899 XXX, XXX, XXX, XXX \
1900)
1901#+END_SRC
1902
1903
1904***** [[../../keyboards/bastardkb/scylla/keymaps/manna-harbour_miryoku/keymap.c][keyboards/bastardkb/scylla/keymaps/manna-harbour_miryoku/keymap.c]]
1905
1906Required by the build system.
1907
1908#+BEGIN_SRC C :main no :noweb yes :padline no :tangle ../../keyboards/bastardkb/scylla/keymaps/manna-harbour_miryoku/keymap.c
1909// <<header>>
1910
1911<<license-qmk>>
1912#+END_SRC
1913
1914
1915**** ergotravel
1845 1916
1846To build for this keyboard, 1917To build for this keyboard,
1847 1918
@@ -1850,7 +1921,7 @@ make ergotravel:manna-harbour_miryoku:flash
1850#+END_SRC 1921#+END_SRC
1851 1922
1852 1923
1853**** [[../../keyboards/ergotravel/keymaps/manna-harbour_miryoku/config.h][keyboards/ergotravel/keymaps/manna-harbour_miryoku/config.h]] 1924***** [[../../keyboards/ergotravel/keymaps/manna-harbour_miryoku/config.h][keyboards/ergotravel/keymaps/manna-harbour_miryoku/config.h]]
1854 1925
1855Contains subset mapping. 1926Contains subset mapping.
1856 1927
@@ -1878,7 +1949,7 @@ XXX, XXX, XXX, K32, K33, K34, K35, K36, K37, XXX, XXX, XXX \
1878#+END_SRC 1949#+END_SRC
1879 1950
1880 1951
1881**** [[../../keyboards/ergotravel/keymaps/manna-harbour_miryoku/keymap.c][keyboards/ergotravel/keymaps/manna-harbour_miryoku/keymap.c]] 1952***** [[../../keyboards/ergotravel/keymaps/manna-harbour_miryoku/keymap.c][keyboards/ergotravel/keymaps/manna-harbour_miryoku/keymap.c]]
1882 1953
1883Required by the build system. 1954Required by the build system.
1884 1955
@@ -1889,7 +1960,7 @@ Required by the build system.
1889#+END_SRC 1960#+END_SRC
1890 1961
1891 1962
1892*** for_science 1963**** for_science
1893 1964
1894The top row is unused. 1965The top row is unused.
1895 1966
@@ -1900,7 +1971,7 @@ make for_science:manna-harbour_miryoku:flash
1900#+END_SRC 1971#+END_SRC
1901 1972
1902 1973
1903**** [[../../keyboards/for_science/keymaps/manna-harbour_miryoku/config.h][keyboards/for_science/keymaps/manna-harbour_miryoku/config.h]] 1974***** [[../../keyboards/for_science/keymaps/manna-harbour_miryoku/config.h][keyboards/for_science/keymaps/manna-harbour_miryoku/config.h]]
1904 1975
1905Contains subset mapping. 1976Contains subset mapping.
1906 1977
@@ -1929,7 +2000,7 @@ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29,\
1929#+END_SRC 2000#+END_SRC
1930 2001
1931 2002
1932**** [[../../keyboards/for_science/keymaps/manna-harbour_miryoku/keymap.c][keyboards/for_science/keymaps/manna-harbour_miryoku/keymap.c]] 2003***** [[../../keyboards/for_science/keymaps/manna-harbour_miryoku/keymap.c][keyboards/for_science/keymaps/manna-harbour_miryoku/keymap.c]]
1933 2004
1934Required by the build system. 2005Required by the build system.
1935 2006
@@ -1940,7 +2011,7 @@ Required by the build system.
1940#+END_SRC 2011#+END_SRC
1941 2012
1942 2013
1943*** gergo 2014**** gergo
1944 2015
1945Only the main 5x3 alphas and the outer 3 thumb keys are used. 2016Only the main 5x3 alphas and the outer 3 thumb keys are used.
1946 2017
@@ -1951,7 +2022,7 @@ make gergo:manna-harbour_miryoku:flash
1951#+END_SRC 2022#+END_SRC
1952 2023
1953 2024
1954**** [[../../keyboards/gergo/keymaps/manna-harbour_miryoku/config.h][keyboards/gergo/keymaps/manna-harbour_miryoku/config.h]] 2025***** [[../../keyboards/gergo/keymaps/manna-harbour_miryoku/config.h][keyboards/gergo/keymaps/manna-harbour_miryoku/config.h]]
1955 2026
1956Contains subset mapping. 2027Contains subset mapping.
1957 2028
@@ -1979,7 +2050,7 @@ XXX, K20, K21, K22, K23, K24, XXX, XXX, XXX, XXX, K25, K26, K27, K28, K29,
1979#+END_SRC 2050#+END_SRC
1980 2051
1981 2052
1982**** [[../../keyboards/gergo/keymaps/manna-harbour_miryoku/keymap.c][keyboards/gergo/keymaps/manna-harbour_miryoku/keymap.c]] 2053***** [[../../keyboards/gergo/keymaps/manna-harbour_miryoku/keymap.c][keyboards/gergo/keymaps/manna-harbour_miryoku/keymap.c]]
1983 2054
1984Required by the build system. 2055Required by the build system.
1985 2056
@@ -1990,7 +2061,7 @@ Required by the build system.
1990#+END_SRC 2061#+END_SRC
1991 2062
1992 2063
1993*** handwired/dactyl_manuform/4x5 2064**** handwired/dactyl_manuform/4x5
1994 2065
1995Only the main 5x3 alphas and the main 3 thumb keys are used. 2066Only the main 5x3 alphas and the main 3 thumb keys are used.
1996 2067
@@ -2001,7 +2072,7 @@ make handwired/dactyl_manuform/4x5:manna-harbour_miryoku:flash
2001#+END_SRC 2072#+END_SRC
2002 2073
2003 2074
2004**** [[../../keyboards/handwired/dactyl_manuform/4x5/keymaps/manna-harbour_miryoku/config.h][keyboards/handwired/dactyl_manuform/4x5/keymaps/manna-harbour_miryoku/config.h]] 2075***** [[../../keyboards/handwired/dactyl_manuform/4x5/keymaps/manna-harbour_miryoku/config.h][keyboards/handwired/dactyl_manuform/4x5/keymaps/manna-harbour_miryoku/config.h]]
2005 2076
2006Contains subset mapping. 2077Contains subset mapping.
2007 2078
@@ -2032,7 +2103,7 @@ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29,\
2032#+END_SRC 2103#+END_SRC
2033 2104
2034 2105
2035**** [[../../keyboards/handwired/dactyl_manuform/4x5/keymaps/manna-harbour_miryoku/keymap.c][keyboards/handwired/dactyl_manuform/4x5/keymaps/manna-harbour_miryoku/keymap.c]] 2106***** [[../../keyboards/handwired/dactyl_manuform/4x5/keymaps/manna-harbour_miryoku/keymap.c][keyboards/handwired/dactyl_manuform/4x5/keymaps/manna-harbour_miryoku/keymap.c]]
2036 2107
2037Required by the build system. 2108Required by the build system.
2038 2109
@@ -2043,7 +2114,7 @@ Required by the build system.
2043#+END_SRC 2114#+END_SRC
2044 2115
2045 2116
2046*** handwired/dactyl_manuform/5x6 2117**** handwired/dactyl_manuform/5x6
2047 2118
2048Only the main 5x3 alphas and the main 3 thumb keys are used. 2119Only the main 5x3 alphas and the main 3 thumb keys are used.
2049 2120
@@ -2054,7 +2125,7 @@ make handwired/dactyl_manuform/5x6:manna-harbour_miryoku:flash
2054#+END_SRC 2125#+END_SRC
2055 2126
2056 2127
2057**** [[../../keyboards/handwired/dactyl_manuform/5x6/keymaps/manna-harbour_miryoku/config.h][keyboards/handwired/dactyl_manuform/5x6/keymaps/manna-harbour_miryoku/config.h]] 2128***** [[../../keyboards/handwired/dactyl_manuform/5x6/keymaps/manna-harbour_miryoku/config.h][keyboards/handwired/dactyl_manuform/5x6/keymaps/manna-harbour_miryoku/config.h]]
2058 2129
2059Contains subset mapping. 2130Contains subset mapping.
2060 2131
@@ -2086,7 +2157,7 @@ XXX, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, X
2086#+END_SRC 2157#+END_SRC
2087 2158
2088 2159
2089**** [[../../keyboards/handwired/dactyl_manuform/5x6/keymaps/manna-harbour_miryoku/keymap.c][keyboards/handwired/dactyl_manuform/5x6/keymaps/manna-harbour_miryoku/keymap.c]] 2160***** [[../../keyboards/handwired/dactyl_manuform/5x6/keymaps/manna-harbour_miryoku/keymap.c][keyboards/handwired/dactyl_manuform/5x6/keymaps/manna-harbour_miryoku/keymap.c]]
2090 2161
2091Required by the build system. 2162Required by the build system.
2092 2163
@@ -2097,7 +2168,7 @@ Required by the build system.
2097#+END_SRC 2168#+END_SRC
2098 2169
2099 2170
2100*** keebio/iris 2171**** keebio/iris
2101 2172
2102Only the main 5x3 alphas and the bottom 3 thumb keys are used. 2173Only the main 5x3 alphas and the bottom 3 thumb keys are used.
2103 2174
@@ -2108,7 +2179,7 @@ make keebio/iris/rev4:manna-harbour_miryoku:flash
2108#+END_SRC 2179#+END_SRC
2109 2180
2110 2181
2111**** [[../../keyboards/keebio/iris/keymaps/manna-harbour_miryoku/config.h][keyboards/keebio/iris/keymaps/manna-harbour_miryoku/config.h]] 2182***** [[../../keyboards/keebio/iris/keymaps/manna-harbour_miryoku/config.h][keyboards/keebio/iris/keymaps/manna-harbour_miryoku/config.h]]
2112 2183
2113Contains subset mapping. 2184Contains subset mapping.
2114 2185
@@ -2137,7 +2208,7 @@ XXX, K20, K21, K22, K23, K24, XXX, XXX, K25, K26, K27, K28, K29, XXX,\
2137#+END_SRC 2208#+END_SRC
2138 2209
2139 2210
2140**** [[../../keyboards/keebio/iris/keymaps/manna-harbour_miryoku/keymap.c][keyboards/keebio/iris/keymaps/manna-harbour_miryoku/keymap.c]] 2211***** [[../../keyboards/keebio/iris/keymaps/manna-harbour_miryoku/keymap.c][keyboards/keebio/iris/keymaps/manna-harbour_miryoku/keymap.c]]
2141 2212
2142Required by the build system. 2213Required by the build system.
2143 2214
@@ -2148,7 +2219,7 @@ Required by the build system.
2148#+END_SRC 2219#+END_SRC
2149 2220
2150 2221
2151*** keyboardio/atreus 2222**** keyboardio/atreus
2152 2223
2153Only the main 5x3 alphas and the inner 3 thumb keys are used. 2224Only the main 5x3 alphas and the inner 3 thumb keys are used.
2154 2225
@@ -2159,7 +2230,7 @@ make keyboardio/atreus:manna-harbour_miryoku:flash
2159#+END_SRC 2230#+END_SRC
2160 2231
2161 2232
2162**** [[../../keyboards/keyboardio/atreus/keymaps/manna-harbour_miryoku/config.h][keyboards/keyboardio/atreus/keymaps/manna-harbour_miryoku/config.h]] 2233***** [[../../keyboards/keyboardio/atreus/keymaps/manna-harbour_miryoku/config.h][keyboards/keyboardio/atreus/keymaps/manna-harbour_miryoku/config.h]]
2163 2234
2164Contains subset mapping. 2235Contains subset mapping.
2165 2236
@@ -2187,7 +2258,7 @@ XXX, XXX, XXX, K32, K33, K34, K35, K36, K37, XXX, XXX, XXX \
2187#+END_SRC 2258#+END_SRC
2188 2259
2189 2260
2190**** [[../../keyboards/keyboardio/atreus/keymaps/manna-harbour_miryoku/keymap.c][keyboards/keyboardio/atreus/keymaps/manna-harbour_miryoku/keymap.c]] 2261***** [[../../keyboards/keyboardio/atreus/keymaps/manna-harbour_miryoku/keymap.c][keyboards/keyboardio/atreus/keymaps/manna-harbour_miryoku/keymap.c]]
2191 2262
2192Required by the build system. 2263Required by the build system.
2193 2264
@@ -2198,82 +2269,7 @@ Required by the build system.
2198#+END_SRC 2269#+END_SRC
2199 2270
2200 2271
2201*** kyria 2272**** lily58
2202
2203Only the main 5x3 alphas and the middle 3 lower thumb keys are used.
2204
2205[[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/mapping/miryoku-kle-mapping-kyria.png]]
2206
2207An alternative subset mapping is also provided with the thumb keys shifted one
2208position in the direction of thumb extension. To select this mapping, append
2209~MIRYOKU_MAPPING=EXTENDED_THUMBS~ to the ~make~ command line when building.
2210
2211[[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/mapping/miryoku-kle-mapping-kyria-extended_thumbs.png]]
2212
2213
2214To build for this keyboard,
2215
2216#+BEGIN_SRC sh :tangle no
2217make kyria:manna-harbour_miryoku:flash
2218make kyria:manna-harbour_miryoku:flash MIRYOKU_MAPPING=EXTENDED_THUMBS # extended thumb position
2219#+END_SRC
2220
2221
2222**** [[../../keyboards/kyria/keymaps/manna-harbour_miryoku/config.h][keyboards/kyria/keymaps/manna-harbour_miryoku/config.h]]
2223
2224Contains subset mapping.
2225
2226#+BEGIN_SRC C :main no :noweb yes :padline no :tangle ../../keyboards/kyria/keymaps/manna-harbour_miryoku/config.h
2227// <<header>>
2228
2229<<license-qmk>>
2230
2231#pragma once
2232
2233#define XXX KC_NO
2234
2235#if defined MIRYOKU_MAPPING_EXTENDED_THUMBS
2236#define LAYOUT_miryoku( \
2237 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
2238 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
2239 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
2240 N30, N31, K32, K33, K34, K35, K36, K37, N38, N39 \
2241) \
2242LAYOUT( \
2243XXX, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, XXX, \
2244XXX, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, XXX, \
2245XXX, K20, K21, K22, K23, K24, XXX, XXX, XXX, XXX, K25, K26, K27, K28, K29, XXX, \
2246 XXX, XXX, K32, K33, K34, K35, K36, K37, XXX, XXX \
2247)
2248#else
2249#define LAYOUT_miryoku( \
2250 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
2251 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
2252 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
2253 N30, N31, K32, K33, K34, K35, K36, K37, N38, N39 \
2254) \
2255LAYOUT( \
2256XXX, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, XXX, \
2257XXX, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, XXX, \
2258XXX, K20, K21, K22, K23, K24, XXX, XXX, XXX, XXX, K25, K26, K27, K28, K29, XXX, \
2259 XXX, K32, K33, K34, XXX, XXX, K35, K36, K37, XXX \
2260)
2261#endif
2262#+END_SRC
2263
2264
2265**** [[../../keyboards/kyria/keymaps/manna-harbour_miryoku/keymap.c][keyboards/kyria/keymaps/manna-harbour_miryoku/keymap.c]]
2266
2267Required by the build system.
2268
2269#+BEGIN_SRC C :main no :noweb yes :padline no :tangle ../../keyboards/kyria/keymaps/manna-harbour_miryoku/keymap.c
2270// <<header>>
2271
2272<<license-qmk>>
2273#+END_SRC
2274
2275
2276*** lily58
2277 2273
2278Only the main 5x3 alphas and the inner 3 thumb keys are used. 2274Only the main 5x3 alphas and the inner 3 thumb keys are used.
2279 2275
@@ -2284,7 +2280,7 @@ make lily58:manna-harbour_miryoku:flash
2284#+END_SRC 2280#+END_SRC
2285 2281
2286 2282
2287**** [[../../keyboards/lily58/keymaps/manna-harbour_miryoku/config.h][keyboards/lily58/keymaps/manna-harbour_miryoku/config.h]] 2283***** [[../../keyboards/lily58/keymaps/manna-harbour_miryoku/config.h][keyboards/lily58/keymaps/manna-harbour_miryoku/config.h]]
2288 2284
2289Contains subset mapping. 2285Contains subset mapping.
2290 2286
@@ -2313,7 +2309,7 @@ XXX, K20, K21, K22, K23, K24, XXX, XXX, K25, K26, K27, K28, K29, XXX,\
2313#+END_SRC 2309#+END_SRC
2314 2310
2315 2311
2316**** [[../../keyboards/lily58/keymaps/manna-harbour_miryoku/keymap.c][keyboards/lily58/keymaps/manna-harbour_miryoku/keymap.c]] 2312***** [[../../keyboards/lily58/keymaps/manna-harbour_miryoku/keymap.c][keyboards/lily58/keymaps/manna-harbour_miryoku/keymap.c]]
2317 2313
2318Required by the build system. 2314Required by the build system.
2319 2315
@@ -2324,7 +2320,7 @@ Required by the build system.
2324#+END_SRC 2320#+END_SRC
2325 2321
2326 2322
2327*** moonlander 2323**** moonlander
2328 2324
2329The main 5x3 alphas are used as usual. The primary, secondary, and tertiary 2325The main 5x3 alphas are used as usual. The primary, secondary, and tertiary
2330thumb keys are the closest piano key, middle piano key, and the innermost key of 2326thumb keys are the closest piano key, middle piano key, and the innermost key of
@@ -2337,7 +2333,7 @@ make moonlander:manna-harbour_miryoku:flash
2337#+END_SRC 2333#+END_SRC
2338 2334
2339 2335
2340**** [[../../keyboards/moonlander/keymaps/manna-harbour_miryoku/config.h][keyboards/moonlander/keymaps/manna-harbour_miryoku/config.h]] 2336***** [[../../keyboards/moonlander/keymaps/manna-harbour_miryoku/config.h][keyboards/moonlander/keymaps/manna-harbour_miryoku/config.h]]
2341 2337
2342Contains subset mapping. 2338Contains subset mapping.
2343 2339
@@ -2367,7 +2363,7 @@ XXX, XXX, XXX, XXX, K32, XXX, XXX, K37, XXX, XXX, XXX, XXX,\
2367#+END_SRC 2363#+END_SRC
2368 2364
2369 2365
2370**** [[../../keyboards/moonlander/keymaps/manna-harbour_miryoku/keymap.c][keyboards/moonlander/keymaps/manna-harbour_miryoku/keymap.c]] 2366***** [[../../keyboards/moonlander/keymaps/manna-harbour_miryoku/keymap.c][keyboards/moonlander/keymaps/manna-harbour_miryoku/keymap.c]]
2371 2367
2372Required by the build system. 2368Required by the build system.
2373 2369
@@ -2378,7 +2374,7 @@ Required by the build system.
2378#+END_SRC 2374#+END_SRC
2379 2375
2380 2376
2381*** redox_w 2377**** redox_w
2382 2378
2383Only the main 5x3 alphas and the main 3 thumb keys are used. 2379Only the main 5x3 alphas and the main 3 thumb keys are used.
2384 2380
@@ -2389,7 +2385,7 @@ make redox_w:manna-harbour_miryoku:flash
2389#+END_SRC 2385#+END_SRC
2390 2386
2391 2387
2392**** [[../../keyboards/redox_w/keymaps/manna-harbour_miryoku/config.h][keyboards/redox_w/keymaps/manna-harbour_miryoku/config.h]] 2388***** [[../../keyboards/redox_w/keymaps/manna-harbour_miryoku/config.h][keyboards/redox_w/keymaps/manna-harbour_miryoku/config.h]]
2393 2389
2394Contains subset mapping. 2390Contains subset mapping.
2395 2391
@@ -2420,7 +2416,7 @@ XXX, XXX, XXX, XXX, K32, K33, K34, K35, K36, K37, XXX, XXX, XXX,
2420#+RESULTS: 2416#+RESULTS:
2421 2417
2422 2418
2423**** [[../../keyboards/redox_w/keymaps/manna-harbour_miryoku/keymap.c][keyboards/redox_w/keymaps/manna-harbour_miryoku/keymap.c]] 2419***** [[../../keyboards/redox_w/keymaps/manna-harbour_miryoku/keymap.c][keyboards/redox_w/keymaps/manna-harbour_miryoku/keymap.c]]
2424 2420
2425Required by the build system. 2421Required by the build system.
2426 2422
@@ -2431,7 +2427,7 @@ Required by the build system.
2431#+END_SRC 2427#+END_SRC
2432 2428
2433 2429
2434*** sofle 2430**** sofle
2435 2431
2436To build for this keyboard, 2432To build for this keyboard,
2437 2433
@@ -2440,7 +2436,7 @@ make sofle:manna-harbour_miryoku:flash
2440#+END_SRC 2436#+END_SRC
2441 2437
2442 2438
2443**** [[../../keyboards/sofle/keymaps/manna-harbour_miryoku/config.h][keyboards/sofle/keymaps/manna-harbour_miryoku/config.h]] 2439***** [[../../keyboards/sofle/keymaps/manna-harbour_miryoku/config.h][keyboards/sofle/keymaps/manna-harbour_miryoku/config.h]]
2444 2440
2445Contains subset mapping. 2441Contains subset mapping.
2446 2442
@@ -2469,7 +2465,7 @@ XXX, K20, K21, K22, K23, K24, XXX, XXX, K25, K26, K27, K28, K29, XXX,\
2469#+END_SRC 2465#+END_SRC
2470 2466
2471 2467
2472**** [[../../keyboards/sofle/keymaps/manna-harbour_miryoku/keymap.c][keyboards/sofle/keymaps/manna-harbour_miryoku/keymap.c]] 2468***** [[../../keyboards/sofle/keymaps/manna-harbour_miryoku/keymap.c][keyboards/sofle/keymaps/manna-harbour_miryoku/keymap.c]]
2473 2469
2474Required by the build system. 2470Required by the build system.
2475 2471
@@ -2480,7 +2476,82 @@ Required by the build system.
2480#+END_SRC 2476#+END_SRC
2481 2477
2482 2478
2483*** torn 2479**** splitkb/kyria
2480
2481Only the main 5x3 alphas and the middle 3 lower thumb keys are used.
2482
2483[[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/mapping/miryoku-kle-mapping-kyria.png]]
2484
2485An alternative subset mapping is also provided with the thumb keys shifted one
2486position in the direction of thumb extension. To select this mapping, append
2487~MIRYOKU_MAPPING=EXTENDED_THUMBS~ to the ~make~ command line when building.
2488
2489[[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/mapping/miryoku-kle-mapping-kyria-extended_thumbs.png]]
2490
2491
2492To build for this keyboard,
2493
2494#+BEGIN_SRC sh :tangle no
2495make splitkb/kyria:manna-harbour_miryoku:flash
2496make splitkb/kyria:manna-harbour_miryoku:flash MIRYOKU_MAPPING=EXTENDED_THUMBS # extended thumb position
2497#+END_SRC
2498
2499
2500***** [[../../keyboards/splitkb/kyria/keymaps/manna-harbour_miryoku/config.h][keyboards/splitkb/kyria/keymaps/manna-harbour_miryoku/config.h]]
2501
2502Contains subset mapping.
2503
2504#+BEGIN_SRC C :main no :noweb yes :padline no :tangle ../../keyboards/splitkb/kyria/keymaps/manna-harbour_miryoku/config.h
2505// <<header>>
2506
2507<<license-qmk>>
2508
2509#pragma once
2510
2511#define XXX KC_NO
2512
2513#if defined MIRYOKU_MAPPING_EXTENDED_THUMBS
2514#define LAYOUT_miryoku( \
2515 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
2516 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
2517 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
2518 N30, N31, K32, K33, K34, K35, K36, K37, N38, N39 \
2519) \
2520LAYOUT( \
2521XXX, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, XXX, \
2522XXX, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, XXX, \
2523XXX, K20, K21, K22, K23, K24, XXX, XXX, XXX, XXX, K25, K26, K27, K28, K29, XXX, \
2524 XXX, XXX, K32, K33, K34, K35, K36, K37, XXX, XXX \
2525)
2526#else
2527#define LAYOUT_miryoku( \
2528 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
2529 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
2530 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
2531 N30, N31, K32, K33, K34, K35, K36, K37, N38, N39 \
2532) \
2533LAYOUT( \
2534XXX, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, XXX, \
2535XXX, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, XXX, \
2536XXX, K20, K21, K22, K23, K24, XXX, XXX, XXX, XXX, K25, K26, K27, K28, K29, XXX, \
2537 XXX, K32, K33, K34, XXX, XXX, K35, K36, K37, XXX \
2538)
2539#endif
2540#+END_SRC
2541
2542
2543***** [[../../keyboards/splitkb/kyria/keymaps/manna-harbour_miryoku/keymap.c][keyboards/splitkb/kyria/keymaps/manna-harbour_miryoku/keymap.c]]
2544
2545Required by the build system.
2546
2547#+BEGIN_SRC C :main no :noweb yes :padline no :tangle ../../keyboards/splitkb/kyria/keymaps/manna-harbour_miryoku/keymap.c
2548// <<header>>
2549
2550<<license-qmk>>
2551#+END_SRC
2552
2553
2554**** torn
2484 2555
2485To build for this keyboard, 2556To build for this keyboard,
2486 2557
@@ -2489,7 +2560,7 @@ make torn:manna-harbour_miryoku:flash
2489#+END_SRC 2560#+END_SRC
2490 2561
2491 2562
2492**** [[../../keyboards/torn/keymaps/manna-harbour_miryoku/config.h][keyboards/torn/keymaps/manna-harbour_miryoku/config.h]] 2563***** [[../../keyboards/torn/keymaps/manna-harbour_miryoku/config.h][keyboards/torn/keymaps/manna-harbour_miryoku/config.h]]
2493 2564
2494Contains subset mapping. 2565Contains subset mapping.
2495 2566
@@ -2517,7 +2588,7 @@ KC_NO, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29
2517#+RESULTS: 2588#+RESULTS:
2518 2589
2519 2590
2520**** [[../../keyboards/torn/keymaps/manna-harbour_miryoku/keymap.c][keyboards/torn/keymaps/manna-harbour_miryoku/keymap.c]] 2591***** [[../../keyboards/torn/keymaps/manna-harbour_miryoku/keymap.c][keyboards/torn/keymaps/manna-harbour_miryoku/keymap.c]]
2521 2592
2522Required by the build system. 2593Required by the build system.
2523 2594
@@ -2528,7 +2599,7 @@ Required by the build system.
2528#+END_SRC 2599#+END_SRC
2529 2600
2530 2601
2531** Customisation 2602*** Customisation
2532 2603
2533To add customisations to a keyboard or layout while importing the miryoku 2604To add customisations to a keyboard or layout while importing the miryoku
2534keymap, copy ~config.h~ and ~keymap.c~ from the keyboard or layout's 2605keymap, copy ~config.h~ and ~keymap.c~ from the keyboard or layout's
@@ -2542,7 +2613,7 @@ layout and modify ~LAYOUT_miryoku~ in ~config.h~ referring to the keyboard or
2542layout's ~LAYOUT~ macro. 2613layout's ~LAYOUT~ macro.
2543 2614
2544 2615
2545*** Examples 2616**** Examples
2546 2617
2547To use any of the examples, create a new branch from the miryoku development 2618To use any of the examples, create a new branch from the miryoku development
2548branch and follow the same steps as seen in the commit messages and code changes 2619branch and follow the same steps as seen in the commit messages and code changes
@@ -2550,28 +2621,28 @@ in the examples, making the appropriate changes for your keyboard and desired
2550customisations. 2621customisations.
2551 2622
2552 2623
2553**** Add Layers 2624***** Add Layers
2554 2625
2555- https://github.com/manna-harbour/qmk_firmware/commits/miryoku-examples-add-layers/keyboards/crkbd/keymaps/miryoku-examples-add-layers 2626- https://github.com/manna-harbour/qmk_firmware/commits/miryoku-examples-add-layers/keyboards/crkbd/keymaps/miryoku-examples-add-layers
2556 2627
2557 2628
2558* Experimental Features 2629** Experimental Features
2559 2630
2560 2631
2561** Bilateral Combinations 2632*** Bilateral Combinations
2562 2633
2563- [[https://github.com/manna-harbour/qmk_firmware/issues/29][Bilateral Combinations]] 2634- [[https://github.com/manna-harbour/qmk_firmware/issues/29][Bilateral Combinations]]
2564 2635
2565 2636
2566** Retro Shift 2637*** Retro Shift
2567 2638
2568- [[https://github.com/manna-harbour/qmk_firmware/issues/33][Retro Shift]] 2639- [[https://github.com/manna-harbour/qmk_firmware/issues/33][Retro Shift]]
2569 2640
2570 2641
2571* Documentation :noexport_1: 2642** Documentation
2572 2643
2573 2644
2574** QMK 2645*** QMK
2575 2646
2576- https://docs.qmk.fm/ 2647- https://docs.qmk.fm/
2577- https://docs.qmk.fm/#/config_options 2648- https://docs.qmk.fm/#/config_options
@@ -2588,18 +2659,13 @@ customisations.
2588- https://docs.qmk.fm/#/tap_hold 2659- https://docs.qmk.fm/#/tap_hold
2589 2660
2590 2661
2591** Org Mode 2662*** Org Mode
2592 2663
2593- https://orgmode.org/ 2664- https://orgmode.org/
2594- https://orgmode.org/manual/Tables.html 2665- https://orgmode.org/manual/Tables.html
2595- https://orgmode.org/manual/Working-with-Source-Code.html 2666- https://orgmode.org/manual/Working-with-Source-Code.html
2596 2667
2597 2668
2598* Contact 2669**
2599
2600For feature requests or issues with code or documentation please
2601[[https://github.com/manna-harbour/qmk_firmware/issues/new][open an issue]].
2602
2603For more general discussion please [[https://github.com/manna-harbour/manna-harbour/tree/main/contact][contact Manna Harbour]].
2604 2670
2605[[https://github.com/manna-harbour][https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/logos/manna-harbour-boa-32.png]] 2671[[https://github.com/manna-harbour][https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/logos/manna-harbour-boa-32.png]]
diff --git a/users/manna-harbour_miryoku/rules.mk b/users/manna-harbour_miryoku/rules.mk
index 809e63035..085f0b501 100644
--- a/users/manna-harbour_miryoku/rules.mk
+++ b/users/manna-harbour_miryoku/rules.mk
@@ -1,6 +1,6 @@
1# Copyright 2019 Manna Harbour 1# Copyright 2019 Manna Harbour
2# https://github.com/manna-harbour/miryoku 2# https://github.com/manna-harbour/miryoku
3# generated from users/manna-harbour_miryoku/miryoku.org -*- buffer-read-only: t -*- 3# generated -*- buffer-read-only: t -*-
4 4
5MOUSEKEY_ENABLE = yes # Mouse keys 5MOUSEKEY_ENABLE = yes # Mouse keys
6EXTRAKEY_ENABLE = yes # Audio control and System control 6EXTRAKEY_ENABLE = yes # Audio control and System control
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-19 17:10:35 +0000