Merge remote-tracking branch 'origin/master' into develop

master
QMK Bot 2023-09-13 06:05:57 +00:00
commit 12b3dd36f3
9 changed files with 163 additions and 163 deletions

View File

@ -65,11 +65,11 @@
{ "matrix": [2, 9], "x": 9, "y": 2 }, { "matrix": [2, 9], "x": 9, "y": 2 },
// Row 4 // Row 4
{ "matrix": [3, 1], "x": 1, "y": 3 }, { "matrix": [3, 1], "x": 1.5, "y": 3 },
{ "matrix": [3, 2], "x": 2, "y": 3 }, { "matrix": [3, 2], "x": 2.5, "y": 3 },
{ "matrix": [3, 4], "x": 4, "y": 3 }, { "matrix": [3, 4], "x": 3.5, "y": 3, "w": 3 },
{ "matrix": [3, 6], "x": 6, "y": 3 }, { "matrix": [3, 6], "x": 6.5, "y": 3 },
{ "matrix": [3, 7], "x": 7, "y": 3 } { "matrix": [3, 7], "x": 7.5, "y": 3 }
] ]
} }
} }

View File

@ -35,54 +35,54 @@
"LAYOUT_ortho_4_3x10_4": { "LAYOUT_ortho_4_3x10_4": {
"layout": [ "layout": [
// Row 1 (Macros) // Row 1 (Macros)
{"matrix": [0, 7], "x": 7, "y": 0}, {"matrix": [0, 7], "x": 7.5, "y": 0},
{"matrix": [0, 8], "x": 8, "y": 0}, {"matrix": [0, 8], "x": 8.5, "y": 0},
{"matrix": [0, 9], "x": 9, "y": 0}, {"matrix": [0, 9], "x": 9.5, "y": 0},
{"matrix": [0, 10], "x": 10, "y": 0}, {"matrix": [0, 10], "x": 10.5, "y": 0},
// Row 2 // Row 2
{"matrix": [1, 0], "x": 0, "y": 1}, {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
{"matrix": [1, 1], "x": 1, "y": 1}, {"matrix": [1, 1], "x": 1.5, "y": 1},
{"matrix": [1, 2], "x": 2, "y": 1}, {"matrix": [1, 2], "x": 2.5, "y": 1},
{"matrix": [1, 3], "x": 3, "y": 1}, {"matrix": [1, 3], "x": 3.5, "y": 1},
{"matrix": [1, 4], "x": 4, "y": 1}, {"matrix": [1, 4], "x": 4.5, "y": 1},
{"matrix": [1, 5], "x": 5, "y": 1}, {"matrix": [1, 5], "x": 5.5, "y": 1},
{"matrix": [1, 6], "x": 6, "y": 1}, {"matrix": [1, 6], "x": 6.5, "y": 1},
{"matrix": [1, 7], "x": 7, "y": 1}, {"matrix": [1, 7], "x": 7.5, "y": 1},
{"matrix": [1, 8], "x": 8, "y": 1}, {"matrix": [1, 8], "x": 8.5, "y": 1},
{"matrix": [1, 9], "x": 9, "y": 1}, {"matrix": [1, 9], "x": 9.5, "y": 1},
{"matrix": [1, 10], "x": 10, "y": 1}, {"matrix": [1, 10], "x": 10.5, "y": 1},
// Row 3 // Row 3
{"matrix": [2, 0], "x": 0, "y": 2}, {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
{"matrix": [2, 1], "x": 1, "y": 2}, {"matrix": [2, 1], "x": 1.5, "y": 2},
{"matrix": [2, 2], "x": 2, "y": 2}, {"matrix": [2, 2], "x": 2.5, "y": 2},
{"matrix": [2, 3], "x": 3, "y": 2}, {"matrix": [2, 3], "x": 3.5, "y": 2},
{"matrix": [2, 4], "x": 4, "y": 2}, {"matrix": [2, 4], "x": 4.5, "y": 2},
{"matrix": [2, 5], "x": 5, "y": 2}, {"matrix": [2, 5], "x": 5.5, "y": 2},
{"matrix": [2, 6], "x": 6, "y": 2}, {"matrix": [2, 6], "x": 6.5, "y": 2},
{"matrix": [2, 7], "x": 7, "y": 2}, {"matrix": [2, 7], "x": 7.5, "y": 2},
{"matrix": [2, 8], "x": 8, "y": 2}, {"matrix": [2, 8], "x": 8.5, "y": 2},
{"matrix": [2, 9], "x": 9, "y": 2}, {"matrix": [2, 9], "x": 9.5, "y": 2},
{"matrix": [2, 10], "x": 10, "y": 2}, {"matrix": [2, 10], "x": 10.5, "y": 2},
// Row 4 // Row 4
{"matrix": [3, 1], "x": 1, "y": 3}, {"matrix": [3, 1], "x": 1.5, "y": 3},
{"matrix": [3, 2], "x": 2, "y": 3}, {"matrix": [3, 2], "x": 2.5, "y": 3},
{"matrix": [3, 3], "x": 3, "y": 3}, {"matrix": [3, 3], "x": 3.5, "y": 3},
{"matrix": [3, 4], "x": 4, "y": 3}, {"matrix": [3, 4], "x": 4.5, "y": 3},
{"matrix": [3, 5], "x": 5, "y": 3}, {"matrix": [3, 5], "x": 5.5, "y": 3},
{"matrix": [3, 6], "x": 6, "y": 3}, {"matrix": [3, 6], "x": 6.5, "y": 3},
{"matrix": [3, 7], "x": 7, "y": 3}, {"matrix": [3, 7], "x": 7.5, "y": 3},
{"matrix": [3, 8], "x": 8, "y": 3}, {"matrix": [3, 8], "x": 8.5, "y": 3},
{"matrix": [3, 9], "x": 9, "y": 3}, {"matrix": [3, 9], "x": 9.5, "y": 3},
{"matrix": [3, 10], "x": 10, "y": 3}, {"matrix": [3, 10], "x": 10.5, "y": 3},
// Row 5 // Row 5
{"matrix": [4, 1], "x": 1, "y": 4}, {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.75},
{"matrix": [4, 5], "x": 5, "y": 4}, {"matrix": [4, 5], "x": 3.25, "y": 4, "w": 6.25},
{"matrix": [4, 9], "x": 9, "y": 4}, {"matrix": [4, 9], "x": 9.5, "y": 4},
{"matrix": [4, 10], "x": 10, "y": 4} {"matrix": [4, 10], "x": 10.5, "y": 4}
] ]
} }
} }

View File

@ -28,48 +28,48 @@
"LAYOUT_split_3x5_3": { "LAYOUT_split_3x5_3": {
"layout": [ "layout": [
// Row 1 // Row 1
{ "matrix": [0, 0], "x": 0, "y": 0 }, { "matrix": [0, 0], "x": 0, "y": 0.5 },
{ "matrix": [0, 1], "x": 1, "y": 0 }, { "matrix": [0, 1], "x": 1, "y": 0.25 },
{ "matrix": [0, 2], "x": 2, "y": 0 }, { "matrix": [0, 2], "x": 2, "y": 0 },
{ "matrix": [0, 3], "x": 3, "y": 0 }, { "matrix": [0, 3], "x": 3, "y": 0.25 },
{ "matrix": [0, 4], "x": 4, "y": 0 }, { "matrix": [0, 4], "x": 4, "y": 0.5 },
{ "matrix": [0, 5], "x": 5, "y": 0 }, { "matrix": [0, 5], "x": 7, "y": 0.5 },
{ "matrix": [0, 6], "x": 6, "y": 0 }, { "matrix": [0, 6], "x": 8, "y": 0.25 },
{ "matrix": [0, 7], "x": 7, "y": 0 }, { "matrix": [0, 7], "x": 9, "y": 0 },
{ "matrix": [0, 8], "x": 8, "y": 0 }, { "matrix": [0, 8], "x": 10, "y": 0.25 },
{ "matrix": [0, 9], "x": 9, "y": 0 }, { "matrix": [0, 9], "x": 11, "y": 0.5 },
// Row 2 // Row 2
{ "matrix": [1, 0], "x": 0, "y": 1 }, { "matrix": [1, 0], "x": 0, "y": 1.5 },
{ "matrix": [1, 1], "x": 1, "y": 1 }, { "matrix": [1, 1], "x": 1, "y": 1.25 },
{ "matrix": [1, 2], "x": 2, "y": 1 }, { "matrix": [1, 2], "x": 2, "y": 1 },
{ "matrix": [1, 3], "x": 3, "y": 1 }, { "matrix": [1, 3], "x": 3, "y": 1.25 },
{ "matrix": [1, 4], "x": 4, "y": 1 }, { "matrix": [1, 4], "x": 4, "y": 1.5 },
{ "matrix": [1, 5], "x": 5, "y": 1 }, { "matrix": [1, 5], "x": 7, "y": 1.5 },
{ "matrix": [1, 6], "x": 6, "y": 1 }, { "matrix": [1, 6], "x": 8, "y": 1.25 },
{ "matrix": [1, 7], "x": 7, "y": 1 }, { "matrix": [1, 7], "x": 9, "y": 1 },
{ "matrix": [1, 8], "x": 8, "y": 1 }, { "matrix": [1, 8], "x": 10, "y": 1.25 },
{ "matrix": [1, 9], "x": 9, "y": 1 }, { "matrix": [1, 9], "x": 11, "y": 1.5 },
// Row 3 // Row 3
{ "matrix": [2, 0], "x": 0, "y": 2 }, { "matrix": [2, 0], "x": 0, "y": 2.5 },
{ "matrix": [2, 1], "x": 1, "y": 2 }, { "matrix": [2, 1], "x": 1, "y": 2.25 },
{ "matrix": [2, 2], "x": 2, "y": 2 }, { "matrix": [2, 2], "x": 2, "y": 2 },
{ "matrix": [2, 3], "x": 3, "y": 2 }, { "matrix": [2, 3], "x": 3, "y": 2.25 },
{ "matrix": [2, 4], "x": 4, "y": 2 }, { "matrix": [2, 4], "x": 4, "y": 2.5 },
{ "matrix": [2, 5], "x": 5, "y": 2 }, { "matrix": [2, 5], "x": 7, "y": 2.5 },
{ "matrix": [2, 6], "x": 6, "y": 2 }, { "matrix": [2, 6], "x": 8, "y": 2.25 },
{ "matrix": [2, 7], "x": 7, "y": 2 }, { "matrix": [2, 7], "x": 9, "y": 2 },
{ "matrix": [2, 8], "x": 8, "y": 2 }, { "matrix": [2, 8], "x": 10, "y": 2.25 },
{ "matrix": [2, 9], "x": 9, "y": 2 }, { "matrix": [2, 9], "x": 11, "y": 2.5 },
// Row 4 // Row 4
{ "matrix": [3, 2], "x": 2, "y": 3 }, { "matrix": [3, 2], "x": 2.5, "y": 3.25 },
{ "matrix": [3, 3], "x": 3, "y": 3 }, { "matrix": [3, 3], "x": 3.5, "y": 3.5 },
{ "matrix": [3, 4], "x": 4, "y": 3 }, { "matrix": [3, 4], "x": 4.5, "y": 3.75 },
{ "matrix": [3, 5], "x": 5, "y": 3 }, { "matrix": [3, 5], "x": 6.5, "y": 3.75 },
{ "matrix": [3, 6], "x": 6, "y": 3 }, { "matrix": [3, 6], "x": 7.5, "y": 3.5 },
{ "matrix": [3, 7], "x": 7, "y": 3 } { "matrix": [3, 7], "x": 8.5, "y": 3.25 }
] ]
} }
} }

View File

@ -43,11 +43,11 @@
{ "matrix": [2, 3], "x": 3, "y": 2 }, { "matrix": [2, 3], "x": 3, "y": 2 },
{ "matrix": [2, 4], "x": 4, "y": 2 }, { "matrix": [2, 4], "x": 4, "y": 2 },
{ "matrix": [2, 5], "x": 5, "y": 2 }, { "matrix": [2, 5], "x": 5, "y": 2 },
{ "matrix": [3, 0], "x": 0, "y": 3 }, { "matrix": [3, 0], "x": 0, "y": 2, "h": 2 },
{ "matrix": [3, 1], "x": 1, "y": 3 }, { "matrix": [3, 1], "x": 1, "y": 3, "w": 1.5 },
{ "matrix": [3, 3], "x": 3, "y": 3 }, { "matrix": [3, 3], "x": 2.5, "y": 3, "w": 2 },
{ "matrix": [3, 5], "x": 5, "y": 3 }, { "matrix": [3, 5], "x": 4.5, "y": 3, "w": 1.5 },
{ "matrix": [3, 6], "x": 6, "y": 3 } { "matrix": [3, 6], "x": 6, "y": 2, "h": 2 }
] ]
} }
} }

View File

@ -38,7 +38,7 @@
{ "matrix": [0, 2], "x": 2, "y": 0 }, { "matrix": [0, 2], "x": 2, "y": 0 },
{ "matrix": [0, 3], "x": 3, "y": 0 }, { "matrix": [0, 3], "x": 3, "y": 0 },
{ "matrix": [0, 4], "x": 4, "y": 0 }, { "matrix": [0, 4], "x": 4, "y": 0 },
{ "matrix": [0, 6], "x": 6, "y": 0 }, { "matrix": [0, 6], "x": 5.125, "y": 0, "w": 2.75 },
// Row 2 // Row 2
{ "matrix": [1, 0], "x": 0, "y": 1 }, { "matrix": [1, 0], "x": 0, "y": 1 },
@ -79,8 +79,8 @@
// Row 5 // Row 5
{ "matrix": [4, 1], "x": 1, "y": 4 }, { "matrix": [4, 1], "x": 1, "y": 4 },
{ "matrix": [4, 2], "x": 2, "y": 4 }, { "matrix": [4, 2], "x": 2, "y": 4 },
{ "matrix": [4, 3], "x": 3, "y": 4 }, { "matrix": [4, 3], "x": 3, "y": 4, "w": 2 },
{ "matrix": [4, 6], "x": 6, "y": 4 }, { "matrix": [4, 6], "x": 5, "y": 4, "w": 2 },
{ "matrix": [4, 7], "x": 7, "y": 4 }, { "matrix": [4, 7], "x": 7, "y": 4 },
{ "matrix": [4, 8], "x": 8, "y": 4 } { "matrix": [4, 8], "x": 8, "y": 4 }
] ]

View File

@ -30,47 +30,47 @@
"LAYOUT_split_3x5_3": { "LAYOUT_split_3x5_3": {
"layout": [ "layout": [
// Row 1 // Row 1
{ "matrix": [0, 0], "x": 0, "y": 0 }, { "matrix": [0, 0], "x": 0, "y": 0.5 },
{ "matrix": [0, 1], "x": 1, "y": 0 }, { "matrix": [0, 1], "x": 1, "y": 0.25 },
{ "matrix": [0, 2], "x": 2, "y": 0 }, { "matrix": [0, 2], "x": 2, "y": 0 },
{ "matrix": [0, 3], "x": 3, "y": 0 }, { "matrix": [0, 3], "x": 3, "y": 0.25 },
{ "matrix": [0, 4], "x": 4, "y": 0 }, { "matrix": [0, 4], "x": 4, "y": 0.5 },
{ "matrix": [0, 5], "x": 5, "y": 0 }, { "matrix": [0, 5], "x": 5, "y": 0.5 },
{ "matrix": [0, 6], "x": 6, "y": 0 }, { "matrix": [0, 6], "x": 6, "y": 0.25 },
{ "matrix": [0, 7], "x": 7, "y": 0 }, { "matrix": [0, 7], "x": 7, "y": 0 },
{ "matrix": [0, 8], "x": 8, "y": 0 }, { "matrix": [0, 8], "x": 8, "y": 0.25 },
{ "matrix": [0, 9], "x": 9, "y": 0 }, { "matrix": [0, 9], "x": 9, "y": 0.5 },
// Row 2 // Row 2
{ "matrix": [1, 0], "x": 0, "y": 1 }, { "matrix": [1, 0], "x": 0, "y": 1.5 },
{ "matrix": [1, 1], "x": 1, "y": 1 }, { "matrix": [1, 1], "x": 1, "y": 1.25 },
{ "matrix": [1, 2], "x": 2, "y": 1 }, { "matrix": [1, 2], "x": 2, "y": 1 },
{ "matrix": [1, 3], "x": 3, "y": 1 }, { "matrix": [1, 3], "x": 3, "y": 1.25 },
{ "matrix": [1, 4], "x": 4, "y": 1 }, { "matrix": [1, 4], "x": 4, "y": 1.5 },
{ "matrix": [1, 5], "x": 5, "y": 1 }, { "matrix": [1, 5], "x": 5, "y": 1.5 },
{ "matrix": [1, 6], "x": 6, "y": 1 }, { "matrix": [1, 6], "x": 6, "y": 1.25 },
{ "matrix": [1, 7], "x": 7, "y": 1 }, { "matrix": [1, 7], "x": 7, "y": 1 },
{ "matrix": [1, 8], "x": 8, "y": 1 }, { "matrix": [1, 8], "x": 8, "y": 1.25 },
{ "matrix": [1, 9], "x": 9, "y": 1 }, { "matrix": [1, 9], "x": 9, "y": 1.5 },
// Row 3 // Row 3
{ "matrix": [2, 0], "x": 0, "y": 2 }, { "matrix": [2, 0], "x": 0, "y": 2.5 },
{ "matrix": [2, 1], "x": 1, "y": 2 }, { "matrix": [2, 1], "x": 1, "y": 2.25 },
{ "matrix": [2, 2], "x": 2, "y": 2 }, { "matrix": [2, 2], "x": 2, "y": 2 },
{ "matrix": [2, 3], "x": 3, "y": 2 }, { "matrix": [2, 3], "x": 3, "y": 2.25 },
{ "matrix": [2, 4], "x": 4, "y": 2 }, { "matrix": [2, 4], "x": 4, "y": 2.5 },
{ "matrix": [2, 5], "x": 5, "y": 2 }, { "matrix": [2, 5], "x": 5, "y": 2.5 },
{ "matrix": [2, 6], "x": 6, "y": 2 }, { "matrix": [2, 6], "x": 6, "y": 2.25 },
{ "matrix": [2, 7], "x": 7, "y": 2 }, { "matrix": [2, 7], "x": 7, "y": 2 },
{ "matrix": [2, 8], "x": 8, "y": 2 }, { "matrix": [2, 8], "x": 8, "y": 2.25 },
{ "matrix": [2, 9], "x": 9, "y": 2 }, { "matrix": [2, 9], "x": 9, "y": 2.5 },
// Row 4 // Row 4
{ "matrix": [3, 2], "x": 2, "y": 3 }, { "matrix": [3, 2], "x": 2, "y": 3 },
{ "matrix": [3, 3], "x": 3, "y": 3 }, { "matrix": [3, 3], "x": 3, "y": 3.25 },
{ "matrix": [3, 4], "x": 4, "y": 3 }, { "matrix": [3, 4], "x": 4, "y": 3.5 },
{ "matrix": [3, 5], "x": 5, "y": 3 }, { "matrix": [3, 5], "x": 5, "y": 3.5 },
{ "matrix": [3, 6], "x": 6, "y": 3 }, { "matrix": [3, 6], "x": 6, "y": 3.25 },
{ "matrix": [3, 7], "x": 7, "y": 3 } { "matrix": [3, 7], "x": 7, "y": 3 }
] ]
} }

View File

@ -40,16 +40,16 @@
{ "matrix": [1, 0], "x": 0, "y": 1 }, { "matrix": [1, 0], "x": 0, "y": 1 },
{ "matrix": [1, 1], "x": 1, "y": 1 }, { "matrix": [1, 1], "x": 1, "y": 1 },
{ "matrix": [1, 2], "x": 2, "y": 1 }, { "matrix": [1, 2], "x": 2, "y": 1 },
{ "matrix": [1, 3], "x": 3, "y": 1 }, { "matrix": [1, 3], "x": 3, "y": 1, "h": 2 },
{ "matrix": [2, 0], "x": 0, "y": 2 }, { "matrix": [2, 0], "x": 0, "y": 2 },
{ "matrix": [2, 1], "x": 1, "y": 2 }, { "matrix": [2, 1], "x": 1, "y": 2 },
{ "matrix": [2, 2], "x": 2, "y": 2 }, { "matrix": [2, 2], "x": 2, "y": 2 },
{ "matrix": [3, 0], "x": 0, "y": 3 }, { "matrix": [3, 0], "x": 0, "y": 3 },
{ "matrix": [3, 1], "x": 1, "y": 3 }, { "matrix": [3, 1], "x": 1, "y": 3 },
{ "matrix": [3, 2], "x": 2, "y": 3 }, { "matrix": [3, 2], "x": 2, "y": 3 },
{ "matrix": [3, 3], "x": 3, "y": 3 }, { "matrix": [3, 3], "x": 3, "y": 3, "h": 2 },
{ "matrix": [4, 0], "x": 0, "y": 4 }, { "matrix": [4, 0], "x": 0, "y": 4, "w": 2 },
{ "matrix": [4, 1], "x": 1, "y": 3 } { "matrix": [4, 1], "x": 2, "y": 4 }
] ]
} }
} }

View File

@ -30,48 +30,48 @@
"LAYOUT_split_3x5_3": { "LAYOUT_split_3x5_3": {
"layout": [ "layout": [
// Row 1 // Row 1
{ "matrix": [0, 0], "x": 0, "y": 0 }, { "matrix": [0, 0], "x": 0, "y": 0.5 },
{ "matrix": [0, 1], "x": 1, "y": 0 }, { "matrix": [0, 1], "x": 1, "y": 0.25 },
{ "matrix": [0, 2], "x": 2, "y": 0 }, { "matrix": [0, 2], "x": 2, "y": 0 },
{ "matrix": [0, 3], "x": 3, "y": 0 }, { "matrix": [0, 3], "x": 3, "y": 0.25 },
{ "matrix": [0, 4], "x": 4, "y": 0 }, { "matrix": [0, 4], "x": 4, "y": 0.5 },
{ "matrix": [0, 5], "x": 5, "y": 0 }, { "matrix": [0, 5], "x": 7, "y": 0.5 },
{ "matrix": [0, 6], "x": 6, "y": 0 }, { "matrix": [0, 6], "x": 8, "y": 0.25 },
{ "matrix": [0, 7], "x": 7, "y": 0 }, { "matrix": [0, 7], "x": 9, "y": 0 },
{ "matrix": [0, 8], "x": 8, "y": 0 }, { "matrix": [0, 8], "x": 10, "y": 0.25 },
{ "matrix": [0, 9], "x": 9, "y": 0 }, { "matrix": [0, 9], "x": 11, "y": 0.5 },
// Row 2 // Row 2
{ "matrix": [1, 0], "x": 0, "y": 1 }, { "matrix": [1, 0], "x": 0, "y": 1.5 },
{ "matrix": [1, 1], "x": 1, "y": 1 }, { "matrix": [1, 1], "x": 1, "y": 1.25 },
{ "matrix": [1, 2], "x": 2, "y": 1 }, { "matrix": [1, 2], "x": 2, "y": 1 },
{ "matrix": [1, 3], "x": 3, "y": 1 }, { "matrix": [1, 3], "x": 3, "y": 1.25 },
{ "matrix": [1, 4], "x": 4, "y": 1 }, { "matrix": [1, 4], "x": 4, "y": 1.5 },
{ "matrix": [1, 5], "x": 5, "y": 1 }, { "matrix": [1, 5], "x": 7, "y": 1.5 },
{ "matrix": [1, 6], "x": 6, "y": 1 }, { "matrix": [1, 6], "x": 8, "y": 1.25 },
{ "matrix": [1, 7], "x": 7, "y": 1 }, { "matrix": [1, 7], "x": 9, "y": 1 },
{ "matrix": [1, 8], "x": 8, "y": 1 }, { "matrix": [1, 8], "x": 10, "y": 1.25 },
{ "matrix": [1, 9], "x": 9, "y": 1 }, { "matrix": [1, 9], "x": 11, "y": 1.5 },
// Row 3 // Row 3
{ "matrix": [2, 0], "x": 0, "y": 2 }, { "matrix": [2, 0], "x": 0, "y": 2.5 },
{ "matrix": [2, 1], "x": 1, "y": 2 }, { "matrix": [2, 1], "x": 1, "y": 2.25 },
{ "matrix": [2, 2], "x": 2, "y": 2 }, { "matrix": [2, 2], "x": 2, "y": 2 },
{ "matrix": [2, 3], "x": 3, "y": 2 }, { "matrix": [2, 3], "x": 3, "y": 2.25 },
{ "matrix": [2, 4], "x": 4, "y": 2 }, { "matrix": [2, 4], "x": 4, "y": 2.5 },
{ "matrix": [2, 5], "x": 5, "y": 2 }, { "matrix": [2, 5], "x": 7, "y": 2.5 },
{ "matrix": [2, 6], "x": 6, "y": 2 }, { "matrix": [2, 6], "x": 8, "y": 2.25 },
{ "matrix": [2, 7], "x": 7, "y": 2 }, { "matrix": [2, 7], "x": 9, "y": 2 },
{ "matrix": [2, 8], "x": 8, "y": 2 }, { "matrix": [2, 8], "x": 10, "y": 2.25 },
{ "matrix": [2, 9], "x": 9, "y": 2 }, { "matrix": [2, 9], "x": 11, "y": 2.5 },
// Row 4 // Row 4
{ "matrix": [3, 2], "x": 2, "y": 3 }, { "matrix": [3, 2], "x": 2.5, "y": 3.75 },
{ "matrix": [3, 3], "x": 3, "y": 3 }, { "matrix": [3, 3], "x": 3.5, "y": 4 },
{ "matrix": [3, 4], "x": 4, "y": 3 }, { "matrix": [3, 4], "x": 4.5, "y": 4.25 },
{ "matrix": [3, 5], "x": 5, "y": 3 }, { "matrix": [3, 5], "x": 6.5, "y": 4.25 },
{ "matrix": [3, 6], "x": 6, "y": 3 }, { "matrix": [3, 6], "x": 7.5, "y": 4 },
{ "matrix": [3, 7], "x": 7, "y": 3 } { "matrix": [3, 7], "x": 8.5, "y": 3.75 }
] ]
} }
} }

View File

@ -38,7 +38,7 @@
{"matrix": [0, 7], "x": 7, "y": 0}, {"matrix": [0, 7], "x": 7, "y": 0},
{"matrix": [0, 8], "x": 8, "y": 0}, {"matrix": [0, 8], "x": 8, "y": 0},
{"matrix": [0, 9], "x": 9, "y": 0}, {"matrix": [0, 9], "x": 9, "y": 0},
{"matrix": [0, 10], "x": 10, "y": 0}, {"matrix": [0, 10], "x": 10, "y": 0, "w": 1.5},
// Row 2 // Row 2
{"matrix": [1, 0], "x": 0, "y": 1}, {"matrix": [1, 0], "x": 0, "y": 1},
@ -51,7 +51,7 @@
{"matrix": [1, 7], "x": 7, "y": 1}, {"matrix": [1, 7], "x": 7, "y": 1},
{"matrix": [1, 8], "x": 8, "y": 1}, {"matrix": [1, 8], "x": 8, "y": 1},
{"matrix": [1, 9], "x": 9, "y": 1}, {"matrix": [1, 9], "x": 9, "y": 1},
{"matrix": [1, 10], "x": 10, "y": 1}, {"matrix": [1, 10], "x": 10, "y": 1, "w": 1.5},
// Row 3 // Row 3
{"matrix": [2, 0], "x": 0, "y": 2}, {"matrix": [2, 0], "x": 0, "y": 2},
@ -64,7 +64,7 @@
{"matrix": [2, 7], "x": 7, "y": 2}, {"matrix": [2, 7], "x": 7, "y": 2},
{"matrix": [2, 8], "x": 8, "y": 2}, {"matrix": [2, 8], "x": 8, "y": 2},
{"matrix": [2, 9], "x": 9, "y": 2}, {"matrix": [2, 9], "x": 9, "y": 2},
{"matrix": [2, 10], "x": 10, "y": 2}, {"matrix": [2, 10], "x": 10, "y": 2, "w": 1.5},
// Row 4 // Row 4
{"matrix": [3, 0], "x": 0, "y": 3}, {"matrix": [3, 0], "x": 0, "y": 3},
@ -77,17 +77,17 @@
{"matrix": [3, 7], "x": 7, "y": 3}, {"matrix": [3, 7], "x": 7, "y": 3},
{"matrix": [3, 8], "x": 8, "y": 3}, {"matrix": [3, 8], "x": 8, "y": 3},
{"matrix": [3, 9], "x": 9, "y": 3}, {"matrix": [3, 9], "x": 9, "y": 3},
{"matrix": [3, 10], "x": 10, "y": 3}, {"matrix": [3, 10], "x": 10, "y": 3, "w": 1.5},
// Row 5 // Row 5
{"matrix": [4, 0], "x": 0, "y": 4}, {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
{"matrix": [4, 1], "x": 1, "y": 4}, {"matrix": [4, 1], "x": 1.5, "y": 4},
{"matrix": [4, 2], "x": 2, "y": 4}, {"matrix": [4, 2], "x": 2.5, "y": 4},
{"matrix": [4, 4], "x": 4, "y": 4}, {"matrix": [4, 4], "x": 3.5, "y": 4, "w": 3},
{"matrix": [4, 7], "x": 7, "y": 4}, {"matrix": [4, 7], "x": 6.5, "y": 4},
{"matrix": [4, 8], "x": 8, "y": 4}, {"matrix": [4, 8], "x": 7.5, "y": 4},
{"matrix": [4, 9], "x": 9, "y": 4}, {"matrix": [4, 9], "x": 8.5, "y": 4, "w": 1.5},
{"matrix": [4, 10], "x": 10, "y": 4} {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5}
] ]
} }
} }