aboutsummaryrefslogtreecommitdiff
path: root/keyboards/lily58
diff options
context:
space:
mode:
authorJonas Avellana <14019120+ninjonas@users.noreply.github.com>2020-02-17 02:30:03 -0700
committerGitHub <noreply@github.com>2020-02-17 01:30:03 -0800
commit79e6b7866988f3cfc1c5b6746e5f400b50704ce8 (patch)
tree79b72d2c165198fbd1715ac42b625dae1ab1e1a4 /keyboards/lily58
parent5e79da9f321a7b50fc82201ad51b1f1bfa0e0114 (diff)
downloadqmk_firmware-79e6b7866988f3cfc1c5b6746e5f400b50704ce8.tar.gz
qmk_firmware-79e6b7866988f3cfc1c5b6746e5f400b50704ce8.zip
[Keymap] ninjonas keymap updates (#8170)
* [keymap] ninjonas keymap updates * [refactor(kyria)] updating keymap for numpad layer to be transparent rather than ignores * [keymap(lily58)] added numpad layer * [keymap(crkbd)] added numpad layer activated through tapdance * [fix(8170)] fixing code review changes requested by noroadsleft * [fix(8170)] updating comments and .md files to use 'Cmd' instead of  and &#8984;
Diffstat (limited to 'keyboards/lily58')
-rw-r--r--keyboards/lily58/keymaps/ninjonas/README.md6
-rw-r--r--keyboards/lily58/keymaps/ninjonas/keymap.c112
2 files changed, 81 insertions, 37 deletions
diff --git a/keyboards/lily58/keymaps/ninjonas/README.md b/keyboards/lily58/keymaps/ninjonas/README.md
index 862252840..6ef9361f6 100644
--- a/keyboards/lily58/keymaps/ninjonas/README.md
+++ b/keyboards/lily58/keymaps/ninjonas/README.md
@@ -17,7 +17,7 @@ More information about the Lily58 pro keyboard can be found [here](https://yuchi
17 * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| 17 * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
18 * |LShift| Z | X | C | V | B |-------| |-------| N | M | , | . | / | = | 18 * |LShift| Z | X | C | V | B |-------| |-------| N | M | , | . | / | = |
19 * `-----------------------------------------/ / \ \-----------------------------------------' 19 * `-----------------------------------------/ / \ \-----------------------------------------'
20 * | Alt | | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER | 20 * | Alt | Cmd | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER |
21 * | | | |/ / \ \ | | | | 21 * | | | |/ / \ \ | | | |
22 * `----------------------------' '------''--------------------' 22 * `----------------------------' '------''--------------------'
23 */ 23 */
@@ -35,7 +35,7 @@ More information about the Lily58 pro keyboard can be found [here](https://yuchi
35 * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| 35 * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
36 * |LShift| ; | Q | J | K | X |-------| |-------| B | M | W | V | Z | = | 36 * |LShift| ; | Q | J | K | X |-------| |-------| B | M | W | V | Z | = |
37 * `-----------------------------------------/ / \ \-----------------------------------------' 37 * `-----------------------------------------/ / \ \-----------------------------------------'
38 * | Alt | | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER | 38 * | Alt | Cmd | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER |
39 * | | | |/ / \ \ | | | | 39 * | | | |/ / \ \ | | | |
40 * `----------------------------' '------''--------------------' 40 * `----------------------------' '------''--------------------'
41 */ 41 */
@@ -53,7 +53,7 @@ More information about the Lily58 pro keyboard can be found [here](https://yuchi
53 * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| 53 * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
54 * |LShift| Z | X | C | V | B |-------| |-------| K | M | , | . | / | = | 54 * |LShift| Z | X | C | V | B |-------| |-------| K | M | , | . | / | = |
55 * `-----------------------------------------/ / \ \-----------------------------------------' 55 * `-----------------------------------------/ / \ \-----------------------------------------'
56 * | Alt | | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER | 56 * | Alt | Cmd | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER |
57 * | | | |/ / \ \ | | | | 57 * | | | |/ / \ \ | | | |
58 * `----------------------------' '------''--------------------' 58 * `----------------------------' '------''--------------------'
59 */ 59 */
diff --git a/keyboards/lily58/keymaps/ninjonas/keymap.c b/keyboards/lily58/keymaps/ninjonas/keymap.c
index 0bd330a76..2976f9eaf 100644
--- a/keyboards/lily58/keymaps/ninjonas/keymap.c
+++ b/keyboards/lily58/keymaps/ninjonas/keymap.c
@@ -28,16 +28,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
28 * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| 28 * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
29 * |LShift| Z | X | C | V | B |-------| |-------| N | M | , | . | / | = | 29 * |LShift| Z | X | C | V | B |-------| |-------| N | M | , | . | / | = |
30 * `-----------------------------------------/ / \ \-----------------------------------------' 30 * `-----------------------------------------/ / \ \-----------------------------------------'
31 * | Alt | | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER | 31 * | Alt | Cmd | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER |
32 * | | | |/ / \ \ | | | | 32 * | | | |/ / \ \ | | | |
33 * `----------------------------' '------''--------------------' 33 * `----------------------------' '------''--------------------'
34 */ 34 */
35 [_QWERTY] = LAYOUT_wrapper( 35 [_QWERTY] = LAYOUT_wrapper(
36 _____________________NUM_LEFT_______________________, _____________________NUM_RIGHT______________________, \ 36 _____________________NUM_LEFT_______________________, _____________________NUM_RIGHT______________________,
37 _____________________QWERTY_L1______________________, _____________________QWERTY_R1______________________, \ 37 _____________________QWERTY_L1______________________, _____________________QWERTY_R1______________________,
38 _____________________QWERTY_L2______________________, _____________________QWERTY_R2______________________, \ 38 _____________________QWERTY_L2______________________, _____________________QWERTY_R2______________________,
39 _____________________QWERTY_L3______________________, T_LBRC, T_RBRC, _____________________QWERTY_R3______________________, \ 39 _____________________QWERTY_L3______________________, T_LBRC, T_RBRC, _____________________QWERTY_R3______________________,
40 _____________MOD_LEFT_____________, _____________MOD_RIGHT____________ \ 40 _____________MOD_LEFT_____________, _____________MOD_RIGHT____________
41 ), 41 ),
42 42
43/* DVORAK 43/* DVORAK
@@ -50,16 +50,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
50 * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| 50 * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
51 * |LShift| ; | Q | J | K | X |-------| |-------| B | M | W | V | Z | = | 51 * |LShift| ; | Q | J | K | X |-------| |-------| B | M | W | V | Z | = |
52 * `-----------------------------------------/ / \ \-----------------------------------------' 52 * `-----------------------------------------/ / \ \-----------------------------------------'
53 * | Alt | | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER | 53 * | Alt | Cmd | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER |
54 * | | | |/ / \ \ | | | | 54 * | | | |/ / \ \ | | | |
55 * `----------------------------' '------''--------------------' 55 * `----------------------------' '------''--------------------'
56 */ 56 */
57 [_DVORAK] = LAYOUT_wrapper( 57 [_DVORAK] = LAYOUT_wrapper(
58 _____________________NUM_LEFT_______________________, _____________________NUM_RIGHT______________________, \ 58 _____________________NUM_LEFT_______________________, _____________________NUM_RIGHT______________________,
59 _____________________DVORAK_L1______________________, _____________________DVORAK_R1______________________, \ 59 _____________________DVORAK_L1______________________, _____________________DVORAK_R1______________________,
60 _____________________DVORAK_L2______________________, _____________________DVORAK_R2______________________, \ 60 _____________________DVORAK_L2______________________, _____________________DVORAK_R2______________________,
61 _____________________DVORAK_L3______________________, T_LBRC, T_RBRC, _____________________DVORAK_R3______________________, \ 61 _____________________DVORAK_L3______________________, T_LBRC, T_RBRC, _____________________DVORAK_R3______________________,
62 _____________MOD_LEFT_____________, _____________MOD_RIGHT____________ \ 62 _____________MOD_LEFT_____________, _____________MOD_RIGHT____________
63 ), 63 ),
64 64
65/* COLEMAK 65/* COLEMAK
@@ -72,16 +72,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
72 * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| 72 * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
73 * |LShift| Z | X | C | V | B |-------| |-------| K | M | , | . | / | = | 73 * |LShift| Z | X | C | V | B |-------| |-------| K | M | , | . | / | = |
74 * `-----------------------------------------/ / \ \-----------------------------------------' 74 * `-----------------------------------------/ / \ \-----------------------------------------'
75 * | Alt | | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER | 75 * | Alt | Cmd | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER |
76 * | | | |/ / \ \ | | | | 76 * | | | |/ / \ \ | | | |
77 * `----------------------------' '------''--------------------' 77 * `----------------------------' '------''--------------------'
78 */ 78 */
79 [_COLEMAK] = LAYOUT_wrapper( 79 [_COLEMAK] = LAYOUT_wrapper(
80 _____________________NUM_LEFT_______________________, _____________________NUM_RIGHT______________________, \ 80 _____________________NUM_LEFT_______________________, _____________________NUM_RIGHT______________________,
81 _____________________COLEMAK_L1_____________________, _____________________COLEMAK_R1_____________________, \ 81 _____________________COLEMAK_L1_____________________, _____________________COLEMAK_R1_____________________,
82 _____________________COLEMAK_L2_____________________, _____________________COLEMAK_R2_____________________, \ 82 _____________________COLEMAK_L2_____________________, _____________________COLEMAK_R2_____________________,
83 _____________________COLEMAK_L3_____________________, T_LBRC, T_RBRC, _____________________COLEMAK_R3_____________________, \ 83 _____________________COLEMAK_L3_____________________, T_LBRC, T_RBRC, _____________________COLEMAK_R3_____________________,
84 _____________MOD_LEFT_____________, _____________MOD_RIGHT____________ \ 84 _____________MOD_LEFT_____________, _____________MOD_RIGHT____________
85 ), 85 ),
86 86
87/* LOWER 87/* LOWER
@@ -99,11 +99,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
99 * `----------------------------' '------''--------------------' 99 * `----------------------------' '------''--------------------'
100 */ 100 */
101[_LOWER] = LAYOUT_wrapper( \ 101[_LOWER] = LAYOUT_wrapper( \
102 _____________________FUNC_LEFT______________________, _____________________FUNC_RIGHT_____________________, \ 102 _____________________FUNC_LEFT______________________, _____________________FUNC_RIGHT_____________________,
103 _____________________LOWER_L1_______________________, _____________________LOWER_R1_______________________, \ 103 _____________________LOWER_L1_______________________, _____________________LOWER_R1_______________________,
104 _____________________LOWER_L2_______________________, _____________________LOWER_R2_______________________, \ 104 _____________________LOWER_L2_______________________, _____________________LOWER_R2_______________________,
105 _____________________LOWER_L3_______________________, _______, _______, _____________________LOWER_R3_______________________, \ 105 _____________________LOWER_L3_______________________, _______, _______, _____________________LOWER_R3_______________________,
106 __________________________________, _______, _______, M_CODE, _______ \ 106 __________________________________, _______, _______, M_CODE, _______
107 ), 107 ),
108 108
109/* RAISE 109/* RAISE
@@ -121,11 +121,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
121 * `----------------------------' '------''--------------------' 121 * `----------------------------' '------''--------------------'
122 */ 122 */
123[_RAISE] = LAYOUT_wrapper( \ 123[_RAISE] = LAYOUT_wrapper( \
124 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 124 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
125 XXXXXXX, XXXXXXX, _____________MOUSE_1______________, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 125 XXXXXXX, XXXXXXX, _____________MOUSE_1______________, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
126 XXXXXXX, XXXXXXX, _____________MOUSE_2______________, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 126 XXXXXXX, XXXXXXX, _____________MOUSE_2______________, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
127 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\ 127 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
128 __________________________________, __________________________________ \ 128 __________________________________, __________________________________
129 ), 129 ),
130 130
131/* ADJUST 131/* ADJUST
@@ -143,10 +143,54 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
143 * `----------------------------' '------''--------------------' 143 * `----------------------------' '------''--------------------'
144 */ 144 */
145[_ADJUST] = LAYOUT_wrapper( \ 145[_ADJUST] = LAYOUT_wrapper( \
146 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 146 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
147 _____________________ADJUST_L1______________________, _____________________ADJUST_R1______________________, \ 147 _____________________ADJUST_L1______________________, _____________________ADJUST_R1______________________,
148 _____________________ADJUST_L2______________________, _____________________ADJUST_R2______________________, \ 148 _____________________ADJUST_L2______________________, _____________________ADJUST_R2______________________,
149 _____________________ADJUST_L3______________________, XXXXXXX, XXXXXXX, _____________________ADJUST_R3______________________,\ 149 _____________________ADJUST_L3______________________, XXXXXXX, XXXXXXX, _____________________ADJUST_R3______________________,
150 __________________________________, __________________________________ \ 150 __________________________________, __________________________________
151 ), 151 ),
152}; \ No newline at end of file 152 /* TEMPLATE
153 * ,-----------------------------------------. ,-----------------------------------------.
154 * | | | | | | | | | | | | | |
155 * |------+------+------+------+------+------| |------+------+------+------+------+------|
156 * | | | | | | | | | | | | | |
157 * |------+------+------+------+------+------| |------+------+------+------+------+------|
158 * | | | | | | |-------. ,-------| | | | | | |
159 * |------+------+------+------+------+------| | | |------+------+------+------+------+------|
160 * | | | | | | |-------| |-------| | | | | | |
161 * `-----------------------------------------/ / \ \-----------------------------------------'
162 * | | | | / / \ \ | | | |
163 * | | | |/ / \ \ | | | |
164 * `----------------------------' '------''--------------------'
165 */
166[_NUMPAD] = LAYOUT_wrapper( \
167 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
168 _______, _______, _______, _______, _______, _______, _____________________NUMPAD_1_______________________,
169 _______, _______, _______, _______, _______, _______, _____________________NUMPAD_2_______________________,
170 _______, _______, _______, _______, _______, _______, _______, _______, _____________________NUMPAD_3_______________________,
171 __________________________________, __________________________________
172 ),
173};
174
175/* TEMPLATE
176 * ,-----------------------------------------. ,-----------------------------------------.
177 * | | | | | | | | | | | | | |
178 * |------+------+------+------+------+------| |------+------+------+------+------+------|
179 * | | | | | | | | | | | | | |
180 * |------+------+------+------+------+------| |------+------+------+------+------+------|
181 * | | | | | | |-------. ,-------| | | | | | |
182 * |------+------+------+------+------+------| | | |------+------+------+------+------+------|
183 * | | | | | | |-------| |-------| | | | | | |
184 * `-----------------------------------------/ / \ \-----------------------------------------'
185 * | | | | / / \ \ | | | |
186 * | | | |/ / \ \ | | | |
187 * `----------------------------' '------''--------------------'
188 *
189[_TEMPLATE] = LAYOUT_wrapper( \
190 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
191 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
192 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
193 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
194 __________________________________, __________________________________
195 ),
196*/ \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-18 16:45:07 +0000