Move single LAYOUTs to data driven (#20365)

This commit is contained in:
Ryan
2023-04-12 13:42:51 +10:00
committed by GitHub
parent 941e159a28
commit 5bd68e3695
1443 changed files with 45214 additions and 59923 deletions

View File

@@ -41,22 +41,3 @@
#define set_led_cyan PORTF = PORTF & ~(1<<LED_R) | (1<<LED_B) | (1<<LED_G)
#define set_led_white PORTF |= (1<<LED_B) | (1<<LED_R) | (1<<LED_G)
*/
#define XXX KC_NO
// This a shortcut to help you visually see your layout.
// The first section contains all of the arguements
// The second converts the arguments into a two-dimensional array
#define LAYOUT( \
k10, k05, k22, k42, k33, k34, k37, k38, k48, k29, k49, k1B, \
k20, k31, k12, k03, k14, k24, k27, k17, k08, k19, k3A, k2B, \
k30, k21, k02, k13, k04, k40, k46, k07, k18, k09, k2A, k3B, \
k15, k44, k32, k23, k43, k41, k06, k47, k28, k39, k4A, k16, \
k35, k25, k26, k36 \
) { \
{ XXX, XXX, k02, k03, k04, k05, k06, k07, k08, k09, XXX, XXX }, \
{ k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, XXX, k1B }, \
{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B }, \
{ k40, k41, k42, k43, k44, XXX, k46, k47, k48, k49, k4A, XXX } \
}

View File

@@ -12,7 +12,69 @@
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [{"label":"k00", "x":0, "y":1}, {"label":"k01", "x":1, "y":0.75}, {"label":"k02", "x":2, "y":0.25}, {"label":"k03", "x":3, "y":0}, {"label":"k04", "x":4, "y":0.25}, {"label":"k05", "x":5, "y":0.5}, {"label":"k06", "x":7, "y":0.5}, {"label":"k07", "x":8, "y":0.25}, {"label":"k08", "x":9, "y":0}, {"label":"k09", "x":10, "y":0.25}, {"label":"k10", "x":11, "y":0.75}, {"label":"k11", "x":12, "y":1}, {"label":"k12", "x":0, "y":2}, {"label":"k13", "x":1, "y":1.75}, {"label":"k14", "x":2, "y":1.25}, {"label":"k15", "x":3, "y":1}, {"label":"k16", "x":4, "y":1.25}, {"label":"k17", "x":5, "y":1.5}, {"label":"k18", "x":7, "y":1.5}, {"label":"k19", "x":8, "y":1.25}, {"label":"k20", "x":9, "y":1}, {"label":"k21", "x":10, "y":1.25}, {"label":"k22", "x":11, "y":1.75}, {"label":"k23", "x":12, "y":2}, {"label":"k24", "x":0, "y":3}, {"label":"k25", "x":1, "y":2.75}, {"label":"k26", "x":2, "y":2.25}, {"label":"k27", "x":3, "y":2}, {"label":"k28", "x":4, "y":2.25}, {"label":"k29", "x":5, "y":2.5}, {"label":"k30", "x":7, "y":2.5}, {"label":"k31", "x":8, "y":2.25}, {"label":"k32", "x":9, "y":2}, {"label":"k33", "x":10, "y":2.25}, {"label":"k34", "x":11, "y":2.75}, {"label":"k35", "x":12, "y":3}, {"label":"k36", "x":0, "y":4}, {"label":"k37", "x":1, "y":3.75}, {"label":"k38", "x":2, "y":3.25}, {"label":"k39", "x":3, "y":3}, {"label":"k40", "x":4, "y":3.25}, {"label":"k41", "x":5, "y":3.5}, {"label":"k42", "x":7, "y":3.5}, {"label":"k43", "x":8, "y":3.25}, {"label":"k44", "x":9, "y":3}, {"label":"k45", "x":10, "y":3.25}, {"label":"k46", "x":11, "y":3.75}, {"label":"k47", "x":12, "y":4}, {"label":"k48", "x":4, "y":4.75}, {"label":"k49", "x":5, "y":5}, {"label":"k50", "x":7, "y":5}, {"label":"k51", "x":8, "y":4.75}]
"layout": [
{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [0, 5], "x": 1, "y": 0.75},
{"matrix": [2, 2], "x": 2, "y": 0.25},
{"matrix": [4, 2], "x": 3, "y": 0},
{"matrix": [3, 3], "x": 4, "y": 0.25},
{"matrix": [3, 4], "x": 5, "y": 0.5},
{"matrix": [3, 7], "x": 7, "y": 0.5},
{"matrix": [3, 8], "x": 8, "y": 0.25},
{"matrix": [4, 8], "x": 9, "y": 0},
{"matrix": [2, 9], "x": 10, "y": 0.25},
{"matrix": [4, 9], "x": 11, "y": 0.75},
{"matrix": [1, 11], "x": 12, "y": 1},
{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [3, 1], "x": 1, "y": 1.75},
{"matrix": [1, 2], "x": 2, "y": 1.25},
{"matrix": [0, 3], "x": 3, "y": 1},
{"matrix": [1, 4], "x": 4, "y": 1.25},
{"matrix": [2, 4], "x": 5, "y": 1.5},
{"matrix": [2, 7], "x": 7, "y": 1.5},
{"matrix": [1, 7], "x": 8, "y": 1.25},
{"matrix": [0, 8], "x": 9, "y": 1},
{"matrix": [1, 9], "x": 10, "y": 1.25},
{"matrix": [3, 10], "x": 11, "y": 1.75},
{"matrix": [2, 11], "x": 12, "y": 2},
{"matrix": [3, 0], "x": 0, "y": 3},
{"matrix": [2, 1], "x": 1, "y": 2.75},
{"matrix": [0, 2], "x": 2, "y": 2.25},
{"matrix": [1, 3], "x": 3, "y": 2},
{"matrix": [0, 4], "x": 4, "y": 2.25},
{"matrix": [4, 0], "x": 5, "y": 2.5},
{"matrix": [4, 6], "x": 7, "y": 2.5},
{"matrix": [0, 7], "x": 8, "y": 2.25},
{"matrix": [1, 8], "x": 9, "y": 2},
{"matrix": [0, 9], "x": 10, "y": 2.25},
{"matrix": [2, 10], "x": 11, "y": 2.75},
{"matrix": [3, 11], "x": 12, "y": 3},
{"matrix": [1, 5], "x": 0, "y": 4},
{"matrix": [4, 4], "x": 1, "y": 3.75},
{"matrix": [3, 2], "x": 2, "y": 3.25},
{"matrix": [2, 3], "x": 3, "y": 3},
{"matrix": [4, 3], "x": 4, "y": 3.25},
{"matrix": [4, 1], "x": 5, "y": 3.5},
{"matrix": [0, 6], "x": 7, "y": 3.5},
{"matrix": [4, 7], "x": 8, "y": 3.25},
{"matrix": [2, 8], "x": 9, "y": 3},
{"matrix": [3, 9], "x": 10, "y": 3.25},
{"matrix": [4, 10], "x": 11, "y": 3.75},
{"matrix": [1, 6], "x": 12, "y": 4},
{"matrix": [3, 5], "x": 4, "y": 4.75},
{"matrix": [2, 5], "x": 5, "y": 5},
{"matrix": [2, 6], "x": 7, "y": 5},
{"matrix": [3, 6], "x": 8, "y": 4.75}
]
}
}
}

View File

@@ -41,21 +41,3 @@
#define set_led_cyan PORTF = PORTF & ~(1<<LED_R) | (1<<LED_B) | (1<<LED_G)
#define set_led_white PORTF |= (1<<LED_B) | (1<<LED_R) | (1<<LED_G)
*/
#define XXX KC_NO
// This a shortcut to help you visually see your layout.
// The first section contains all of the arguements
// The second converts the arguments into a two-dimensional array
#define LAYOUT( \
k43, k00, k01, k02, k03, k04, k31, k38, k05, k06, k07, k08, k09, k46, \
k42, k10, k11, k12, k13, k14, k32, k37, k15, k16, k17, k18, k19, k47, \
k41, k20, k21, k22, k23, k24, k33, k36, k25, k26, k27, k28, k29, k48, \
k44, k34, k35, k45 \
) { \
{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
{ XXX, k31, k32, k33, k34, k35, k36, k37, k38, XXX }, \
{ XXX, k41, k42, k43, k44, k45, k46, k47, k48, XXX } \
}

View File

@@ -12,52 +12,59 @@
"layouts": {
"LAYOUT": {
"layout": [
{"label": "Esc", "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": "{", "x": 6, "y": 0},
{"label": "}", "x": 8.5, "y": 0},
{"label": "Y", "x": 9.5, "y": 0},
{"label": "U", "x": 10.5, "y": 0},
{"label": "I", "x": 11.5, "y": 0},
{"label": "O", "x": 12.5, "y": 0},
{"label": "P", "x": 13.5, "y": 0},
{"label": "\"", "x": 14.5, "y": 0},
{"label": "Tab", "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": "-", "x": 6, "y": 1},
{"label": "1", "x": 8.5, "y": 1},
{"label": "H", "x": 9.5, "y": 1},
{"label": "J", "x": 10.5, "y": 1},
{"label": "K", "x": 11.5, "y": 1},
{"label": "L", "x": 12.5, "y": 1},
{"label": ";", "x": 13.5, "y": 1},
{"label": "Enter", "x": 14.5, "y": 1},
{"label": "(", "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": "=", "x": 6, "y": 2},
{"label": "8", "x": 8.5, "y": 2},
{"label": "N", "x": 9.5, "y": 2},
{"label": "M", "x": 10.5, "y": 2},
{"label": ", ", "x": 11.5, "y": 2},
{"label": ".", "x": 12.5, "y": 2},
{"label": "/", "x": 13.5, "y": 2},
{"label": ")", "x": 14.5, "y": 2},
{"label": "Num Layer", "x": 4, "y": 3.25},
{"label": "Back Space", "x": 5, "y": 3.25},
{"label": "Space", "x": 9.5, "y": 3.25},
{"label": "Symbol Layer", "x": 10.5, "y": 3.25}
{"matrix": [4, 3], "x": 0, "y": 0},
{"matrix": [0, 0], "x": 1, "y": 0},
{"matrix": [0, 1], "x": 2, "y": 0},
{"matrix": [0, 2], "x": 3, "y": 0},
{"matrix": [0, 3], "x": 4, "y": 0},
{"matrix": [0, 4], "x": 5, "y": 0},
{"matrix": [3, 1], "x": 6, "y": 0},
{"matrix": [3, 8], "x": 8.5, "y": 0},
{"matrix": [0, 5], "x": 9.5, "y": 0},
{"matrix": [0, 6], "x": 10.5, "y": 0},
{"matrix": [0, 7], "x": 11.5, "y": 0},
{"matrix": [0, 8], "x": 12.5, "y": 0},
{"matrix": [0, 9], "x": 13.5, "y": 0},
{"matrix": [4, 6], "x": 14.5, "y": 0},
{"matrix": [4, 2], "x": 0, "y": 1},
{"matrix": [1, 0], "x": 1, "y": 1},
{"matrix": [1, 1], "x": 2, "y": 1},
{"matrix": [1, 2], "x": 3, "y": 1},
{"matrix": [1, 3], "x": 4, "y": 1},
{"matrix": [1, 4], "x": 5, "y": 1},
{"matrix": [3, 2], "x": 6, "y": 1},
{"matrix": [3, 7], "x": 8.5, "y": 1},
{"matrix": [1, 5], "x": 9.5, "y": 1},
{"matrix": [1, 6], "x": 10.5, "y": 1},
{"matrix": [1, 7], "x": 11.5, "y": 1},
{"matrix": [1, 8], "x": 12.5, "y": 1},
{"matrix": [1, 9], "x": 13.5, "y": 1},
{"matrix": [4, 7], "x": 14.5, "y": 1},
{"matrix": [4, 1], "x": 0, "y": 2},
{"matrix": [2, 0], "x": 1, "y": 2},
{"matrix": [2, 1], "x": 2, "y": 2},
{"matrix": [2, 2], "x": 3, "y": 2},
{"matrix": [2, 3], "x": 4, "y": 2},
{"matrix": [2, 4], "x": 5, "y": 2},
{"matrix": [3, 3], "x": 6, "y": 2},
{"matrix": [3, 6], "x": 8.5, "y": 2},
{"matrix": [2, 5], "x": 9.5, "y": 2},
{"matrix": [2, 6], "x": 10.5, "y": 2},
{"matrix": [2, 7], "x": 11.5, "y": 2},
{"matrix": [2, 8], "x": 12.5, "y": 2},
{"matrix": [2, 9], "x": 13.5, "y": 2},
{"matrix": [4, 8], "x": 14.5, "y": 2},
{"matrix": [4, 4], "x": 4, "y": 3.25},
{"matrix": [3, 4], "x": 5, "y": 3.25},
{"matrix": [3, 5], "x": 9.5, "y": 3.25},
{"matrix": [4, 5], "x": 10.5, "y": 3.25}
]
}
}

View File

@@ -17,22 +17,3 @@
#define set_led_magenta red_led_on; grn_led_off; blu_led_on
#define set_led_cyan red_led_off; grn_led_on; blu_led_on
#define set_led_white red_led_on; grn_led_on; blu_led_on
// This a shortcut to help you visually see your layout.
// The first section contains all of the arguements
// The second converts the arguments into a two-dimensional array
#define LAYOUT( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, \
k12, k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, \
k24, k25, k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, \
k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47, \
k48, k49, k50, k51 \
) \
{ \
{ k03, k40, k26, k15, k28, k01, k42, k31, k20, k33, k08, k10 }, \
{ k00, k37, k14, k27, k16, k36, k47, k19, k32, k21, k46, k11 }, \
{ k12, k25, k02, k39, k17, k49, k50, k18, k44, k09, k34, k23 }, \
{ k24, k13, k38, k04, k05, k48, k51, k06, k07, k45, k22, k35 }, \
{ k29, k41, KC_NO, KC_NO, KC_NO, KC_NO, k30, k43, KC_NO, KC_NO, KC_NO, KC_NO } \
}

View File

@@ -12,58 +12,67 @@
"layouts": {
"LAYOUT": {
"layout": [
{"label": "{", "x": 0, "y": 0},
{"label": "1", "x": 1, "y": 0},
{"label": "2", "x": 2, "y": 0},
{"label": "3", "x": 3, "y": 0},
{"label": "4", "x": 4, "y": 0},
{"label": "5", "x": 5, "y": 0},
{"label": "6", "x": 7.5, "y": 0},
{"label": "7", "x": 8.5, "y": 0},
{"label": "8", "x": 9.5, "y": 0},
{"label": "9", "x": 10.5, "y": 0},
{"label": "0", "x": 11.5, "y": 0},
{"label": "}", "x": 12.5, "y": 0},
{"label": "Esc", "x": 0, "y": 1},
{"label": "Q", "x": 1, "y": 1},
{"label": "W", "x": 2, "y": 1},
{"label": "E", "x": 3, "y": 1},
{"label": "R", "x": 4, "y": 1},
{"label": "T", "x": 5, "y": 1},
{"label": "Y", "x": 7.5, "y": 1},
{"label": "U", "x": 8.5, "y": 1},
{"label": "I", "x": 9.5, "y": 1},
{"label": "O", "x": 10.5, "y": 1},
{"label": "P", "x": 11.5, "y": 1},
{"label": "\"", "x": 12.5, "y": 1},
{"label": "Tab", "x": 0, "y": 2},
{"label": "A", "x": 1, "y": 2},
{"label": "S", "x": 2, "y": 2},
{"label": "D", "x": 3, "y": 2},
{"label": "F", "x": 4, "y": 2},
{"label": "G", "x": 5, "y": 2},
{"label": "H", "x": 7.5, "y": 2},
{"label": "J", "x": 8.5, "y": 2},
{"label": "K", "x": 9.5, "y": 2},
{"label": "L", "x": 10.5, "y": 2},
{"label": ";", "x": 11.5, "y": 2},
{"label": "Enter", "x": 12.5, "y": 2},
{"label": "(", "x": 0, "y": 3},
{"label": "Z", "x": 1, "y": 3},
{"label": "X", "x": 2, "y": 3},
{"label": "C", "x": 3, "y": 3},
{"label": "V", "x": 4, "y": 3},
{"label": "B", "x": 5, "y": 3},
{"label": "N", "x": 7.5, "y": 3},
{"label": "M", "x": 8.5, "y": 3},
{"label": ",", "x": 9.5, "y": 3},
{"label": ".", "x": 10.5, "y": 3},
{"label": "/", "x": 11.5, "y": 3},
{"label": ")", "x": 12.5, "y": 3},
{"label": "Num Layer", "x": 4, "y": 4},
{"label": "Back Space", "x": 5, "y": 4},
{"label": "Space", "x": 7.5, "y": 4},
{"label": "Symbol Layer", "x": 8.5, "y": 4}
{"matrix": [1, 0], "x": 0, "y": 0},
{"matrix": [0, 5], "x": 1, "y": 0},
{"matrix": [2, 2], "x": 2, "y": 0},
{"matrix": [0, 0], "x": 3, "y": 0},
{"matrix": [3, 3], "x": 4, "y": 0},
{"matrix": [3, 4], "x": 5, "y": 0},
{"matrix": [3, 7], "x": 7.5, "y": 0},
{"matrix": [3, 8], "x": 8.5, "y": 0},
{"matrix": [0, 10], "x": 9.5, "y": 0},
{"matrix": [2, 9], "x": 10.5, "y": 0},
{"matrix": [0, 11], "x": 11.5, "y": 0},
{"matrix": [1, 11], "x": 12.5, "y": 0},
{"matrix": [2, 0], "x": 0, "y": 1},
{"matrix": [3, 1], "x": 1, "y": 1},
{"matrix": [1, 2], "x": 2, "y": 1},
{"matrix": [0, 3], "x": 3, "y": 1},
{"matrix": [1, 4], "x": 4, "y": 1},
{"matrix": [2, 4], "x": 5, "y": 1},
{"matrix": [2, 7], "x": 7.5, "y": 1},
{"matrix": [1, 7], "x": 8.5, "y": 1},
{"matrix": [0, 8], "x": 9.5, "y": 1},
{"matrix": [1, 9], "x": 10.5, "y": 1},
{"matrix": [3, 10], "x": 11.5, "y": 1},
{"matrix": [2, 11], "x": 12.5, "y": 1},
{"matrix": [3, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1, "y": 2},
{"matrix": [0, 2], "x": 2, "y": 2},
{"matrix": [1, 3], "x": 3, "y": 2},
{"matrix": [0, 4], "x": 4, "y": 2},
{"matrix": [4, 0], "x": 5, "y": 2},
{"matrix": [4, 6], "x": 7.5, "y": 2},
{"matrix": [0, 7], "x": 8.5, "y": 2},
{"matrix": [1, 8], "x": 9.5, "y": 2},
{"matrix": [0, 9], "x": 10.5, "y": 2},
{"matrix": [2, 10], "x": 11.5, "y": 2},
{"matrix": [3, 11], "x": 12.5, "y": 2},
{"matrix": [1, 5], "x": 0, "y": 3},
{"matrix": [1, 1], "x": 1, "y": 3},
{"matrix": [3, 2], "x": 2, "y": 3},
{"matrix": [2, 3], "x": 3, "y": 3},
{"matrix": [0, 1], "x": 4, "y": 3},
{"matrix": [4, 1], "x": 5, "y": 3},
{"matrix": [0, 6], "x": 7.5, "y": 3},
{"matrix": [4, 7], "x": 8.5, "y": 3},
{"matrix": [2, 8], "x": 9.5, "y": 3},
{"matrix": [3, 9], "x": 10.5, "y": 3},
{"matrix": [1, 10], "x": 11.5, "y": 3},
{"matrix": [1, 6], "x": 12.5, "y": 3},
{"matrix": [3, 5], "x": 4, "y": 4},
{"matrix": [2, 5], "x": 5, "y": 4},
{"matrix": [2, 6], "x": 7.5, "y": 4},
{"matrix": [3, 6], "x": 8.5, "y": 4}
]
}
}