Move small macropad-ish layouts to data driven (#20341)
This commit is contained in:
@@ -17,7 +17,10 @@
|
||||
"bootloader": "atmel-dfu",
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [{"x":0, "y":0}, {"x":0, "y":1}]
|
||||
"layout": [
|
||||
{"matrix": [0, 0], "x": 0, "y": 0},
|
||||
{"matrix": [1, 1], "x": 0, "y": 1}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -1,27 +0,0 @@
|
||||
/* Copyright 2020 Neil Brian Ramirez
|
||||
*
|
||||
* 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 LAYOUT( \
|
||||
K00, \
|
||||
K11 \
|
||||
) { \
|
||||
{ K00, KC_NO }, \
|
||||
{ KC_NO, K11 }, \
|
||||
}
|
@@ -18,17 +18,18 @@
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [
|
||||
{"x":0, "y":0},
|
||||
{"x":1, "y":0},
|
||||
{"x":2, "y":0},
|
||||
|
||||
{"x":0, "y":1},
|
||||
{"x":1, "y":1},
|
||||
{"x":2, "y":1},
|
||||
|
||||
{"x":0, "y":2},
|
||||
{"x":1, "y":2},
|
||||
{"x":2, "y":2}]
|
||||
{"matrix": [0, 0], "x": 0, "y": 0},
|
||||
{"matrix": [0, 1], "x": 1, "y": 0},
|
||||
{"matrix": [0, 2], "x": 2, "y": 0},
|
||||
|
||||
{"matrix": [1, 0], "x": 0, "y": 1},
|
||||
{"matrix": [1, 1], "x": 1, "y": 1},
|
||||
{"matrix": [1, 2], "x": 2, "y": 1},
|
||||
|
||||
{"matrix": [2, 0], "x": 0, "y": 2},
|
||||
{"matrix": [2, 1], "x": 1, "y": 2},
|
||||
{"matrix": [2, 2], "x": 2, "y": 2}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -1,29 +0,0 @@
|
||||
/* Copyright 2020 Neil Brian Ramirez
|
||||
*
|
||||
* 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 LAYOUT( \
|
||||
K00, K01, K02, \
|
||||
K10, K11, K12, \
|
||||
K20, K21, K22 \
|
||||
) { \
|
||||
{ K00, K01, K02 }, \
|
||||
{ K10, K11, K12 }, \
|
||||
{ K20, K21, K22 }, \
|
||||
}
|
@@ -24,23 +24,24 @@
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [
|
||||
{"x":0, "y":0},
|
||||
{"x":1, "y":0},
|
||||
{"x":2, "y":0},
|
||||
{"x":3.5, "y":0},
|
||||
{"x":4.5, "y":0},
|
||||
{"x":5.5, "y":0},
|
||||
|
||||
{"x":1.25, "y":1.25},
|
||||
{"x":2.25, "y":1.25},
|
||||
{"x":3.25, "y":1.25},
|
||||
{"x":4.25, "y":1.25},
|
||||
|
||||
{"x":1.25, "y":2.25},
|
||||
{"x":2.25, "y":2.25},
|
||||
{"x":3.25, "y":2.25},
|
||||
{"x":4.25, "y":2.25}
|
||||
]
|
||||
{"matrix": [2, 0], "x": 0, "y": 0},
|
||||
{"matrix": [0, 4], "x": 1, "y": 0},
|
||||
{"matrix": [2, 1], "x": 2, "y": 0},
|
||||
|
||||
{"matrix": [2, 2], "x": 3.5, "y": 0},
|
||||
{"matrix": [1, 4], "x": 4.5, "y": 0},
|
||||
{"matrix": [2, 3], "x": 5.5, "y": 0},
|
||||
|
||||
{"matrix": [0, 0], "x": 1.25, "y": 1.25},
|
||||
{"matrix": [0, 1], "x": 2.25, "y": 1.25},
|
||||
{"matrix": [0, 2], "x": 3.25, "y": 1.25},
|
||||
{"matrix": [0, 3], "x": 4.25, "y": 1.25},
|
||||
|
||||
{"matrix": [1, 0], "x": 1.25, "y": 2.25},
|
||||
{"matrix": [1, 1], "x": 2.25, "y": 2.25},
|
||||
{"matrix": [1, 2], "x": 3.25, "y": 2.25},
|
||||
{"matrix": [1, 3], "x": 4.25, "y": 2.25}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -18,22 +18,3 @@
|
||||
|
||||
#include "quantum.h"
|
||||
#include "encoder_action.h"
|
||||
|
||||
/* This is a shortcut to help you visually see your layout.
|
||||
*
|
||||
* The first section contains all of the arguments representing the physical
|
||||
* layout of the board and position of the keys.
|
||||
*
|
||||
* The second converts the arguments into a two-dimensional array which
|
||||
* represents the switch matrix.
|
||||
*/
|
||||
#define LAYOUT( \
|
||||
E00A, K04, E00B, E01A, K14, E01B, \
|
||||
K00, K01, K02, K03, \
|
||||
K10, K11, K12, K13 \
|
||||
\
|
||||
) { \
|
||||
{ K00, K01, K02, K03, K04 }, \
|
||||
{ K10, K11, K12, K13, K14 }, \
|
||||
{ E00A, E00B, E01A, E01B, KC_NO } \
|
||||
}
|
||||
|
@@ -45,17 +45,19 @@
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [
|
||||
{"x":0, "y":0},
|
||||
{"x":3, "y":0},
|
||||
{"x":0, "y":1.25},
|
||||
{"x":1, "y":1.25},
|
||||
{"x":2, "y":1.25},
|
||||
{"x":3, "y":1.25},
|
||||
|
||||
{"x":0, "y":2.25},
|
||||
{"x":1, "y":2.25},
|
||||
{"x":2, "y":2.25},
|
||||
{"x":3, "y":2.25}]
|
||||
{"matrix": [0, 4], "x": 0, "y": 0},
|
||||
{"matrix": [1, 5], "x": 3, "y": 0},
|
||||
|
||||
{"matrix": [0, 0], "x": 0, "y": 1.25},
|
||||
{"matrix": [0, 1], "x": 1, "y": 1.25},
|
||||
{"matrix": [0, 2], "x": 2, "y": 1.25},
|
||||
{"matrix": [0, 3], "x": 3, "y": 1.25},
|
||||
|
||||
{"matrix": [1, 0], "x": 0, "y": 2.25},
|
||||
{"matrix": [1, 1], "x": 1, "y": 2.25},
|
||||
{"matrix": [1, 2], "x": 2, "y": 2.25},
|
||||
{"matrix": [1, 3], "x": 3, "y": 2.25}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -1,37 +0,0 @@
|
||||
/* Copyright 2022 DeskDaily
|
||||
*
|
||||
* 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"
|
||||
|
||||
/* This is a shortcut to help you visually see your layout.
|
||||
*
|
||||
* The first section contains all of the arguments representing the physical
|
||||
* layout of the board and position of the keys.
|
||||
*
|
||||
* The second converts the arguments into a two-dimensional array which
|
||||
* represents the switch matrix.
|
||||
*/
|
||||
#define LAYOUT( \
|
||||
K04, K15, \
|
||||
K00, K01, K02, K03, \
|
||||
K10, K11, K12, K13 \
|
||||
\
|
||||
) { \
|
||||
{ K00, K01, K02, K03, K04, KC_NO }, \
|
||||
{ K10, K11, K12, K13, KC_NO, K15 }, \
|
||||
}
|
Reference in New Issue
Block a user