Remove FLIP_HALF layouts and move to data driven (#20588)
This commit is contained in:
Ryan
GitHub
@@ -28,206 +28,53 @@
|
||||
"layouts": {
|
||||
"LAYOUT_ortho_4x10": {
|
||||
"layout": [
|
||||
{
|
||||
"label": "Q",
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
{
|
||||
"label": "W",
|
||||
"x": 1,
|
||||
"y": 0
|
||||
},
|
||||
{
|
||||
"label": "E",
|
||||
"x": 2,
|
||||
"y": 0
|
||||
},
|
||||
{
|
||||
"label": "R",
|
||||
"x": 3,
|
||||
"y": 0
|
||||
},
|
||||
{
|
||||
"label": "T",
|
||||
"x": 4,
|
||||
"y": 0
|
||||
},
|
||||
{
|
||||
"label": "Y",
|
||||
"x": 6,
|
||||
"y": 0
|
||||
},
|
||||
{
|
||||
"label": "U",
|
||||
"x": 7,
|
||||
"y": 0
|
||||
},
|
||||
{
|
||||
"label": "I",
|
||||
"x": 8,
|
||||
"y": 0
|
||||
},
|
||||
{
|
||||
"label": "O",
|
||||
"x": 9,
|
||||
"y": 0
|
||||
},
|
||||
{
|
||||
"label": "P",
|
||||
"x": 10,
|
||||
"y": 0
|
||||
},
|
||||
{
|
||||
"label": "A",
|
||||
"x": 0,
|
||||
"y": 1
|
||||
},
|
||||
{
|
||||
"label": "S",
|
||||
"x": 1,
|
||||
"y": 1
|
||||
},
|
||||
{
|
||||
"label": "D",
|
||||
"x": 2,
|
||||
"y": 1
|
||||
},
|
||||
{
|
||||
"label": "F",
|
||||
"x": 3,
|
||||
"y": 1
|
||||
},
|
||||
{
|
||||
"label": "G",
|
||||
"x": 4,
|
||||
"y": 1
|
||||
},
|
||||
{
|
||||
"label": "H",
|
||||
"x": 6,
|
||||
"y": 1
|
||||
},
|
||||
{
|
||||
"label": "J",
|
||||
"x": 7,
|
||||
"y": 1
|
||||
},
|
||||
{
|
||||
"label": "K",
|
||||
"x": 8,
|
||||
"y": 1
|
||||
},
|
||||
{
|
||||
"label": "L",
|
||||
"x": 9,
|
||||
"y": 1
|
||||
},
|
||||
{
|
||||
"label": "Enter",
|
||||
"x": 10,
|
||||
"y": 1
|
||||
},
|
||||
{
|
||||
"label": "Z",
|
||||
"x": 0,
|
||||
"y": 2
|
||||
},
|
||||
{
|
||||
"label": "X",
|
||||
"x": 1,
|
||||
"y": 2
|
||||
},
|
||||
{
|
||||
"label": "C",
|
||||
"x": 2,
|
||||
"y": 2
|
||||
},
|
||||
{
|
||||
"label": "V",
|
||||
"x": 3,
|
||||
"y": 2
|
||||
},
|
||||
{
|
||||
"label": "B",
|
||||
"x": 4,
|
||||
"y": 2
|
||||
},
|
||||
{
|
||||
"label": "N",
|
||||
"x": 6,
|
||||
"y": 2
|
||||
},
|
||||
{
|
||||
"label": "M",
|
||||
"x": 7,
|
||||
"y": 2
|
||||
},
|
||||
{
|
||||
"label": ",",
|
||||
"x": 8,
|
||||
"y": 2
|
||||
},
|
||||
{
|
||||
"label": ".",
|
||||
"x": 9,
|
||||
"y": 2
|
||||
},
|
||||
{
|
||||
"label": "/",
|
||||
"x": 10,
|
||||
"y": 2
|
||||
},
|
||||
{
|
||||
"label": "Ctrl",
|
||||
"x": 0,
|
||||
"y": 3
|
||||
},
|
||||
{
|
||||
"label": "Win",
|
||||
"x": 1,
|
||||
"y": 3
|
||||
},
|
||||
{
|
||||
"label": "Alt",
|
||||
"x": 2,
|
||||
"y": 3
|
||||
},
|
||||
{
|
||||
"label": "Lower",
|
||||
"x": 3,
|
||||
"y": 3
|
||||
},
|
||||
{
|
||||
"label": "backspace",
|
||||
"x": 4,
|
||||
"y": 3
|
||||
},
|
||||
{
|
||||
"label": "space",
|
||||
"x": 6,
|
||||
"y": 3
|
||||
},
|
||||
{
|
||||
"label": "Upper",
|
||||
"x": 7,
|
||||
"y": 3
|
||||
},
|
||||
{
|
||||
"label": "Alt",
|
||||
"x": 8,
|
||||
"y": 3
|
||||
},
|
||||
{
|
||||
"label": "App",
|
||||
"x": 9,
|
||||
"y": 3
|
||||
},
|
||||
{
|
||||
"label": "Ctrl",
|
||||
"x": 10,
|
||||
"y": 3
|
||||
}
|
||||
{"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": 3, "y": 0},
|
||||
{"matrix": [0, 4], "x": 4, "y": 0},
|
||||
|
||||
{"matrix": [4, 4], "x": 6, "y": 0},
|
||||
{"matrix": [4, 3], "x": 7, "y": 0},
|
||||
{"matrix": [4, 2], "x": 8, "y": 0},
|
||||
{"matrix": [4, 1], "x": 9, "y": 0},
|
||||
{"matrix": [4, 0], "x": 10, "y": 0},
|
||||
|
||||
{"matrix": [1, 0], "x": 0, "y": 1},
|
||||
{"matrix": [1, 1], "x": 1, "y": 1},
|
||||
{"matrix": [1, 2], "x": 2, "y": 1},
|
||||
{"matrix": [1, 3], "x": 3, "y": 1},
|
||||
{"matrix": [1, 4], "x": 4, "y": 1},
|
||||
|
||||
{"matrix": [5, 4], "x": 6, "y": 1},
|
||||
{"matrix": [5, 3], "x": 7, "y": 1},
|
||||
{"matrix": [5, 2], "x": 8, "y": 1},
|
||||
{"matrix": [5, 1], "x": 9, "y": 1},
|
||||
{"matrix": [5, 0], "x": 10, "y": 1},
|
||||
|
||||
{"matrix": [2, 0], "x": 0, "y": 2},
|
||||
{"matrix": [2, 1], "x": 1, "y": 2},
|
||||
{"matrix": [2, 2], "x": 2, "y": 2},
|
||||
{"matrix": [2, 3], "x": 3, "y": 2},
|
||||
{"matrix": [2, 4], "x": 4, "y": 2},
|
||||
|
||||
{"matrix": [6, 4], "x": 6, "y": 2},
|
||||
{"matrix": [6, 3], "x": 7, "y": 2},
|
||||
{"matrix": [6, 2], "x": 8, "y": 2},
|
||||
{"matrix": [6, 1], "x": 9, "y": 2},
|
||||
{"matrix": [6, 0], "x": 10, "y": 2},
|
||||
|
||||
{"matrix": [3, 0], "x": 0, "y": 3},
|
||||
{"matrix": [3, 1], "x": 1, "y": 3},
|
||||
{"matrix": [3, 2], "x": 2, "y": 3},
|
||||
{"matrix": [3, 3], "x": 3, "y": 3},
|
||||
{"matrix": [3, 4], "x": 4, "y": 3},
|
||||
|
||||
{"matrix": [7, 4], "x": 6, "y": 3},
|
||||
{"matrix": [7, 3], "x": 7, "y": 3},
|
||||
{"matrix": [7, 2], "x": 8, "y": 3},
|
||||
{"matrix": [7, 1], "x": 9, "y": 3},
|
||||
{"matrix": [7, 0], "x": 10, "y": 3}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "rev1.h"
|
||||
#include "quantum.h"
|
||||
|
||||
// Optional override functions below.
|
||||
// You can leave any or all of these undefined.
|
||||
|
||||
@@ -1,89 +0,0 @@
|
||||
/* Copyright 2020 marksard
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
#ifndef FLIP_HALF
|
||||
// Standard Keymap
|
||||
// (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
|
||||
#define LAYOUT_ortho_4x10( \
|
||||
L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \
|
||||
L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \
|
||||
L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \
|
||||
L30, L31, L32, L33, L34, R30, R31, R32, R33, R34 \
|
||||
) \
|
||||
{ \
|
||||
{ L00, L01, L02, L03, L04 }, \
|
||||
{ L10, L11, L12, L13, L14 }, \
|
||||
{ L20, L21, L22, L23, L24 }, \
|
||||
{ L30, L31, L32, L33, L34 }, \
|
||||
{ R04, R03, R02, R01, R00 }, \
|
||||
{ R14, R13, R12, R11, R10 }, \
|
||||
{ R24, R23, R22, R21, R20 }, \
|
||||
{ R34, R33, R32, R31, R30 }, \
|
||||
}
|
||||
#else
|
||||
// Keymap with right side flipped
|
||||
// (TRRS jack on both halves are to the right)
|
||||
#define LAYOUT_ortho_4x10( \
|
||||
L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \
|
||||
L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \
|
||||
L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \
|
||||
L30, L31, L32, L33, L34, R30, R31, R32, R33, R34 \
|
||||
) \
|
||||
{ \
|
||||
{ L04, L03, L02, L01, L00 }, \
|
||||
{ L14, L13, L12, L11, L10 }, \
|
||||
{ L24, L23, L22, L21, L20 }, \
|
||||
{ L34, L33, L32, L31, L30 }, \
|
||||
{ R04, R03, R02, R01, R00 }, \
|
||||
{ R14, R13, R12, R11, R10 }, \
|
||||
{ R24, R23, R22, R21, R20 }, \
|
||||
{ R34, R33, R32, R31, R30 }, \
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef USE_HASHTWENTY // The HashTwenty is Alpha version of The Rhymestone
|
||||
#undef LAYOUT_ortho_4x10
|
||||
// HashTwenty layout
|
||||
#define LAYOUT_ortho_4x10( \
|
||||
L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \
|
||||
L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \
|
||||
L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \
|
||||
L30, L31, L32, L33, L34, R30, R31, R32, R33, R34 \
|
||||
) \
|
||||
{ \
|
||||
{ L04, L03, L02, L01, L00 }, \
|
||||
{ L14, L13, L12, L11, L10 }, \
|
||||
{ L24, L23, L22, L21, L20 }, \
|
||||
{ L34, L33, L32, L31, L30 }, \
|
||||
{ R00, R01, R02, R03, R04 }, \
|
||||
{ R10, R11, R12, R13, R14 }, \
|
||||
{ R20, R21, R22, R23, R24 }, \
|
||||
{ R30, R31, R32, R33, R34 }, \
|
||||
}
|
||||
#endif
|
||||
Reference in New Issue
Block a user