summaryrefslogtreecommitdiff
path: root/keyboards/viktus
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2023-06-22 16:32:06 +0000
committerQMK Bot <hello@qmk.fm>2023-06-22 16:32:06 +0000
commit94b74b537a5d5385cbf1fb2046cd7f55be09fbaa (patch)
tree1036fb818065b9ccd44204fd6f6f52764e3e3aad /keyboards/viktus
parentaad57466827c6aac8f612f5fbbb5adcea6fc5975 (diff)
parentc01a3cfacaf6ce39b23ec81270549734b6ca1c71 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/viktus')
-rw-r--r--keyboards/viktus/osav2_numpad/info.json44
-rw-r--r--keyboards/viktus/osav2_numpad/keymaps/default/keymap.c2
-rw-r--r--keyboards/viktus/osav2_numpad/keymaps/via/keymap.c2
3 files changed, 28 insertions, 20 deletions
diff --git a/keyboards/viktus/osav2_numpad/info.json b/keyboards/viktus/osav2_numpad/info.json
index d347631ccc..941d65f367 100644
--- a/keyboards/viktus/osav2_numpad/info.json
+++ b/keyboards/viktus/osav2_numpad/info.json
@@ -39,8 +39,16 @@
39 "twinkle": true 39 "twinkle": true
40 } 40 }
41 }, 41 },
42 "layout_aliases": {
43 "LAYOUT_all_split": "LAYOUT_ortho_5x4",
44 "LAYOUT_2u_plus_2u_enter_2u_zero": "LAYOUT_numpad_5x4"
45 },
46 "community_layouts": [
47 "ortho_5x4",
48 "numpad_5x4"
49 ],
42 "layouts": { 50 "layouts": {
43 "LAYOUT_all_split": { 51 "LAYOUT_ortho_5x4": {
44 "layout": [ 52 "layout": [
45 {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0}, 53 {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
46 {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0}, 54 {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
@@ -84,7 +92,7 @@
84 {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4}, 92 {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4},
85 {"label": "K41", "matrix": [4, 1], "x": 1, "y": 4}, 93 {"label": "K41", "matrix": [4, 1], "x": 1, "y": 4},
86 {"label": "K42", "matrix": [4, 2], "x": 2, "y": 4}, 94 {"label": "K42", "matrix": [4, 2], "x": 2, "y": 4},
87 {"label": "K43", "matrix": [4, 3], "h": 2, "x": 3, "y": 3} 95 {"label": "K43", "matrix": [4, 3], "x": 3, "y": 3, "h": 2}
88 ] 96 ]
89 }, 97 },
90 "LAYOUT_2u_plus_2u_enter": { 98 "LAYOUT_2u_plus_2u_enter": {
@@ -99,14 +107,14 @@
99 {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2}, 107 {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2},
100 {"label": "K21", "matrix": [2, 1], "x": 1, "y": 2}, 108 {"label": "K21", "matrix": [2, 1], "x": 1, "y": 2},
101 {"label": "K22", "matrix": [2, 2], "x": 2, "y": 2}, 109 {"label": "K22", "matrix": [2, 2], "x": 2, "y": 2},
102 {"label": "K23", "matrix": [2, 3], "h": 2, "x": 3, "y": 1}, 110 {"label": "K23", "matrix": [2, 3], "x": 3, "y": 1, "h": 2},
103 {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3}, 111 {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3},
104 {"label": "K31", "matrix": [3, 1], "x": 1, "y": 3}, 112 {"label": "K31", "matrix": [3, 1], "x": 1, "y": 3},
105 {"label": "K32", "matrix": [3, 2], "x": 2, "y": 3}, 113 {"label": "K32", "matrix": [3, 2], "x": 2, "y": 3},
106 {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4}, 114 {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4},
107 {"label": "K41", "matrix": [4, 1], "x": 1, "y": 4}, 115 {"label": "K41", "matrix": [4, 1], "x": 1, "y": 4},
108 {"label": "K42", "matrix": [4, 2], "x": 2, "y": 4}, 116 {"label": "K42", "matrix": [4, 2], "x": 2, "y": 4},
109 {"label": "K43", "matrix": [4, 3], "h": 2, "x": 3, "y": 3} 117 {"label": "K43", "matrix": [4, 3], "x": 3, "y": 3, "h": 2}
110 ] 118 ]
111 }, 119 },
112 "LAYOUT_2u_enter_2u_zero": { 120 "LAYOUT_2u_enter_2u_zero": {
@@ -126,12 +134,12 @@
126 {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3}, 134 {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3},
127 {"label": "K31", "matrix": [3, 1], "x": 1, "y": 3}, 135 {"label": "K31", "matrix": [3, 1], "x": 1, "y": 3},
128 {"label": "K32", "matrix": [3, 2], "x": 2, "y": 3}, 136 {"label": "K32", "matrix": [3, 2], "x": 2, "y": 3},
129 {"label": "K41", "matrix": [4, 1], "h": 2, "x": 0, "y": 4}, 137 {"label": "K41", "matrix": [4, 1], "x": 0, "y": 4, "w": 2},
130 {"label": "K42", "matrix": [4, 2], "x": 2, "y": 4}, 138 {"label": "K42", "matrix": [4, 2], "x": 2, "y": 4},
131 {"label": "K43", "matrix": [4, 3], "h": 2, "x": 3, "y": 3} 139 {"label": "K43", "matrix": [4, 3], "x": 3, "y": 3, "h": 2}
132 ] 140 ]
133 }, 141 },
134 "LAYOUT_2u_plus_2u_enter_2u_zero": { 142 "LAYOUT_numpad_5x4": {
135 "layout": [ 143 "layout": [
136 {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0}, 144 {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
137 {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0}, 145 {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
@@ -143,13 +151,13 @@
143 {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2}, 151 {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2},
144 {"label": "K21", "matrix": [2, 1], "x": 1, "y": 2}, 152 {"label": "K21", "matrix": [2, 1], "x": 1, "y": 2},
145 {"label": "K22", "matrix": [2, 2], "x": 2, "y": 2}, 153 {"label": "K22", "matrix": [2, 2], "x": 2, "y": 2},
146 {"label": "K23", "matrix": [2, 3], "h": 2, "x": 3, "y": 1}, 154 {"label": "K23", "matrix": [2, 3], "x": 3, "y": 1, "h": 2},
147 {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3}, 155 {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3},
148 {"label": "K31", "matrix": [3, 1], "x": 1, "y": 3}, 156 {"label": "K31", "matrix": [3, 1], "x": 1, "y": 3},
149 {"label": "K32", "matrix": [3, 2], "x": 2, "y": 3}, 157 {"label": "K32", "matrix": [3, 2], "x": 2, "y": 3},
150 {"label": "K41", "matrix": [4, 1], "h": 2, "x": 0, "y": 4}, 158 {"label": "K41", "matrix": [4, 1], "x": 0, "y": 4, "w": 2},
151 {"label": "K42", "matrix": [4, 2], "x": 2, "y": 4}, 159 {"label": "K42", "matrix": [4, 2], "x": 2, "y": 4},
152 {"label": "K43", "matrix": [4, 3], "h": 2, "x": 3, "y": 3} 160 {"label": "K43", "matrix": [4, 3], "x": 3, "y": 3, "h": 2}
153 ] 161 ]
154 }, 162 },
155 "LAYOUT_mirrored_2u_enter": { 163 "LAYOUT_mirrored_2u_enter": {
@@ -169,7 +177,7 @@
169 {"label": "K31", "matrix": [3, 1], "x": 1, "y": 3}, 177 {"label": "K31", "matrix": [3, 1], "x": 1, "y": 3},
170 {"label": "K32", "matrix": [3, 2], "x": 2, "y": 3}, 178 {"label": "K32", "matrix": [3, 2], "x": 2, "y": 3},
171 {"label": "K33", "matrix": [3, 3], "x": 3, "y": 3}, 179 {"label": "K33", "matrix": [3, 3], "x": 3, "y": 3},
172 {"label": "K40", "matrix": [4, 0], "h": 2, "x": 0, "y": 3}, 180 {"label": "K40", "matrix": [4, 0], "x": 0, "y": 3, "h": 2},
173 {"label": "K41", "matrix": [4, 1], "x": 1, "y": 4}, 181 {"label": "K41", "matrix": [4, 1], "x": 1, "y": 4},
174 {"label": "K42", "matrix": [4, 2], "x": 2, "y": 4}, 182 {"label": "K42", "matrix": [4, 2], "x": 2, "y": 4},
175 {"label": "K43", "matrix": [4, 3], "x": 3, "y": 4} 183 {"label": "K43", "matrix": [4, 3], "x": 3, "y": 4}
@@ -184,14 +192,14 @@
184 {"label": "K11", "matrix": [1, 1], "x": 1, "y": 1}, 192 {"label": "K11", "matrix": [1, 1], "x": 1, "y": 1},
185 {"label": "K12", "matrix": [1, 2], "x": 2, "y": 1}, 193 {"label": "K12", "matrix": [1, 2], "x": 2, "y": 1},
186 {"label": "K13", "matrix": [1, 3], "x": 3, "y": 1}, 194 {"label": "K13", "matrix": [1, 3], "x": 3, "y": 1},
187 {"label": "K20", "matrix": [2, 0], "h": 2, "x": 0, "y": 1}, 195 {"label": "K20", "matrix": [2, 0], "x": 0, "y": 1, "h": 2},
188 {"label": "K21", "matrix": [2, 1], "x": 1, "y": 2}, 196 {"label": "K21", "matrix": [2, 1], "x": 1, "y": 2},
189 {"label": "K22", "matrix": [2, 2], "x": 2, "y": 2}, 197 {"label": "K22", "matrix": [2, 2], "x": 2, "y": 2},
190 {"label": "K23", "matrix": [2, 3], "x": 3, "y": 2}, 198 {"label": "K23", "matrix": [2, 3], "x": 3, "y": 2},
191 {"label": "K31", "matrix": [3, 1], "x": 1, "y": 3}, 199 {"label": "K31", "matrix": [3, 1], "x": 1, "y": 3},
192 {"label": "K32", "matrix": [3, 2], "x": 2, "y": 3}, 200 {"label": "K32", "matrix": [3, 2], "x": 2, "y": 3},
193 {"label": "K33", "matrix": [3, 3], "x": 3, "y": 3}, 201 {"label": "K33", "matrix": [3, 3], "x": 3, "y": 3},
194 {"label": "K40", "matrix": [4, 0], "h": 2, "x": 0, "y": 3}, 202 {"label": "K40", "matrix": [4, 0], "x": 0, "y": 3, "h": 2},
195 {"label": "K41", "matrix": [4, 1], "x": 1, "y": 4}, 203 {"label": "K41", "matrix": [4, 1], "x": 1, "y": 4},
196 {"label": "K42", "matrix": [4, 2], "x": 2, "y": 4}, 204 {"label": "K42", "matrix": [4, 2], "x": 2, "y": 4},
197 {"label": "K43", "matrix": [4, 3], "x": 3, "y": 4} 205 {"label": "K43", "matrix": [4, 3], "x": 3, "y": 4}
@@ -214,9 +222,9 @@
214 {"label": "K31", "matrix": [3, 1], "x": 1, "y": 3}, 222 {"label": "K31", "matrix": [3, 1], "x": 1, "y": 3},
215 {"label": "K32", "matrix": [3, 2], "x": 2, "y": 3}, 223 {"label": "K32", "matrix": [3, 2], "x": 2, "y": 3},
216 {"label": "K33", "matrix": [3, 3], "x": 3, "y": 3}, 224 {"label": "K33", "matrix": [3, 3], "x": 3, "y": 3},
217 {"label": "K40", "matrix": [4, 0], "h": 2, "x": 0, "y": 3}, 225 {"label": "K40", "matrix": [4, 0], "x": 0, "y": 3, "h": 2},
218 {"label": "K41", "matrix": [4, 1], "x": 1, "y": 4}, 226 {"label": "K41", "matrix": [4, 1], "x": 1, "y": 4},
219 {"label": "K42", "matrix": [4, 2], "w": 2, "x": 2, "y": 4} 227 {"label": "K42", "matrix": [4, 2], "x": 2, "y": 4, "w": 2}
220 ] 228 ]
221 }, 229 },
222 "LAYOUT_mirrored_2u_plus_2u_enter_2u_zero": { 230 "LAYOUT_mirrored_2u_plus_2u_enter_2u_zero": {
@@ -228,16 +236,16 @@
228 {"label": "K11", "matrix": [1, 1], "x": 1, "y": 1}, 236 {"label": "K11", "matrix": [1, 1], "x": 1, "y": 1},
229 {"label": "K12", "matrix": [1, 2], "x": 2, "y": 1}, 237 {"label": "K12", "matrix": [1, 2], "x": 2, "y": 1},
230 {"label": "K13", "matrix": [1, 3], "x": 3, "y": 1}, 238 {"label": "K13", "matrix": [1, 3], "x": 3, "y": 1},
231 {"label": "K20", "matrix": [2, 0], "h": 2, "x": 0, "y": 1}, 239 {"label": "K20", "matrix": [2, 0], "x": 0, "y": 1, "h": 2},
232 {"label": "K21", "matrix": [2, 1], "x": 1, "y": 2}, 240 {"label": "K21", "matrix": [2, 1], "x": 1, "y": 2},
233 {"label": "K22", "matrix": [2, 2], "x": 2, "y": 2}, 241 {"label": "K22", "matrix": [2, 2], "x": 2, "y": 2},
234 {"label": "K23", "matrix": [2, 3], "x": 3, "y": 2}, 242 {"label": "K23", "matrix": [2, 3], "x": 3, "y": 2},
235 {"label": "K31", "matrix": [3, 1], "x": 1, "y": 3}, 243 {"label": "K31", "matrix": [3, 1], "x": 1, "y": 3},
236 {"label": "K32", "matrix": [3, 2], "x": 2, "y": 3}, 244 {"label": "K32", "matrix": [3, 2], "x": 2, "y": 3},
237 {"label": "K33", "matrix": [3, 3], "x": 3, "y": 3}, 245 {"label": "K33", "matrix": [3, 3], "x": 3, "y": 3},
238 {"label": "K40", "matrix": [4, 0], "h": 2, "x": 0, "y": 3}, 246 {"label": "K40", "matrix": [4, 0], "x": 0, "y": 3, "h": 2},
239 {"label": "K41", "matrix": [4, 1], "x": 1, "y": 4}, 247 {"label": "K41", "matrix": [4, 1], "x": 1, "y": 4},
240 {"label": "K42", "matrix": [4, 2], "w": 2, "x": 2, "y": 4} 248 {"label": "K42", "matrix": [4, 2], "x": 2, "y": 4, "w": 2}
241 ] 249 ]
242 } 250 }
243 } 251 }
diff --git a/keyboards/viktus/osav2_numpad/keymaps/default/keymap.c b/keyboards/viktus/osav2_numpad/keymaps/default/keymap.c
index ce8a1d2774..ac99f1d8c7 100644
--- a/keyboards/viktus/osav2_numpad/keymaps/default/keymap.c
+++ b/keyboards/viktus/osav2_numpad/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
17#include QMK_KEYBOARD_H 17#include QMK_KEYBOARD_H
18 18
19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20 [0] = LAYOUT_all_split( 20 [0] = LAYOUT_ortho_5x4(
21 KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, 21 KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
22 KC_P7, KC_P8, KC_P9, KC_PPLS, 22 KC_P7, KC_P8, KC_P9, KC_PPLS,
23 KC_P4, KC_P5, KC_P6, KC_PEQL, 23 KC_P4, KC_P5, KC_P6, KC_PEQL,
diff --git a/keyboards/viktus/osav2_numpad/keymaps/via/keymap.c b/keyboards/viktus/osav2_numpad/keymaps/via/keymap.c
index ce8a1d2774..ac99f1d8c7 100644
--- a/keyboards/viktus/osav2_numpad/keymaps/via/keymap.c
+++ b/keyboards/viktus/osav2_numpad/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
17#include QMK_KEYBOARD_H 17#include QMK_KEYBOARD_H
18 18
19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20 [0] = LAYOUT_all_split( 20 [0] = LAYOUT_ortho_5x4(
21 KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, 21 KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
22 KC_P7, KC_P8, KC_P9, KC_PPLS, 22 KC_P7, KC_P8, KC_P9, KC_PPLS,
23 KC_P4, KC_P5, KC_P6, KC_PEQL, 23 KC_P4, KC_P5, KC_P6, KC_PEQL,
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-03 05:34:19 +0000