1
0
Fork 0

Move miscellaneous layouts to data driven (#20516)

This commit is contained in:
Ryan 2023-04-25 02:38:35 +10:00 committed by GitHub
parent 72d2be24f9
commit f111bea3cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
288 changed files with 19592 additions and 21083 deletions

View file

@ -32,21 +32,216 @@
"processor": "atmega32u2",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_grid": {
"layout":
[{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"CTRL", "x":0, "y":3}, {"label":"WIN", "x":1, "y":3}, {"label":"MENU", "x":2, "y":3}, {"label":"ALT", "x":3, "y":3}, {"label":"⇓", "x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"label":"⇑", "x":7, "y":3}, {"label":"LEFT", "x":8, "y":3}, {"label":"DOWN", "x":9, "y":3}, {"label":"UP", "x":10, "y":3}, {"label":"RIGHT", "x":11, "y":3}]
},
"LAYOUT_2u": {
"layout":
[{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"CTRL", "x":0, "y":3}, {"label":"WIN", "x":1, "y":3}, {"label":"MENU", "x":2, "y":3}, {"label":"ALT", "x":3, "y":3}, {"label":"⇓", "x":4, "y":3}, {"x":5, "y":3, "w":2}, {"label":"⇑", "x":7, "y":3}, {"label":"LEFT", "x":8, "y":3}, {"label":"DOWN", "x":9, "y":3}, {"label":"UP", "x":10, "y":3}, {"label":"RIGHT", "x":11, "y":3}]
},
"LAYOUT_2x225u": {
"layout":
[{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"CTRL", "x":0, "y":3, "w":1.25}, {"label":"WIN", "x":1.25, "y":3, "w":1.25}, {"label":"ALT", "x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":2.25}, {"x":6, "y":3, "w":2.25}, {"label":"ALT", "x":8.25, "y":3, "w":1.25}, {"label":"MENU", "x":9.5, "y":3, "w":1.25}, {"label":"CTRL", "x":10.75, "y":3, "w":1.25}]
},
"LAYOUT_2x3u": {
"layout":
[{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"CTRL", "x":0, "y":3}, {"label":"WIN", "x":1, "y":3}, {"label":"ALT", "x":2, "y":3}, {"x":3, "y":3, "w":3}, {"x":6, "y":3, "w":3}, {"label":"ALT", "x":9, "y":3}, {"label":"MENU", "x":10, "y":3}, {"label":"CTRL", "x":11, "y":3}]
}
}
}
"LAYOUT_grid": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [1, 0], "x": 1, "y": 0},
{"matrix": [1, 1], "x": 2, "y": 0},
{"matrix": [0, 1], "x": 3, "y": 0},
{"matrix": [0, 2], "x": 4, "y": 0},
{"matrix": [1, 2], "x": 5, "y": 0},
{"matrix": [1, 3], "x": 6, "y": 0},
{"matrix": [0, 3], "x": 7, "y": 0},
{"matrix": [0, 4], "x": 8, "y": 0},
{"matrix": [1, 4], "x": 9, "y": 0},
{"matrix": [1, 5], "x": 10, "y": 0},
{"matrix": [0, 5], "x": 11, "y": 0},
{"matrix": [2, 0], "x": 0, "y": 1},
{"matrix": [3, 0], "x": 1, "y": 1},
{"matrix": [3, 1], "x": 2, "y": 1},
{"matrix": [2, 1], "x": 3, "y": 1},
{"matrix": [2, 2], "x": 4, "y": 1},
{"matrix": [3, 2], "x": 5, "y": 1},
{"matrix": [3, 3], "x": 6, "y": 1},
{"matrix": [2, 3], "x": 7, "y": 1},
{"matrix": [2, 4], "x": 8, "y": 1},
{"matrix": [3, 4], "x": 9, "y": 1},
{"matrix": [3, 5], "x": 10, "y": 1},
{"matrix": [2, 5], "x": 11, "y": 1},
{"matrix": [4, 0], "x": 0, "y": 2},
{"matrix": [5, 0], "x": 1, "y": 2},
{"matrix": [5, 1], "x": 2, "y": 2},
{"matrix": [4, 1], "x": 3, "y": 2},
{"matrix": [4, 2], "x": 4, "y": 2},
{"matrix": [5, 2], "x": 5, "y": 2},
{"matrix": [5, 3], "x": 6, "y": 2},
{"matrix": [4, 3], "x": 7, "y": 2},
{"matrix": [4, 4], "x": 8, "y": 2},
{"matrix": [5, 4], "x": 9, "y": 2},
{"matrix": [5, 5], "x": 10, "y": 2},
{"matrix": [4, 5], "x": 11, "y": 2},
{"matrix": [6, 0], "x": 0, "y": 3},
{"matrix": [7, 0], "x": 1, "y": 3},
{"matrix": [7, 1], "x": 2, "y": 3},
{"matrix": [6, 1], "x": 3, "y": 3},
{"matrix": [6, 2], "x": 4, "y": 3},
{"matrix": [7, 2], "x": 5, "y": 3},
{"matrix": [7, 3], "x": 6, "y": 3},
{"matrix": [6, 3], "x": 7, "y": 3},
{"matrix": [6, 4], "x": 8, "y": 3},
{"matrix": [7, 4], "x": 9, "y": 3},
{"matrix": [7, 5], "x": 10, "y": 3},
{"matrix": [6, 5], "x": 11, "y": 3}
]
},
"LAYOUT_2u": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [1, 0], "x": 1, "y": 0},
{"matrix": [1, 1], "x": 2, "y": 0},
{"matrix": [0, 1], "x": 3, "y": 0},
{"matrix": [0, 2], "x": 4, "y": 0},
{"matrix": [1, 2], "x": 5, "y": 0},
{"matrix": [1, 3], "x": 6, "y": 0},
{"matrix": [0, 3], "x": 7, "y": 0},
{"matrix": [0, 4], "x": 8, "y": 0},
{"matrix": [1, 4], "x": 9, "y": 0},
{"matrix": [1, 5], "x": 10, "y": 0},
{"matrix": [0, 5], "x": 11, "y": 0},
{"matrix": [2, 0], "x": 0, "y": 1},
{"matrix": [3, 0], "x": 1, "y": 1},
{"matrix": [3, 1], "x": 2, "y": 1},
{"matrix": [2, 1], "x": 3, "y": 1},
{"matrix": [2, 2], "x": 4, "y": 1},
{"matrix": [3, 2], "x": 5, "y": 1},
{"matrix": [3, 3], "x": 6, "y": 1},
{"matrix": [2, 3], "x": 7, "y": 1},
{"matrix": [2, 4], "x": 8, "y": 1},
{"matrix": [3, 4], "x": 9, "y": 1},
{"matrix": [3, 5], "x": 10, "y": 1},
{"matrix": [2, 5], "x": 11, "y": 1},
{"matrix": [4, 0], "x": 0, "y": 2},
{"matrix": [5, 0], "x": 1, "y": 2},
{"matrix": [5, 1], "x": 2, "y": 2},
{"matrix": [4, 1], "x": 3, "y": 2},
{"matrix": [4, 2], "x": 4, "y": 2},
{"matrix": [5, 2], "x": 5, "y": 2},
{"matrix": [5, 3], "x": 6, "y": 2},
{"matrix": [4, 3], "x": 7, "y": 2},
{"matrix": [4, 4], "x": 8, "y": 2},
{"matrix": [5, 4], "x": 9, "y": 2},
{"matrix": [5, 5], "x": 10, "y": 2},
{"matrix": [4, 5], "x": 11, "y": 2},
{"matrix": [6, 0], "x": 0, "y": 3},
{"matrix": [7, 0], "x": 1, "y": 3},
{"matrix": [7, 1], "x": 2, "y": 3},
{"matrix": [6, 1], "x": 3, "y": 3},
{"matrix": [6, 2], "x": 4, "y": 3},
{"matrix": [7, 3], "x": 5, "y": 3, "w": 2},
{"matrix": [6, 3], "x": 7, "y": 3},
{"matrix": [6, 4], "x": 8, "y": 3},
{"matrix": [7, 4], "x": 9, "y": 3},
{"matrix": [7, 5], "x": 10, "y": 3},
{"matrix": [6, 5], "x": 11, "y": 3}
]
},
"LAYOUT_2x225u": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [1, 0], "x": 1, "y": 0},
{"matrix": [1, 1], "x": 2, "y": 0},
{"matrix": [0, 1], "x": 3, "y": 0},
{"matrix": [0, 2], "x": 4, "y": 0},
{"matrix": [1, 2], "x": 5, "y": 0},
{"matrix": [1, 3], "x": 6, "y": 0},
{"matrix": [0, 3], "x": 7, "y": 0},
{"matrix": [0, 4], "x": 8, "y": 0},
{"matrix": [1, 4], "x": 9, "y": 0},
{"matrix": [1, 5], "x": 10, "y": 0},
{"matrix": [0, 5], "x": 11, "y": 0},
{"matrix": [2, 0], "x": 0, "y": 1},
{"matrix": [3, 0], "x": 1, "y": 1},
{"matrix": [3, 1], "x": 2, "y": 1},
{"matrix": [2, 1], "x": 3, "y": 1},
{"matrix": [2, 2], "x": 4, "y": 1},
{"matrix": [3, 2], "x": 5, "y": 1},
{"matrix": [3, 3], "x": 6, "y": 1},
{"matrix": [2, 3], "x": 7, "y": 1},
{"matrix": [2, 4], "x": 8, "y": 1},
{"matrix": [3, 4], "x": 9, "y": 1},
{"matrix": [3, 5], "x": 10, "y": 1},
{"matrix": [2, 5], "x": 11, "y": 1},
{"matrix": [4, 0], "x": 0, "y": 2},
{"matrix": [5, 0], "x": 1, "y": 2},
{"matrix": [5, 1], "x": 2, "y": 2},
{"matrix": [4, 1], "x": 3, "y": 2},
{"matrix": [4, 2], "x": 4, "y": 2},
{"matrix": [5, 2], "x": 5, "y": 2},
{"matrix": [5, 3], "x": 6, "y": 2},
{"matrix": [4, 3], "x": 7, "y": 2},
{"matrix": [4, 4], "x": 8, "y": 2},
{"matrix": [5, 4], "x": 9, "y": 2},
{"matrix": [5, 5], "x": 10, "y": 2},
{"matrix": [4, 5], "x": 11, "y": 2},
{"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
{"matrix": [7, 0], "x": 1.25, "y": 3, "w": 1.25},
{"matrix": [6, 1], "x": 2.5, "y": 3, "w": 1.25},
{"matrix": [6, 2], "x": 3.75, "y": 3, "w": 2.25},
{"matrix": [6, 3], "x": 6, "y": 3, "w": 2.25},
{"matrix": [6, 4], "x": 8.25, "y": 3, "w": 1.25},
{"matrix": [7, 5], "x": 9.5, "y": 3, "w": 1.25},
{"matrix": [6, 5], "x": 10.75, "y": 3, "w": 1.25}
]
},
"LAYOUT_2x3u": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [1, 0], "x": 1, "y": 0},
{"matrix": [1, 1], "x": 2, "y": 0},
{"matrix": [0, 1], "x": 3, "y": 0},
{"matrix": [0, 2], "x": 4, "y": 0},
{"matrix": [1, 2], "x": 5, "y": 0},
{"matrix": [1, 3], "x": 6, "y": 0},
{"matrix": [0, 3], "x": 7, "y": 0},
{"matrix": [0, 4], "x": 8, "y": 0},
{"matrix": [1, 4], "x": 9, "y": 0},
{"matrix": [1, 5], "x": 10, "y": 0},
{"matrix": [0, 5], "x": 11, "y": 0},
{"matrix": [2, 0], "x": 0, "y": 1},
{"matrix": [3, 0], "x": 1, "y": 1},
{"matrix": [3, 1], "x": 2, "y": 1},
{"matrix": [2, 1], "x": 3, "y": 1},
{"matrix": [2, 2], "x": 4, "y": 1},
{"matrix": [3, 2], "x": 5, "y": 1},
{"matrix": [3, 3], "x": 6, "y": 1},
{"matrix": [2, 3], "x": 7, "y": 1},
{"matrix": [2, 4], "x": 8, "y": 1},
{"matrix": [3, 4], "x": 9, "y": 1},
{"matrix": [3, 5], "x": 10, "y": 1},
{"matrix": [2, 5], "x": 11, "y": 1},
{"matrix": [4, 0], "x": 0, "y": 2},
{"matrix": [5, 0], "x": 1, "y": 2},
{"matrix": [5, 1], "x": 2, "y": 2},
{"matrix": [4, 1], "x": 3, "y": 2},
{"matrix": [4, 2], "x": 4, "y": 2},
{"matrix": [5, 2], "x": 5, "y": 2},
{"matrix": [5, 3], "x": 6, "y": 2},
{"matrix": [4, 3], "x": 7, "y": 2},
{"matrix": [4, 4], "x": 8, "y": 2},
{"matrix": [5, 4], "x": 9, "y": 2},
{"matrix": [5, 5], "x": 10, "y": 2},
{"matrix": [4, 5], "x": 11, "y": 2},
{"matrix": [6, 0], "x": 0, "y": 3},
{"matrix": [7, 0], "x": 1, "y": 3},
{"matrix": [7, 1], "x": 2, "y": 3},
{"matrix": [6, 2], "x": 3, "y": 3, "w": 3},
{"matrix": [6, 3], "x": 6, "y": 3, "w": 3},
{"matrix": [7, 4], "x": 9, "y": 3},
{"matrix": [7, 5], "x": 10, "y": 3},
{"matrix": [6, 5], "x": 11, "y": 3}
]
}
}
}

View file

@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "quark_plus.h"
#include "quantum.h"
bool encoder_update_kb(uint8_t index, bool clockwise) {
if (!encoder_update_user(index, clockwise)) { return false; }

View file

@ -1,82 +0,0 @@
/* Copyright 2022 Nathan Spears
*
* 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/>.
*/
#pragma once
#include "quantum.h"
#define XXX KC_NO
#define LAYOUT_grid( \
k00, k10, k11, k01, k02, k12, k13, k03, k04, k14, k15, k05, \
k20, k30, k31, k21, k22, k32, k33, k23, k24, k34, k35, k25, \
k40, k50, k51, k41, k42, k52, k53, k43, k44, k54, k55, k45, \
k60, k70, k71, k61, k62, k72, k73, k63, k64, k74, k75, k65 \
) { \
{ k00, k01, k02, k03, k04, k05 }, \
{ k10, k11, k12, k13, k14, k15 }, \
{ k20, k21, k22, k23, k24, k25 }, \
{ k30, k31, k32, k33, k34, k35 }, \
{ k40, k41, k42, k43, k44, k45 }, \
{ k50, k51, k52, k53, k54, k55 }, \
{ k60, k61, k62, k63, k64, k65 }, \
{ k70, k71, k72, k73, k74, k75 } \
}
#define LAYOUT_2u( \
k00, k10, k11, k01, k02, k12, k13, k03, k04, k14, k15, k05, \
k20, k30, k31, k21, k22, k32, k33, k23, k24, k34, k35, k25, \
k40, k50, k51, k41, k42, k52, k53, k43, k44, k54, k55, k45, \
k60, k70, k71, k61, k62, k73, k63, k64, k74, k75, k65 \
) { \
{ k00, k01, k02, k03, k04, k05 }, \
{ k10, k11, k12, k13, k14, k15 }, \
{ k20, k21, k22, k23, k24, k25 }, \
{ k30, k31, k32, k33, k34, k35 }, \
{ k40, k41, k42, k43, k44, k45 }, \
{ k50, k51, k52, k53, k54, k55 }, \
{ k60, k61, k62, k63, k64, k65 }, \
{ k70, k71, XXX, k73, k74, k75 } \
}
#define LAYOUT_2x225u( \
k00, k10, k11, k01, k02, k12, k13, k03, k04, k14, k15, k05, \
k20, k30, k31, k21, k22, k32, k33, k23, k24, k34, k35, k25, \
k40, k50, k51, k41, k42, k52, k53, k43, k44, k54, k55, k45, \
k60, k70, k61, k62, k63, k64, k75, k65 \
) { \
{ k00, k01, k02, k03, k04, k05 }, \
{ k10, k11, k12, k13, k14, k15 }, \
{ k20, k21, k22, k23, k24, k25 }, \
{ k30, k31, k32, k33, k34, k35 }, \
{ k40, k41, k42, k43, k44, k45 }, \
{ k50, k51, k52, k53, k54, k55 }, \
{ k60, k61, k62, k63, k64, k65 }, \
{ k70, XXX, XXX, XXX, XXX, k75 } \
}
#define LAYOUT_2x3u( \
k00, k10, k11, k01, k02, k12, k13, k03, k04, k14, k15, k05, \
k20, k30, k31, k21, k22, k32, k33, k23, k24, k34, k35, k25, \
k40, k50, k51, k41, k42, k52, k53, k43, k44, k54, k55, k45, \
k60, k70, k71, k62, k63, k74, k75, k65 \
) { \
{ k00, k01, k02, k03, k04, k05 }, \
{ k10, k11, k12, k13, k14, k15 }, \
{ k20, k21, k22, k23, k24, k25 }, \
{ k30, k31, k32, k33, k34, k35 }, \
{ k40, k41, k42, k43, k44, k45 }, \
{ k50, k51, k52, k53, k54, k55 }, \
{ k60, XXX, k62, k63, XXX, k65 }, \
{ k70, k71, XXX, XXX, k74, k75 } \
}