Move ortho & numpad layouts to data driven (#20183)
Co-authored-by: Nick Brassel <nick@tzarc.org>
This commit is contained in:
@@ -16,70 +16,73 @@
|
||||
"layouts": {
|
||||
"LAYOUT_ortho_4x16": {
|
||||
"layout": [
|
||||
{ "x": 0, "y": 0 },
|
||||
{ "x": 1, "y": 0 },
|
||||
{ "x": 2, "y": 0 },
|
||||
{ "x": 3, "y": 0 },
|
||||
{ "x": 4, "y": 0 },
|
||||
{ "x": 5, "y": 0 },
|
||||
{ "x": 6, "y": 0 },
|
||||
{ "x": 7, "y": 0 },
|
||||
{ "x": 8, "y": 0 },
|
||||
{ "x": 9, "y": 0 },
|
||||
{ "x": 10, "y": 0 },
|
||||
{ "x": 11, "y": 0 },
|
||||
{ "x": 12, "y": 0 },
|
||||
{ "x": 13, "y": 0 },
|
||||
{ "x": 14, "y": 0 },
|
||||
{ "x": 15, "y": 0 },
|
||||
{ "x": 0, "y": 1 },
|
||||
{ "x": 1, "y": 1 },
|
||||
{ "x": 2, "y": 1 },
|
||||
{ "x": 3, "y": 1 },
|
||||
{ "x": 4, "y": 1 },
|
||||
{ "x": 5, "y": 1 },
|
||||
{ "x": 6, "y": 1 },
|
||||
{ "x": 7, "y": 1 },
|
||||
{ "x": 8, "y": 1 },
|
||||
{ "x": 9, "y": 1 },
|
||||
{ "x": 10, "y": 1 },
|
||||
{ "x": 11, "y": 1 },
|
||||
{ "x": 12, "y": 1 },
|
||||
{ "x": 13, "y": 1 },
|
||||
{ "x": 14, "y": 1 },
|
||||
{ "x": 15, "y": 1 },
|
||||
{ "x": 0, "y": 2 },
|
||||
{ "x": 1, "y": 2 },
|
||||
{ "x": 2, "y": 2 },
|
||||
{ "x": 3, "y": 2 },
|
||||
{ "x": 4, "y": 2 },
|
||||
{ "x": 5, "y": 2 },
|
||||
{ "x": 6, "y": 2 },
|
||||
{ "x": 7, "y": 2 },
|
||||
{ "x": 8, "y": 2 },
|
||||
{ "x": 9, "y": 2 },
|
||||
{ "x": 10, "y": 2 },
|
||||
{ "x": 11, "y": 2 },
|
||||
{ "x": 12, "y": 2 },
|
||||
{ "x": 13, "y": 2 },
|
||||
{ "x": 14, "y": 2 },
|
||||
{ "x": 15, "y": 2 },
|
||||
{ "x": 0, "y": 3 },
|
||||
{ "x": 1, "y": 3 },
|
||||
{ "x": 2, "y": 3 },
|
||||
{ "x": 3, "y": 3 },
|
||||
{ "x": 4, "y": 3 },
|
||||
{ "x": 5, "y": 3 },
|
||||
{ "x": 6, "y": 3 },
|
||||
{ "x": 7, "y": 3 },
|
||||
{ "x": 8, "y": 3 },
|
||||
{ "x": 9, "y": 3 },
|
||||
{ "x": 10, "y": 3 },
|
||||
{ "x": 11, "y": 3 },
|
||||
{ "x": 12, "y": 3 },
|
||||
{ "x": 13, "y": 3 },
|
||||
{ "x": 14, "y": 3 },
|
||||
{ "x": 15, "y": 3 }
|
||||
{"matrix": [0, 0], "x": 0, "y": 0},
|
||||
{"matrix": [1, 0], "x": 1, "y": 0},
|
||||
{"matrix": [0, 1], "x": 2, "y": 0},
|
||||
{"matrix": [1, 1], "x": 3, "y": 0},
|
||||
{"matrix": [0, 2], "x": 4, "y": 0},
|
||||
{"matrix": [1, 2], "x": 5, "y": 0},
|
||||
{"matrix": [0, 3], "x": 6, "y": 0},
|
||||
{"matrix": [1, 3], "x": 7, "y": 0},
|
||||
{"matrix": [0, 4], "x": 8, "y": 0},
|
||||
{"matrix": [1, 4], "x": 9, "y": 0},
|
||||
{"matrix": [0, 5], "x": 10, "y": 0},
|
||||
{"matrix": [1, 5], "x": 11, "y": 0},
|
||||
{"matrix": [0, 6], "x": 12, "y": 0},
|
||||
{"matrix": [1, 6], "x": 13, "y": 0},
|
||||
{"matrix": [0, 7], "x": 14, "y": 0},
|
||||
{"matrix": [1, 7], "x": 15, "y": 0},
|
||||
|
||||
{"matrix": [2, 0], "x": 0, "y": 1},
|
||||
{"matrix": [3, 0], "x": 1, "y": 1},
|
||||
{"matrix": [2, 1], "x": 2, "y": 1},
|
||||
{"matrix": [3, 1], "x": 3, "y": 1},
|
||||
{"matrix": [2, 2], "x": 4, "y": 1},
|
||||
{"matrix": [3, 2], "x": 5, "y": 1},
|
||||
{"matrix": [2, 3], "x": 6, "y": 1},
|
||||
{"matrix": [3, 3], "x": 7, "y": 1},
|
||||
{"matrix": [2, 4], "x": 8, "y": 1},
|
||||
{"matrix": [3, 4], "x": 9, "y": 1},
|
||||
{"matrix": [2, 5], "x": 10, "y": 1},
|
||||
{"matrix": [3, 5], "x": 11, "y": 1},
|
||||
{"matrix": [2, 6], "x": 12, "y": 1},
|
||||
{"matrix": [3, 6], "x": 13, "y": 1},
|
||||
{"matrix": [2, 7], "x": 14, "y": 1},
|
||||
{"matrix": [3, 7], "x": 15, "y": 1},
|
||||
|
||||
{"matrix": [4, 0], "x": 0, "y": 2},
|
||||
{"matrix": [5, 0], "x": 1, "y": 2},
|
||||
{"matrix": [4, 1], "x": 2, "y": 2},
|
||||
{"matrix": [5, 1], "x": 3, "y": 2},
|
||||
{"matrix": [4, 2], "x": 4, "y": 2},
|
||||
{"matrix": [5, 2], "x": 5, "y": 2},
|
||||
{"matrix": [4, 3], "x": 6, "y": 2},
|
||||
{"matrix": [5, 3], "x": 7, "y": 2},
|
||||
{"matrix": [4, 4], "x": 8, "y": 2},
|
||||
{"matrix": [5, 4], "x": 9, "y": 2},
|
||||
{"matrix": [4, 5], "x": 10, "y": 2},
|
||||
{"matrix": [5, 5], "x": 11, "y": 2},
|
||||
{"matrix": [4, 6], "x": 12, "y": 2},
|
||||
{"matrix": [5, 6], "x": 13, "y": 2},
|
||||
{"matrix": [4, 7], "x": 14, "y": 2},
|
||||
{"matrix": [5, 7], "x": 15, "y": 2},
|
||||
|
||||
{"matrix": [6, 0], "x": 0, "y": 3},
|
||||
{"matrix": [7, 0], "x": 1, "y": 3},
|
||||
{"matrix": [6, 1], "x": 2, "y": 3},
|
||||
{"matrix": [7, 1], "x": 3, "y": 3},
|
||||
{"matrix": [6, 2], "x": 4, "y": 3},
|
||||
{"matrix": [7, 2], "x": 5, "y": 3},
|
||||
{"matrix": [6, 3], "x": 6, "y": 3},
|
||||
{"matrix": [7, 3], "x": 7, "y": 3},
|
||||
{"matrix": [6, 4], "x": 8, "y": 3},
|
||||
{"matrix": [7, 4], "x": 9, "y": 3},
|
||||
{"matrix": [6, 5], "x": 10, "y": 3},
|
||||
{"matrix": [7, 5], "x": 11, "y": 3},
|
||||
{"matrix": [6, 6], "x": 12, "y": 3},
|
||||
{"matrix": [7, 6], "x": 13, "y": 3},
|
||||
{"matrix": [6, 7], "x": 14, "y": 3},
|
||||
{"matrix": [7, 7], "x": 15, "y": 3}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
@@ -1,41 +0,0 @@
|
||||
/*
|
||||
©2021 Everywhere Defense Industries / Fate Everywhere <fate@7storm.org>
|
||||
|
||||
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 3 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"
|
||||
|
||||
// This a shortcut to help you visually see your layout.
|
||||
// The first section contains all of the arguments
|
||||
// The second converts the arguments into a two-dimensional array
|
||||
|
||||
#define LAYOUT_ortho_4x16( \
|
||||
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, K52, K53, K54, K55, K56, K57, K58, K59, K60, K61, K62, K63 \
|
||||
) \
|
||||
{ \
|
||||
{ K00, K02, K04, K06, K08, K10, K12, K14 }, \
|
||||
{ K01, K03, K05, K07, K09, K11, K13, K15 }, \
|
||||
{ K16, K18, K20, K22, K24, K26, K28, K30 }, \
|
||||
{ K17, K19, K21, K23, K25, K27, K29, K31 }, \
|
||||
{ K32, K34, K36, K38, K40, K42, K44, K46 }, \
|
||||
{ K33, K35, K37, K39, K41, K43, K45, K47 }, \
|
||||
{ K48, K50, K52, K54, K56, K58, K60, K62 }, \
|
||||
{ K49, K51, K53, K55, K57, K59, K61, K63 } \
|
||||
}
|
@@ -20,70 +20,73 @@
|
||||
"layouts": {
|
||||
"LAYOUT_ortho_4x16": {
|
||||
"layout": [
|
||||
{ "x": 0, "y": 0 },
|
||||
{ "x": 1, "y": 0 },
|
||||
{ "x": 2, "y": 0 },
|
||||
{ "x": 3, "y": 0 },
|
||||
{ "x": 4, "y": 0 },
|
||||
{ "x": 5, "y": 0 },
|
||||
{ "x": 6, "y": 0 },
|
||||
{ "x": 7, "y": 0 },
|
||||
{ "x": 8, "y": 0 },
|
||||
{ "x": 9, "y": 0 },
|
||||
{ "x": 10, "y": 0 },
|
||||
{ "x": 11, "y": 0 },
|
||||
{ "x": 12, "y": 0 },
|
||||
{ "x": 13, "y": 0 },
|
||||
{ "x": 14, "y": 0 },
|
||||
{ "x": 15, "y": 0 },
|
||||
{ "x": 0, "y": 1 },
|
||||
{ "x": 1, "y": 1 },
|
||||
{ "x": 2, "y": 1 },
|
||||
{ "x": 3, "y": 1 },
|
||||
{ "x": 4, "y": 1 },
|
||||
{ "x": 5, "y": 1 },
|
||||
{ "x": 6, "y": 1 },
|
||||
{ "x": 7, "y": 1 },
|
||||
{ "x": 8, "y": 1 },
|
||||
{ "x": 9, "y": 1 },
|
||||
{ "x": 10, "y": 1 },
|
||||
{ "x": 11, "y": 1 },
|
||||
{ "x": 12, "y": 1 },
|
||||
{ "x": 13, "y": 1 },
|
||||
{ "x": 14, "y": 1 },
|
||||
{ "x": 15, "y": 1 },
|
||||
{ "x": 0, "y": 2 },
|
||||
{ "x": 1, "y": 2 },
|
||||
{ "x": 2, "y": 2 },
|
||||
{ "x": 3, "y": 2 },
|
||||
{ "x": 4, "y": 2 },
|
||||
{ "x": 5, "y": 2 },
|
||||
{ "x": 6, "y": 2 },
|
||||
{ "x": 7, "y": 2 },
|
||||
{ "x": 8, "y": 2 },
|
||||
{ "x": 9, "y": 2 },
|
||||
{ "x": 10, "y": 2 },
|
||||
{ "x": 11, "y": 2 },
|
||||
{ "x": 12, "y": 2 },
|
||||
{ "x": 13, "y": 2 },
|
||||
{ "x": 14, "y": 2 },
|
||||
{ "x": 15, "y": 2 },
|
||||
{ "x": 0, "y": 3 },
|
||||
{ "x": 1, "y": 3 },
|
||||
{ "x": 2, "y": 3 },
|
||||
{ "x": 3, "y": 3 },
|
||||
{ "x": 4, "y": 3 },
|
||||
{ "x": 5, "y": 3 },
|
||||
{ "x": 6, "y": 3 },
|
||||
{ "x": 7, "y": 3 },
|
||||
{ "x": 8, "y": 3 },
|
||||
{ "x": 9, "y": 3 },
|
||||
{ "x": 10, "y": 3 },
|
||||
{ "x": 11, "y": 3 },
|
||||
{ "x": 12, "y": 3 },
|
||||
{ "x": 13, "y": 3 },
|
||||
{ "x": 14, "y": 3 },
|
||||
{ "x": 15, "y": 3 }
|
||||
{"matrix": [0, 0], "x": 0, "y": 0},
|
||||
{"matrix": [1, 0], "x": 1, "y": 0},
|
||||
{"matrix": [0, 1], "x": 2, "y": 0},
|
||||
{"matrix": [1, 1], "x": 3, "y": 0},
|
||||
{"matrix": [0, 2], "x": 4, "y": 0},
|
||||
{"matrix": [1, 2], "x": 5, "y": 0},
|
||||
{"matrix": [0, 3], "x": 6, "y": 0},
|
||||
{"matrix": [1, 3], "x": 7, "y": 0},
|
||||
{"matrix": [0, 4], "x": 8, "y": 0},
|
||||
{"matrix": [1, 4], "x": 9, "y": 0},
|
||||
{"matrix": [0, 5], "x": 10, "y": 0},
|
||||
{"matrix": [1, 5], "x": 11, "y": 0},
|
||||
{"matrix": [0, 6], "x": 12, "y": 0},
|
||||
{"matrix": [1, 6], "x": 13, "y": 0},
|
||||
{"matrix": [0, 7], "x": 14, "y": 0},
|
||||
{"matrix": [1, 7], "x": 15, "y": 0},
|
||||
|
||||
{"matrix": [2, 0], "x": 0, "y": 1},
|
||||
{"matrix": [3, 0], "x": 1, "y": 1},
|
||||
{"matrix": [2, 1], "x": 2, "y": 1},
|
||||
{"matrix": [3, 1], "x": 3, "y": 1},
|
||||
{"matrix": [2, 2], "x": 4, "y": 1},
|
||||
{"matrix": [3, 2], "x": 5, "y": 1},
|
||||
{"matrix": [2, 3], "x": 6, "y": 1},
|
||||
{"matrix": [3, 3], "x": 7, "y": 1},
|
||||
{"matrix": [2, 4], "x": 8, "y": 1},
|
||||
{"matrix": [3, 4], "x": 9, "y": 1},
|
||||
{"matrix": [2, 5], "x": 10, "y": 1},
|
||||
{"matrix": [3, 5], "x": 11, "y": 1},
|
||||
{"matrix": [2, 6], "x": 12, "y": 1},
|
||||
{"matrix": [3, 6], "x": 13, "y": 1},
|
||||
{"matrix": [2, 7], "x": 14, "y": 1},
|
||||
{"matrix": [3, 7], "x": 15, "y": 1},
|
||||
|
||||
{"matrix": [4, 0], "x": 0, "y": 2},
|
||||
{"matrix": [5, 0], "x": 1, "y": 2},
|
||||
{"matrix": [4, 1], "x": 2, "y": 2},
|
||||
{"matrix": [5, 1], "x": 3, "y": 2},
|
||||
{"matrix": [4, 2], "x": 4, "y": 2},
|
||||
{"matrix": [5, 2], "x": 5, "y": 2},
|
||||
{"matrix": [4, 3], "x": 6, "y": 2},
|
||||
{"matrix": [5, 3], "x": 7, "y": 2},
|
||||
{"matrix": [4, 4], "x": 8, "y": 2},
|
||||
{"matrix": [5, 4], "x": 9, "y": 2},
|
||||
{"matrix": [4, 5], "x": 10, "y": 2},
|
||||
{"matrix": [5, 5], "x": 11, "y": 2},
|
||||
{"matrix": [4, 6], "x": 12, "y": 2},
|
||||
{"matrix": [5, 6], "x": 13, "y": 2},
|
||||
{"matrix": [4, 7], "x": 14, "y": 2},
|
||||
{"matrix": [5, 7], "x": 15, "y": 2},
|
||||
|
||||
{"matrix": [6, 0], "x": 0, "y": 3},
|
||||
{"matrix": [7, 0], "x": 1, "y": 3},
|
||||
{"matrix": [6, 1], "x": 2, "y": 3},
|
||||
{"matrix": [7, 1], "x": 3, "y": 3},
|
||||
{"matrix": [6, 2], "x": 4, "y": 3},
|
||||
{"matrix": [7, 2], "x": 5, "y": 3},
|
||||
{"matrix": [6, 3], "x": 6, "y": 3},
|
||||
{"matrix": [7, 3], "x": 7, "y": 3},
|
||||
{"matrix": [6, 4], "x": 8, "y": 3},
|
||||
{"matrix": [7, 4], "x": 9, "y": 3},
|
||||
{"matrix": [6, 5], "x": 10, "y": 3},
|
||||
{"matrix": [7, 5], "x": 11, "y": 3},
|
||||
{"matrix": [6, 6], "x": 12, "y": 3},
|
||||
{"matrix": [7, 6], "x": 13, "y": 3},
|
||||
{"matrix": [6, 7], "x": 14, "y": 3},
|
||||
{"matrix": [7, 7], "x": 15, "y": 3}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
@@ -1,37 +0,0 @@
|
||||
/*
|
||||
©2021 Everywhere Defense Industries / Fate Everywhere <fate@7storm.org>
|
||||
|
||||
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 3 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 LAYOUT_ortho_4x16( \
|
||||
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, K52, K53, K54, K55, K56, K57, K58, K59, K60, K61, K62, K63 \
|
||||
) \
|
||||
{ \
|
||||
{ K00, K02, K04, K06, K08, K10, K12, K14 }, \
|
||||
{ K01, K03, K05, K07, K09, K11, K13, K15 }, \
|
||||
{ K16, K18, K20, K22, K24, K26, K28, K30 }, \
|
||||
{ K17, K19, K21, K23, K25, K27, K29, K31 }, \
|
||||
{ K32, K34, K36, K38, K40, K42, K44, K46 }, \
|
||||
{ K33, K35, K37, K39, K41, K43, K45, K47 }, \
|
||||
{ K48, K50, K52, K54, K56, K58, K60, K62 }, \
|
||||
{ K49, K51, K53, K55, K57, K59, K61, K63 } \
|
||||
}
|
Reference in New Issue
Block a user