Move ortho & numpad layouts to data driven (#20183)

Co-authored-by: Nick Brassel <nick@tzarc.org>
This commit is contained in:
Ryan
2023-03-29 15:54:34 +11:00
committed by GitHub
parent 06664e8a94
commit 4869b8061c
589 changed files with 19002 additions and 25368 deletions

View File

@@ -7,27 +7,5 @@
"vid": "0x4025",
"pid": "0x6060",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_ortho_4x3": {
"layout": [
{"label": "k000", "x": 0, "y": 0},
{"label": "k001", "x": 1, "y": 0},
{"label": "k002", "x": 2, "y": 0},
{"label": "k003", "x": 0, "y": 1},
{"label": "k004", "x": 1, "y": 1},
{"label": "k005", "x": 2, "y": 1},
{"label": "k006", "x": 0, "y": 2},
{"label": "k007", "x": 1, "y": 2},
{"label": "k008", "x": 2, "y": 2},
{"label": "k009", "x": 0, "y": 3},
{"label": "k010", "x": 1, "y": 3},
{"label": "k011", "x": 2, "y": 3}
]
}
}
}

View File

@@ -5,5 +5,26 @@
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina"
"bootloader": "caterina",
"layouts": {
"LAYOUT_ortho_4x3": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
{"matrix": [0, 2], "x": 2, "y": 0},
{"matrix": [0, 3], "x": 0, "y": 1},
{"matrix": [0, 4], "x": 1, "y": 1},
{"matrix": [0, 5], "x": 2, "y": 1},
{"matrix": [0, 6], "x": 0, "y": 2},
{"matrix": [0, 7], "x": 1, "y": 2},
{"matrix": [0, 8], "x": 2, "y": 2},
{"matrix": [0, 9], "x": 0, "y": 3},
{"matrix": [0, 10], "x": 1, "y": 3},
{"matrix": [0, 11], "x": 2, "y": 3}
]
}
}
}

View File

@@ -1,27 +0,0 @@
/* Copyright 2021
*
* 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_ortho_4x3( \
K000, K001, K002, \
K003, K004, K005, \
K006, K007, K008, \
K009, K010, K011 \
) { \
{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 } \
}

View File

@@ -5,5 +5,26 @@
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "halfkay"
"bootloader": "halfkay",
"layouts": {
"LAYOUT_ortho_4x3": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
{"matrix": [0, 2], "x": 2, "y": 0},
{"matrix": [0, 3], "x": 0, "y": 1},
{"matrix": [0, 4], "x": 1, "y": 1},
{"matrix": [0, 5], "x": 2, "y": 1},
{"matrix": [0, 6], "x": 0, "y": 2},
{"matrix": [0, 7], "x": 1, "y": 2},
{"matrix": [0, 8], "x": 2, "y": 2},
{"matrix": [0, 9], "x": 0, "y": 3},
{"matrix": [0, 10], "x": 1, "y": 3},
{"matrix": [0, 11], "x": 2, "y": 3}
]
}
}
}

View File

@@ -1,32 +0,0 @@
/* Copyright 2021
*
* 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
//NOTE TO FUTURE FROM RYJELSUM (original contributor):
//This has been unchanged from the promicro.h file.
//I DO NOT HAVE A TEENSY 2.0 TO TEST WITH.
//I believe this should still work - but it's not a sure thing.
#include "quantum.h"
#define LAYOUT_ortho_4x3( \
K000, K001, K002, \
K003, K004, K005, \
K006, K007, K008, \
K009, K010, K011 \
) { \
{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 } \
}