aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2021-06-25 21:27:37 -0700
committerGitHub <noreply@github.com>2021-06-25 21:27:37 -0700
commitb1ea4842e38d0d3e609d8b0d6016ab0a4288bdc4 (patch)
treea494911bc56d556fb2cbdf52ade9a26b7cb4edec
parent234c129f1e393e5691606b7e52ec44cd3cd569a9 (diff)
downloadqmk_firmware-b1ea4842e38d0d3e609d8b0d6016ab0a4288bdc4.tar.gz
qmk_firmware-b1ea4842e38d0d3e609d8b0d6016ab0a4288bdc4.zip
FFKeebs Siris Configurator Layout Correction (#13328)
* physically arrange layout macro Arranges the layout macro and keycodes to resemble the assembled keyboard. * correct info.json data Corrects the key sequence and positioning in info.json.
Diffstat
-rw-r--r--keyboards/ffkeebs/siris/info.json362
-rw-r--r--keyboards/ffkeebs/siris/keymaps/default/keymap.c41
-rw-r--r--keyboards/ffkeebs/siris/keymaps/via/keymap.c41
-rw-r--r--keyboards/ffkeebs/siris/siris.h20
4 files changed, 123 insertions, 341 deletions
diff --git a/keyboards/ffkeebs/siris/info.json b/keyboards/ffkeebs/siris/info.json
index f81d216ad..cc03e69e2 100644
--- a/keyboards/ffkeebs/siris/info.json
+++ b/keyboards/ffkeebs/siris/info.json
@@ -1,293 +1,73 @@
1{ 1{
2 "keyboard_name":"Siris", 2 "keyboard_name": "Siris",
3 "url":"https://github.com/swiftrax", 3 "url": "https: //github.com/swiftrax",
4 "maintainer":"Swiftrax", 4 "maintainer": "Swiftrax",
5 "width":17.75, 5 "width": 16,
6 "height":5.5, 6 "height": 5.5,
7 "layouts":{ 7 "layouts": {
8 "LAYOUT":{ 8 "LAYOUT": {
9 "layout":[ 9 "layout": [
10 { 10 {"label":"0,0", "x":0, "y":0.375},
11 "label":"0,3", 11 {"label":"0,1", "x":1, "y":0.375},
12 "x":3.5, 12 {"label":"0,2", "x":2, "y":0.125},
13 "y":0 13 {"label":"0,3", "x":3, "y":0},
14 }, 14 {"label":"0,4", "x":4, "y":0.125},
15 { 15 {"label":"0,5", "x":5, "y":0.25},
16 "label":"0,8", 16 {"label":"0,6", "x":10, "y":0.25},
17 "x":13.75, 17 {"label":"0,7", "x":11, "y":0.125},
18 "y":0 18 {"label":"0,8", "x":12, "y":0},
19 }, 19 {"label":"0,9", "x":13, "y":0.125},
20 { 20 {"label":"0,10", "x":14, "y":0.375},
21 "label":"0,2", 21 {"label":"0,11", "x":15, "y":0.375},
22 "x":2.5, 22
23 "y":0.125 23 {"label":"1,0", "x":0, "y":1.375},
24 }, 24 {"label":"1,1", "x":1, "y":1.375},
25 { 25 {"label":"1,2", "x":2, "y":1.125},
26 "label":"0,4", 26 {"label":"1,3", "x":3, "y":1},
27 "x":4.5, 27 {"label":"1,4", "x":4, "y":1.125},
28 "y":0.125 28 {"label":"1,5", "x":5, "y":1.25},
29 }, 29 {"label":"1,6", "x":10, "y":1.25},
30 { 30 {"label":"1,7", "x":11, "y":1.125},
31 "label":"0,7", 31 {"label":"1,8", "x":12, "y":1},
32 "x":12.75, 32 {"label":"1,9", "x":13, "y":1.125},
33 "y":0.13 33 {"label":"1,10", "x":14, "y":1.375},
34 }, 34 {"label":"1,11", "x":15, "y":1.375},
35 { 35
36 "label":"0,9", 36 {"label":"2,0", "x":0, "y":2.375},
37 "x":14.75, 37 {"label":"2,1", "x":1, "y":2.375},
38 "y":0.13 38 {"label":"2,2", "x":2, "y":2.125},
39 }, 39 {"label":"2,3", "x":3, "y":2},
40 { 40 {"label":"2,4", "x":4, "y":2.125},
41 "label":"0,5", 41 {"label":"2,5", "x":5, "y":2.25},
42 "x":5.5, 42 {"label":"4,5", "x":6.25, "y":2.625},
43 "y":0.25 43 {"label":"4,6", "x":8.75, "y":2.625},
44 }, 44 {"label":"2,6", "x":10, "y":2.25},
45 { 45 {"label":"2,7", "x":11, "y":2.125},
46 "label":"0,6", 46 {"label":"2,8", "x":12, "y":2},
47 "x":11.75, 47 {"label":"2,9", "x":13, "y":2.125},
48 "y":0.25 48 {"label":"2,10", "x":14, "y":2.375},
49 }, 49 {"label":"2,11", "x":15, "y":2.375},
50 { 50
51 "label":"0,1", 51 {"label":"3,0", "x":0, "y":3.375},
52 "x":1.5, 52 {"label":"3,1", "x":1, "y":3.375},
53 "y":0.375 53 {"label":"3,2", "x":2, "y":3.125},
54 }, 54 {"label":"3,3", "x":3, "y":3},
55 { 55 {"label":"3,4", "x":4, "y":3.125},
56 "label":"0,0", 56 {"label":"3,5", "x":5, "y":3.25},
57 "x":0.5, 57 {"label":"3,6", "x":10, "y":3.25},
58 "y":0.38 58 {"label":"3,7", "x":11, "y":3.125},
59 }, 59 {"label":"3,8", "x":12, "y":3},
60 { 60 {"label":"3,9", "x":13, "y":3.125},
61 "label":"0,10", 61 {"label":"3,10", "x":14, "y":3.375},
62 "x":15.75, 62 {"label":"3,11", "x":15, "y":3.375},
63 "y":0.38 63
64 }, 64 {"label":"4,2", "x":3.75, "y":4.15},
65 { 65 {"label":"4,3", "x":4.75, "y":4.25},
66 "label":"0,11", 66 {"x":6, "y":4.5, "w":1.5},
67 "x":16.75, 67 {"x":8.5, "y":4.5, "w":1.5},
68 "y":0.38 68 {"label":"4,8", "x":10.25, "y":4.25},
69 }, 69 {"label":"4,0", "x":11.25, "y":4.15}
70 { 70 ]
71 "label":"1,3", 71 }
72 "x":3.5, 72 }
73 "y":1.0
74 },
75 {
76 "label":"1,8",
77 "x":13.75,
78 "y":1.0
79 },
80 {
81 "label":"1,2",
82 "x":2.5,
83 "y":1.125
84 },
85 {
86 "label":"1,4",
87 "x":4.5,
88 "y":1.125
89 },
90 {
91 "label":"1,7",
92 "x":12.75,
93 "y":1.13
94 },
95 {
96 "label":"1,9",
97 "x":14.75,
98 "y":1.13
99 },
100 {
101 "label":"1,5",
102 "x":5.5,
103 "y":1.25
104 },
105 {
106 "label":"1,6",
107 "x":11.75,
108 "y":1.25
109 },
110 {
111 "label":"1,1",
112 "x":1.5,
113 "y":1.375
114 },
115 {
116 "label":"1,0",
117 "x":0.5,
118 "y":1.38
119 },
120 {
121 "label":"1,10",
122 "x":15.75,
123 "y":1.38
124 },
125 {
126 "label":"1,11",
127 "x":16.75,
128 "y":1.38
129 },
130 {
131 "label":"2,3",
132 "x":3.5,
133 "y":2
134 },
135 {
136 "label":"2,8",
137 "x":13.75,
138 "y":2
139 },
140 {
141 "label":"2,2",
142 "x":2.5,
143 "y":2.125
144 },
145 {
146 "label":"2,4",
147 "x":4.5,
148 "y":2.125
149 },
150 {
151 "label":"2,7",
152 "x":12.75,
153 "y":2.13
154 },
155 {
156 "label":"2,9",
157 "x":14.75,
158 "y":2.13
159 },
160 {
161 "label":"2,5",
162 "x":5.5,
163 "y":2.25
164 },
165 {
166 "label":"2,6",
167 "x":11.75,
168 "y":2.25
169 },
170 {
171 "label":"2,1",
172 "x":1.5,
173 "y":2.375
174 },
175 {
176 "label":"2,0",
177 "x":0.5,
178 "y":2.38
179 },
180 {
181 "label":"2,10",
182 "x":15.75,
183 "y":2.38
184 },
185 {
186 "label":"2,11",
187 "x":16.75,
188 "y":2.38
189 },
190 {
191 "label":"4,5",
192 "x":6.75,
193 "y":2.63
194 },
195 {
196 "label":"4,6",
197 "x":10.5,
198 "y":2.63
199 },
200 {
201 "label":"3,3",
202 "x":3.5,
203 "y":3
204 },
205 {
206 "label":"3,8",
207 "x":13.75,
208 "y":3
209 },
210 {
211 "label":"3,2",
212 "x":2.5,
213 "y":3.125
214 },
215 {
216 "label":"3,4",
217 "x":4.5,
218 "y":3.125
219 },
220 {
221 "label":"3,7",
222 "x":12.75,
223 "y":3.13
224 },
225 {
226 "label":"3,9",
227 "x":14.75,
228 "y":3.13
229 },
230 {
231 "label":"3,5",
232 "x":5.5,
233 "y":3.25
234 },
235 {
236 "label":"3,6",
237 "x":11.75,
238 "y":3.25
239 },
240 {
241 "label":"3,1",
242 "x":1.5,
243 "y":3.375
244 },
245 {
246 "label":"3,0",
247 "x":0.5,
248 "y":3.38
249 },
250 {
251 "label":"3,10",
252 "x":15.75,
253 "y":3.38
254 },
255 {
256 "label":"3,11",
257 "x":16.75,
258 "y":3.38
259 },
260 {
261 "label":"4,2",
262 "x":4.25,
263 "y":4.15
264 },
265 {
266 "label":"4,0",
267 "x":13,
268 "y":4.15
269 },
270 {
271 "label":"4,3",
272 "x":5.25,
273 "y":4.25
274 },
275 {
276 "label":"4,8",
277 "x":12,
278 "y":4.25
279 },
280 {
281 "x":6.5,
282 "y":4.5,
283 "w":1.5
284 },
285 {
286 "x":10.25,
287 "y":4.5,
288 "w":1.5
289 }
290 ]
291 }
292 }
293} 73}
diff --git a/keyboards/ffkeebs/siris/keymaps/default/keymap.c b/keyboards/ffkeebs/siris/keymaps/default/keymap.c
index b9dabafd2..b77518415 100644
--- a/keyboards/ffkeebs/siris/keymaps/default/keymap.c
+++ b/keyboards/ffkeebs/siris/keymaps/default/keymap.c
@@ -18,30 +18,31 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
18 18
19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20 20
21
21[0] = LAYOUT( 22[0] = LAYOUT(
22 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, 23 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV,
23 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, 24 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS,
24 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, 25 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LBRC, KC_RBRC, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
25 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSLS, 26 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSLS,
26 KC_LGUI, MO(1), KC_SPC, KC_LBRC, KC_RBRC, KC_ENT, MO(2), KC_BSPC), 27 KC_LGUI, MO(1), KC_SPC, KC_ENT, MO(2), KC_BSPC),
27[1] = LAYOUT( 28[1] = LAYOUT(
28 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 29 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
29 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 30 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
30 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 31 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
31 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 32 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
32 _______, _______, _______, _______, _______, _______, _______, _______), 33 _______, _______, _______, _______, _______, _______),
33[2] = LAYOUT( 34[2] = LAYOUT(
34 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 35 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
35 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 36 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
36 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 37 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
37 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 38 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
38 _______, _______, _______, _______, _______, _______, _______, _______), 39 _______, _______, _______, _______, _______, _______),
39[3] = LAYOUT( 40[3] = LAYOUT(
40 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 41 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
41 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 42 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
42 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 43 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
43 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 44 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
44 _______, _______, _______, _______, _______, _______, _______, _______), 45 _______, _______, _______, _______, _______, _______),
45}; 46};
46 47
47bool encoder_update_user(uint8_t index, bool clockwise) { 48bool encoder_update_user(uint8_t index, bool clockwise) {
diff --git a/keyboards/ffkeebs/siris/keymaps/via/keymap.c b/keyboards/ffkeebs/siris/keymaps/via/keymap.c
index b9dabafd2..b77518415 100644
--- a/keyboards/ffkeebs/siris/keymaps/via/keymap.c
+++ b/keyboards/ffkeebs/siris/keymaps/via/keymap.c
@@ -18,30 +18,31 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
18 18
19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20 20
21
21[0] = LAYOUT( 22[0] = LAYOUT(
22 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, 23 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV,
23 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, 24 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS,
24 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, 25 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LBRC, KC_RBRC, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
25 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSLS, 26 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSLS,
26 KC_LGUI, MO(1), KC_SPC, KC_LBRC, KC_RBRC, KC_ENT, MO(2), KC_BSPC), 27 KC_LGUI, MO(1), KC_SPC, KC_ENT, MO(2), KC_BSPC),
27[1] = LAYOUT( 28[1] = LAYOUT(
28 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 29 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
29 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 30 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
30 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 31 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
31 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 32 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
32 _______, _______, _______, _______, _______, _______, _______, _______), 33 _______, _______, _______, _______, _______, _______),
33[2] = LAYOUT( 34[2] = LAYOUT(
34 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 35 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
35 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 36 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
36 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 37 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
37 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 38 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
38 _______, _______, _______, _______, _______, _______, _______, _______), 39 _______, _______, _______, _______, _______, _______),
39[3] = LAYOUT( 40[3] = LAYOUT(
40 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 41 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
41 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 42 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
42 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 43 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
43 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 44 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
44 _______, _______, _______, _______, _______, _______, _______, _______), 45 _______, _______, _______, _______, _______, _______),
45}; 46};
46 47
47bool encoder_update_user(uint8_t index, bool clockwise) { 48bool encoder_update_user(uint8_t index, bool clockwise) {
diff --git a/keyboards/ffkeebs/siris/siris.h b/keyboards/ffkeebs/siris/siris.h
index 1c355e8a5..13956bcce 100644
--- a/keyboards/ffkeebs/siris/siris.h
+++ b/keyboards/ffkeebs/siris/siris.h
@@ -23,15 +23,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
23#define XXX KC_NO 23#define XXX KC_NO
24 24
25#define LAYOUT( \ 25#define LAYOUT( \
26 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ 26 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
27 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \ 27 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
28 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ 28 K20, K21, K22, K23, K24, K25, K45, K46, K26, K27, K28, K29, K2A, K2B, \
29 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, \ 29 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, \
30 K42, K43, K44, K45, K46, K47, K48, K49 \ 30 K42, K43, K44, K47, K48, K49 \
31) { \ 31) { \
32 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \ 32 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
33 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \ 33 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
34 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \ 34 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
35 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B }, \ 35 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B }, \
36 { XXX, XXX, K42, K43, K44, K45, K46, K47, K48, K49, XXX, XXX } \ 36 { XXX, XXX, K42, K43, K44, K45, K46, K47, K48, K49, XXX, XXX } \
37} 37}
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-06 15:05:46 +0000