Move miscellaneous layouts to data driven (#20516)
This commit is contained in:
@@ -14,7 +14,7 @@
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "4x6_right.h"
|
||||
#include "tractyl_manuform.h"
|
||||
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
led_config_t g_led_config = { {
|
||||
|
@@ -1,46 +0,0 @@
|
||||
/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com>
|
||||
*
|
||||
* 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 "tractyl_manuform.h"
|
||||
|
||||
#define ___ KC_NO
|
||||
|
||||
// clang-format off
|
||||
#define LAYOUT_4x6_right(\
|
||||
L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
|
||||
L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
|
||||
L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
|
||||
L32, L33, R32, R33, \
|
||||
L34, L35, R31, \
|
||||
L44, L45, R41, \
|
||||
L42, L43, R42, R43 \
|
||||
) \
|
||||
{ \
|
||||
{ L00, L01, L02, L03, L04, L05 }, \
|
||||
{ L10, L11, L12, L13, L14, L15 }, \
|
||||
{ L20, L21, L22, L23, L24, L25 }, \
|
||||
{ ___, ___, L32, L33, L34, L35 }, \
|
||||
{ ___, ___, L42, L43, L44, L45 }, \
|
||||
\
|
||||
{ R00, R01, R02, R03, R04, R05 }, \
|
||||
{ R10, R11, R12, R13, R14, R15 }, \
|
||||
{ R20, R21, R22, R23, R24, R25 }, \
|
||||
{ ___, R31, R32, R33, ___, ___ }, \
|
||||
{ ___, R41, R42, R43, ___, ___ } \
|
||||
}
|
||||
// clang-format on
|
@@ -28,56 +28,69 @@
|
||||
"layouts": {
|
||||
"LAYOUT_4x6_right": {
|
||||
"layout": [
|
||||
{"label":"L00", "x":0, "y":0},
|
||||
{"label":"L01", "x":1, "y":0},
|
||||
{"label":"L02", "x":2, "y":0},
|
||||
{"label":"L03", "x":3, "y":0},
|
||||
{"label":"L04", "x":4, "y":0},
|
||||
{"label":"L05", "x":5, "y":0},
|
||||
{"label":"R00", "x":11, "y":0},
|
||||
{"label":"R01", "x":12, "y":0},
|
||||
{"label":"R02", "x":13, "y":0},
|
||||
{"label":"R03", "x":14, "y":0},
|
||||
{"label":"R04", "x":15, "y":0},
|
||||
{"label":"R05", "x":16, "y":0},
|
||||
{"label":"L10", "x":0, "y":1},
|
||||
{"label":"L11", "x":1, "y":1},
|
||||
{"label":"L12", "x":2, "y":1},
|
||||
{"label":"L13", "x":3, "y":1},
|
||||
{"label":"L14", "x":4, "y":1},
|
||||
{"label":"L15", "x":5, "y":1},
|
||||
{"label":"R10", "x":11, "y":1},
|
||||
{"label":"R11", "x":12, "y":1},
|
||||
{"label":"R12", "x":13, "y":1},
|
||||
{"label":"R13", "x":14, "y":1},
|
||||
{"label":"R14", "x":15, "y":1},
|
||||
{"label":"R15", "x":16, "y":1},
|
||||
{"label":"L20", "x":0, "y":2},
|
||||
{"label":"L21", "x":1, "y":2},
|
||||
{"label":"L22", "x":2, "y":2},
|
||||
{"label":"L23", "x":3, "y":2},
|
||||
{"label":"L24", "x":4, "y":2},
|
||||
{"label":"L25", "x":5, "y":2},
|
||||
{"label":"R20", "x":11, "y":2},
|
||||
{"label":"R21", "x":12, "y":2},
|
||||
{"label":"R22", "x":13, "y":2},
|
||||
{"label":"R23", "x":14, "y":2},
|
||||
{"label":"R24", "x":15, "y":2},
|
||||
{"label":"R25", "x":16, "y":2},
|
||||
{"label":"L32", "x":2, "y":3},
|
||||
{"label":"L33", "x":3, "y":3},
|
||||
{"label":"R32", "x":13, "y":3},
|
||||
{"label":"R33", "x":14, "y":3},
|
||||
{"label":"L34", "x":4, "y":4},
|
||||
{"label":"L35", "x":5, "y":4},
|
||||
{"label":"R31", "x":12, "y":4},
|
||||
{"label":"L44", "x":6, "y":5},
|
||||
{"label":"L45", "x":7, "y":5},
|
||||
{"label":"R41", "x":10, "y":5},
|
||||
{"label":"L42", "x":6, "y":6},
|
||||
{"label":"L43", "x":7, "y":6},
|
||||
{"label":"R42", "x":9, "y":6},
|
||||
{"label":"R43", "x":10, "y":6}
|
||||
{"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": [0, 5], "x": 5, "y": 0},
|
||||
|
||||
{"matrix": [5, 0], "x": 11, "y": 0},
|
||||
{"matrix": [5, 1], "x": 12, "y": 0},
|
||||
{"matrix": [5, 2], "x": 13, "y": 0},
|
||||
{"matrix": [5, 3], "x": 14, "y": 0},
|
||||
{"matrix": [5, 4], "x": 15, "y": 0},
|
||||
{"matrix": [5, 5], "x": 16, "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": [1, 5], "x": 5, "y": 1},
|
||||
|
||||
{"matrix": [6, 0], "x": 11, "y": 1},
|
||||
{"matrix": [6, 1], "x": 12, "y": 1},
|
||||
{"matrix": [6, 2], "x": 13, "y": 1},
|
||||
{"matrix": [6, 3], "x": 14, "y": 1},
|
||||
{"matrix": [6, 4], "x": 15, "y": 1},
|
||||
{"matrix": [6, 5], "x": 16, "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": [2, 5], "x": 5, "y": 2},
|
||||
|
||||
{"matrix": [7, 0], "x": 11, "y": 2},
|
||||
{"matrix": [7, 1], "x": 12, "y": 2},
|
||||
{"matrix": [7, 2], "x": 13, "y": 2},
|
||||
{"matrix": [7, 3], "x": 14, "y": 2},
|
||||
{"matrix": [7, 4], "x": 15, "y": 2},
|
||||
{"matrix": [7, 5], "x": 16, "y": 2},
|
||||
|
||||
{"matrix": [3, 2], "x": 2, "y": 3},
|
||||
{"matrix": [3, 3], "x": 3, "y": 3},
|
||||
|
||||
{"matrix": [8, 2], "x": 13, "y": 3},
|
||||
{"matrix": [8, 3], "x": 14, "y": 3},
|
||||
|
||||
{"matrix": [3, 4], "x": 4, "y": 4},
|
||||
{"matrix": [3, 5], "x": 5, "y": 4},
|
||||
|
||||
{"matrix": [8, 1], "x": 12, "y": 4},
|
||||
|
||||
{"matrix": [4, 4], "x": 6, "y": 5},
|
||||
{"matrix": [4, 5], "x": 7, "y": 5},
|
||||
|
||||
{"matrix": [9, 1], "x": 10, "y": 5},
|
||||
|
||||
{"matrix": [4, 2], "x": 6, "y": 6},
|
||||
{"matrix": [4, 3], "x": 7, "y": 6},
|
||||
|
||||
{"matrix": [9, 2], "x": 9, "y": 6},
|
||||
{"matrix": [9, 3], "x": 10, "y": 6}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
@@ -14,7 +14,7 @@
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "5x6_right.h"
|
||||
#include "tractyl_manuform.h"
|
||||
|
||||
#ifdef SWAP_HANDS_ENABLE
|
||||
const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
|
||||
|
@@ -1,49 +0,0 @@
|
||||
/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com>
|
||||
*
|
||||
* 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 "tractyl_manuform.h"
|
||||
|
||||
#define ___ KC_NO
|
||||
|
||||
// clang-format off
|
||||
#define LAYOUT_5x6_right(\
|
||||
L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
|
||||
L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
|
||||
L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
|
||||
L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
|
||||
L42, L43, R42, R43, \
|
||||
L44, L45, R41, \
|
||||
L54, L55, R51, \
|
||||
L52, L53, R52, R53 \
|
||||
) \
|
||||
{ \
|
||||
{ L00, L01, L02, L03, L04, L05 }, \
|
||||
{ L10, L11, L12, L13, L14, L15 }, \
|
||||
{ L20, L21, L22, L23, L24, L25 }, \
|
||||
{ L30, L31, L32, L33, L34, L35 }, \
|
||||
{ ___, ___, L42, L43, L44, L45 }, \
|
||||
{ ___, ___, L52, L53, L54, L55 }, \
|
||||
\
|
||||
{ R00, R01, R02, R03, R04, R05 }, \
|
||||
{ R10, R11, R12, R13, R14, R15 }, \
|
||||
{ R20, R21, R22, R23, R24, R25 }, \
|
||||
{ R30, R31, R32, R33, R34, R35 }, \
|
||||
{ ___, R41, R42, R43, ___, ___ }, \
|
||||
{ ___, R51, R52, R53, ___, ___ } \
|
||||
}
|
||||
// clang-format on
|
@@ -14,7 +14,7 @@
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "5x6_right.h"
|
||||
#include "quantum.h"
|
||||
|
||||
void keyboard_pre_init_sub(void) { setPinInputHigh(A0); }
|
||||
|
||||
|
@@ -12,68 +12,83 @@
|
||||
"layouts": {
|
||||
"LAYOUT_5x6_right": {
|
||||
"layout": [
|
||||
{"label":"L00", "x":0, "y":0},
|
||||
{"label":"L01", "x":1, "y":0},
|
||||
{"label":"L02", "x":2, "y":0},
|
||||
{"label":"L03", "x":3, "y":0},
|
||||
{"label":"L04", "x":4, "y":0},
|
||||
{"label":"L05", "x":5, "y":0},
|
||||
{"label":"R00", "x":11, "y":0},
|
||||
{"label":"R01", "x":12, "y":0},
|
||||
{"label":"R02", "x":13, "y":0},
|
||||
{"label":"R03", "x":14, "y":0},
|
||||
{"label":"R04", "x":15, "y":0},
|
||||
{"label":"R05", "x":16, "y":0},
|
||||
{"label":"L10", "x":0, "y":1},
|
||||
{"label":"L11", "x":1, "y":1},
|
||||
{"label":"L12", "x":2, "y":1},
|
||||
{"label":"L13", "x":3, "y":1},
|
||||
{"label":"L14", "x":4, "y":1},
|
||||
{"label":"L15", "x":5, "y":1},
|
||||
{"label":"R10", "x":11, "y":1},
|
||||
{"label":"R11", "x":12, "y":1},
|
||||
{"label":"R12", "x":13, "y":1},
|
||||
{"label":"R13", "x":14, "y":1},
|
||||
{"label":"R14", "x":15, "y":1},
|
||||
{"label":"R15", "x":16, "y":1},
|
||||
{"label":"L20", "x":0, "y":2},
|
||||
{"label":"L21", "x":1, "y":2},
|
||||
{"label":"L22", "x":2, "y":2},
|
||||
{"label":"L23", "x":3, "y":2},
|
||||
{"label":"L24", "x":4, "y":2},
|
||||
{"label":"L25", "x":5, "y":2},
|
||||
{"label":"R20", "x":11, "y":2},
|
||||
{"label":"R21", "x":12, "y":2},
|
||||
{"label":"R22", "x":13, "y":2},
|
||||
{"label":"R23", "x":14, "y":2},
|
||||
{"label":"R24", "x":15, "y":2},
|
||||
{"label":"R25", "x":16, "y":2},
|
||||
{"label":"L30", "x":0, "y":3},
|
||||
{"label":"L31", "x":1, "y":3},
|
||||
{"label":"L32", "x":2, "y":3},
|
||||
{"label":"L33", "x":3, "y":3},
|
||||
{"label":"L34", "x":4, "y":3},
|
||||
{"label":"L35", "x":5, "y":3},
|
||||
{"label":"R30", "x":11, "y":3},
|
||||
{"label":"R31", "x":12, "y":3},
|
||||
{"label":"R32", "x":13, "y":3},
|
||||
{"label":"R33", "x":14, "y":3},
|
||||
{"label":"R34", "x":15, "y":3},
|
||||
{"label":"R35", "x":16, "y":3},
|
||||
{"label":"L42", "x":2, "y":4},
|
||||
{"label":"L43", "x":3, "y":4},
|
||||
{"label":"R42", "x":13, "y":4},
|
||||
{"label":"R43", "x":14, "y":4},
|
||||
{"label":"L44", "x":4, "y":5},
|
||||
{"label":"L45", "x":5, "y":5},
|
||||
{"label":"R41", "x":12, "y":5},
|
||||
{"label":"L54", "x":6, "y":6},
|
||||
{"label":"L55", "x":7, "y":6},
|
||||
{"label":"R51", "x":10, "y":6},
|
||||
{"label":"L52", "x":6, "y":7},
|
||||
{"label":"L53", "x":7, "y":7},
|
||||
{"label":"R52", "x":9, "y":7},
|
||||
{"label":"R53", "x":10, "y":7}
|
||||
{"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": [0, 5], "x": 5, "y": 0},
|
||||
|
||||
{"matrix": [6, 0], "x": 11, "y": 0},
|
||||
{"matrix": [6, 1], "x": 12, "y": 0},
|
||||
{"matrix": [6, 2], "x": 13, "y": 0},
|
||||
{"matrix": [6, 3], "x": 14, "y": 0},
|
||||
{"matrix": [6, 4], "x": 15, "y": 0},
|
||||
{"matrix": [6, 5], "x": 16, "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": [1, 5], "x": 5, "y": 1},
|
||||
|
||||
{"matrix": [7, 0], "x": 11, "y": 1},
|
||||
{"matrix": [7, 1], "x": 12, "y": 1},
|
||||
{"matrix": [7, 2], "x": 13, "y": 1},
|
||||
{"matrix": [7, 3], "x": 14, "y": 1},
|
||||
{"matrix": [7, 4], "x": 15, "y": 1},
|
||||
{"matrix": [7, 5], "x": 16, "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": [2, 5], "x": 5, "y": 2},
|
||||
|
||||
{"matrix": [8, 0], "x": 11, "y": 2},
|
||||
{"matrix": [8, 1], "x": 12, "y": 2},
|
||||
{"matrix": [8, 2], "x": 13, "y": 2},
|
||||
{"matrix": [8, 3], "x": 14, "y": 2},
|
||||
{"matrix": [8, 4], "x": 15, "y": 2},
|
||||
{"matrix": [8, 5], "x": 16, "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": [3, 5], "x": 5, "y": 3},
|
||||
|
||||
{"matrix": [9, 0], "x": 11, "y": 3},
|
||||
{"matrix": [9, 1], "x": 12, "y": 3},
|
||||
{"matrix": [9, 2], "x": 13, "y": 3},
|
||||
{"matrix": [9, 3], "x": 14, "y": 3},
|
||||
{"matrix": [9, 4], "x": 15, "y": 3},
|
||||
{"matrix": [9, 5], "x": 16, "y": 3},
|
||||
|
||||
{"matrix": [4, 2], "x": 2, "y": 4},
|
||||
{"matrix": [4, 3], "x": 3, "y": 4},
|
||||
|
||||
{"matrix": [10, 2], "x": 13, "y": 4},
|
||||
{"matrix": [10, 3], "x": 14, "y": 4},
|
||||
|
||||
{"matrix": [4, 4], "x": 4, "y": 5},
|
||||
{"matrix": [4, 5], "x": 5, "y": 5},
|
||||
|
||||
{"matrix": [10, 1], "x": 12, "y": 5},
|
||||
|
||||
{"matrix": [5, 4], "x": 6, "y": 6},
|
||||
{"matrix": [5, 5], "x": 7, "y": 6},
|
||||
|
||||
{"matrix": [11, 1], "x": 10, "y": 6},
|
||||
|
||||
{"matrix": [5, 2], "x": 6, "y": 7},
|
||||
{"matrix": [5, 3], "x": 7, "y": 7},
|
||||
|
||||
{"matrix": [11, 2], "x": 9, "y": 7},
|
||||
{"matrix": [11, 3], "x": 10, "y": 7}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
@@ -18,12 +18,6 @@
|
||||
|
||||
#include "quantum.h"
|
||||
|
||||
#if defined(KEYBOARD_handwired_tractyl_manuform_5x6_right)
|
||||
# include "5x6_right.h"
|
||||
#elif defined(KEYBOARD_handwired_tractyl_manuform_4x6_right)
|
||||
# include "4x6_right.h"
|
||||
#endif
|
||||
|
||||
enum charybdis_keycodes {
|
||||
POINTER_DEFAULT_DPI_FORWARD = QK_KB_0,
|
||||
POINTER_DEFAULT_DPI_REVERSE,
|
||||
|
Reference in New Issue
Block a user