1
0
Fork 0

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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
589 changed files with 19002 additions and 25368 deletions

View file

@ -24,180 +24,180 @@
"layouts": {
"LAYOUT_ortho_2x2u": {
"layout": [
{"x": 12.5, "y": 0},
{"matrix": [7, 6], "x": 12.5, "y": 0},
{"x": 0, "y": 1, "w": 1.5},
{"x": 1.5, "y": 1},
{"x": 2.5, "y": 1},
{"x": 3.5, "y": 1},
{"x": 4.5, "y": 1},
{"x": 5.5, "y": 1},
{"x": 6.5, "y": 1},
{"x": 7.5, "y": 1},
{"x": 8.5, "y": 1},
{"x": 9.5, "y": 1},
{"x": 10.5, "y": 1},
{"x": 11.5, "y": 1},
{"x": 12.5, "y": 1},
{"x": 13.5, "y": 1, "w": 1.5},
{"matrix": [0, 0], "x": 0, "y": 1, "w": 1.5},
{"matrix": [0, 1], "x": 1.5, "y": 1},
{"matrix": [0, 2], "x": 2.5, "y": 1},
{"matrix": [0, 3], "x": 3.5, "y": 1},
{"matrix": [0, 4], "x": 4.5, "y": 1},
{"matrix": [0, 5], "x": 5.5, "y": 1},
{"matrix": [0, 6], "x": 6.5, "y": 1},
{"matrix": [4, 0], "x": 7.5, "y": 1},
{"matrix": [4, 1], "x": 8.5, "y": 1},
{"matrix": [4, 2], "x": 9.5, "y": 1},
{"matrix": [4, 3], "x": 10.5, "y": 1},
{"matrix": [4, 4], "x": 11.5, "y": 1},
{"matrix": [4, 5], "x": 12.5, "y": 1},
{"matrix": [4, 6], "x": 13.5, "y": 1, "w": 1.5},
{"x": 0, "y": 2, "w": 1.5},
{"x": 1.5, "y": 2},
{"x": 2.5, "y": 2},
{"x": 3.5, "y": 2},
{"x": 4.5, "y": 2},
{"x": 5.5, "y": 2},
{"x": 6.5, "y": 2},
{"x": 7.5, "y": 2},
{"x": 8.5, "y": 2},
{"x": 9.5, "y": 2},
{"x": 10.5, "y": 2},
{"x": 11.5, "y": 2},
{"x": 12.5, "y": 2},
{"x": 13.5, "y": 2, "w": 1.5},
{"matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
{"matrix": [1, 1], "x": 1.5, "y": 2},
{"matrix": [1, 2], "x": 2.5, "y": 2},
{"matrix": [1, 3], "x": 3.5, "y": 2},
{"matrix": [1, 4], "x": 4.5, "y": 2},
{"matrix": [1, 5], "x": 5.5, "y": 2},
{"matrix": [1, 6], "x": 6.5, "y": 2},
{"matrix": [5, 0], "x": 7.5, "y": 2},
{"matrix": [5, 1], "x": 8.5, "y": 2},
{"matrix": [5, 2], "x": 9.5, "y": 2},
{"matrix": [5, 3], "x": 10.5, "y": 2},
{"matrix": [5, 4], "x": 11.5, "y": 2},
{"matrix": [5, 5], "x": 12.5, "y": 2},
{"matrix": [5, 6], "x": 13.5, "y": 2, "w": 1.5},
{"x": 0, "y": 3, "w": 1.5},
{"x": 1.5, "y": 3},
{"x": 2.5, "y": 3},
{"x": 3.5, "y": 3},
{"x": 4.5, "y": 3},
{"x": 5.5, "y": 3},
{"x": 6.5, "y": 3},
{"x": 7.5, "y": 3},
{"x": 8.5, "y": 3},
{"x": 9.5, "y": 3},
{"x": 10.5, "y": 3},
{"x": 11.5, "y": 3},
{"x": 12.5, "y": 3},
{"x": 13.5, "y": 3, "w": 1.5},
{"matrix": [2, 0], "x": 0, "y": 3, "w": 1.5},
{"matrix": [2, 1], "x": 1.5, "y": 3},
{"matrix": [2, 2], "x": 2.5, "y": 3},
{"matrix": [2, 3], "x": 3.5, "y": 3},
{"matrix": [2, 4], "x": 4.5, "y": 3},
{"matrix": [2, 5], "x": 5.5, "y": 3},
{"matrix": [2, 6], "x": 6.5, "y": 3},
{"matrix": [6, 0], "x": 7.5, "y": 3},
{"matrix": [6, 1], "x": 8.5, "y": 3},
{"matrix": [6, 2], "x": 9.5, "y": 3},
{"matrix": [6, 3], "x": 10.5, "y": 3},
{"matrix": [6, 4], "x": 11.5, "y": 3},
{"matrix": [6, 5], "x": 12.5, "y": 3},
{"matrix": [6, 6], "x": 13.5, "y": 3, "w": 1.5},
{"x": 1.5, "y": 4},
{"x": 2.5, "y": 4},
{"x": 3.5, "y": 4},
{"x": 4.5, "y": 4},
{"x": 5.5, "y": 4, "w": 2},
{"x": 7.5, "y": 4, "w": 2},
{"x": 9.5, "y": 4},
{"x": 10.5, "y": 4},
{"x": 11.5, "y": 4},
{"x": 12.5, "y": 4}
{"matrix": [3, 1], "x": 1.5, "y": 4},
{"matrix": [3, 2], "x": 2.5, "y": 4},
{"matrix": [3, 3], "x": 3.5, "y": 4},
{"matrix": [3, 4], "x": 4.5, "y": 4},
{"matrix": [3, 6], "x": 5.5, "y": 4, "w": 2},
{"matrix": [7, 0], "x": 7.5, "y": 4, "w": 2},
{"matrix": [7, 2], "x": 9.5, "y": 4},
{"matrix": [7, 3], "x": 10.5, "y": 4},
{"matrix": [7, 4], "x": 11.5, "y": 4},
{"matrix": [7, 5], "x": 12.5, "y": 4}
]
},
"LAYOUT_ergo_2x2u": {
"layout": [
{"x": 12.5, "y": 0},
{"matrix": [7, 6], "x": 12.5, "y": 0},
{"x": 0, "y": 1, "w": 1.5},
{"x": 1.5, "y": 1},
{"x": 2.5, "y": 1},
{"x": 3.5, "y": 1},
{"x": 4.5, "y": 1},
{"x": 5.5, "y": 1},
{"x": 6.5, "y": 1, "h": 1.5},
{"x": 7.5, "y": 1, "h": 1.5},
{"x": 8.5, "y": 1},
{"x": 9.5, "y": 1},
{"x": 10.5, "y": 1},
{"x": 11.5, "y": 1},
{"x": 12.5, "y": 1},
{"x": 13.5, "y": 1, "w": 1.5},
{"matrix": [0, 0], "x": 0, "y": 1, "w": 1.5},
{"matrix": [0, 1], "x": 1.5, "y": 1},
{"matrix": [0, 2], "x": 2.5, "y": 1},
{"matrix": [0, 3], "x": 3.5, "y": 1},
{"matrix": [0, 4], "x": 4.5, "y": 1},
{"matrix": [0, 5], "x": 5.5, "y": 1},
{"matrix": [0, 6], "x": 6.5, "y": 1, "h": 1.5},
{"matrix": [4, 0], "x": 7.5, "y": 1, "h": 1.5},
{"matrix": [4, 1], "x": 8.5, "y": 1},
{"matrix": [4, 2], "x": 9.5, "y": 1},
{"matrix": [4, 3], "x": 10.5, "y": 1},
{"matrix": [4, 4], "x": 11.5, "y": 1},
{"matrix": [4, 5], "x": 12.5, "y": 1},
{"matrix": [4, 6], "x": 13.5, "y": 1, "w": 1.5},
{"x": 0, "y": 2, "w": 1.5},
{"x": 1.5, "y": 2},
{"x": 2.5, "y": 2},
{"x": 3.5, "y": 2},
{"x": 4.5, "y": 2},
{"x": 5.5, "y": 2},
{"x": 6.5, "y": 2.5, "h": 1.5},
{"x": 7.5, "y": 2.5, "h": 1.5},
{"x": 8.5, "y": 2},
{"x": 9.5, "y": 2},
{"x": 10.5, "y": 2},
{"x": 11.5, "y": 2},
{"x": 12.5, "y": 2},
{"x": 13.5, "y": 2, "w": 1.5},
{"matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
{"matrix": [1, 1], "x": 1.5, "y": 2},
{"matrix": [1, 2], "x": 2.5, "y": 2},
{"matrix": [1, 3], "x": 3.5, "y": 2},
{"matrix": [1, 4], "x": 4.5, "y": 2},
{"matrix": [1, 5], "x": 5.5, "y": 2},
{"matrix": [2, 6], "x": 6.5, "y": 2.5, "h": 1.5},
{"matrix": [6, 0], "x": 7.5, "y": 2.5, "h": 1.5},
{"matrix": [5, 1], "x": 8.5, "y": 2},
{"matrix": [5, 2], "x": 9.5, "y": 2},
{"matrix": [5, 3], "x": 10.5, "y": 2},
{"matrix": [5, 4], "x": 11.5, "y": 2},
{"matrix": [5, 5], "x": 12.5, "y": 2},
{"matrix": [5, 6], "x": 13.5, "y": 2, "w": 1.5},
{"x": 0, "y": 3, "w": 1.5},
{"x": 1.5, "y": 3},
{"x": 2.5, "y": 3},
{"x": 3.5, "y": 3},
{"x": 4.5, "y": 3},
{"x": 5.5, "y": 3},
{"x": 8.5, "y": 3},
{"x": 9.5, "y": 3},
{"x": 10.5, "y": 3},
{"x": 11.5, "y": 3},
{"x": 12.5, "y": 3},
{"x": 13.5, "y": 3, "w": 1.5},
{"matrix": [2, 0], "x": 0, "y": 3, "w": 1.5},
{"matrix": [2, 1], "x": 1.5, "y": 3},
{"matrix": [2, 2], "x": 2.5, "y": 3},
{"matrix": [2, 3], "x": 3.5, "y": 3},
{"matrix": [2, 4], "x": 4.5, "y": 3},
{"matrix": [2, 5], "x": 5.5, "y": 3},
{"matrix": [6, 1], "x": 8.5, "y": 3},
{"matrix": [6, 2], "x": 9.5, "y": 3},
{"matrix": [6, 3], "x": 10.5, "y": 3},
{"matrix": [6, 4], "x": 11.5, "y": 3},
{"matrix": [6, 5], "x": 12.5, "y": 3},
{"matrix": [6, 6], "x": 13.5, "y": 3, "w": 1.5},
{"x": 1.5, "y": 4},
{"x": 2.5, "y": 4},
{"x": 3.5, "y": 4},
{"x": 4.5, "y": 4},
{"x": 5.5, "y": 4, "w": 2},
{"x": 7.5, "y": 4, "w": 2},
{"x": 9.5, "y": 4},
{"x": 10.5, "y": 4},
{"x": 11.5, "y": 4},
{"x": 12.5, "y": 4}
{"matrix": [3, 1], "x": 1.5, "y": 4},
{"matrix": [3, 2], "x": 2.5, "y": 4},
{"matrix": [3, 3], "x": 3.5, "y": 4},
{"matrix": [3, 4], "x": 4.5, "y": 4},
{"matrix": [3, 6], "x": 5.5, "y": 4, "w": 2},
{"matrix": [7, 0], "x": 7.5, "y": 4, "w": 2},
{"matrix": [7, 2], "x": 9.5, "y": 4},
{"matrix": [7, 3], "x": 10.5, "y": 4},
{"matrix": [7, 4], "x": 11.5, "y": 4},
{"matrix": [7, 5], "x": 12.5, "y": 4}
]
},
"LAYOUT_ortho_7u": {
"layout": [
{"x": 12.5, "y": 0},
{"matrix": [7, 6], "x": 12.5, "y": 0},
{"x": 0, "y": 1, "w": 1.5},
{"x": 1.5, "y": 1},
{"x": 2.5, "y": 1},
{"x": 3.5, "y": 1},
{"x": 4.5, "y": 1},
{"x": 5.5, "y": 1},
{"x": 6.5, "y": 1},
{"x": 7.5, "y": 1},
{"x": 8.5, "y": 1},
{"x": 9.5, "y": 1},
{"x": 10.5, "y": 1},
{"x": 11.5, "y": 1},
{"x": 12.5, "y": 1},
{"x": 13.5, "y": 1, "w": 1.5},
{"matrix": [0, 0], "x": 0, "y": 1, "w": 1.5},
{"matrix": [0, 1], "x": 1.5, "y": 1},
{"matrix": [0, 2], "x": 2.5, "y": 1},
{"matrix": [0, 3], "x": 3.5, "y": 1},
{"matrix": [0, 4], "x": 4.5, "y": 1},
{"matrix": [0, 5], "x": 5.5, "y": 1},
{"matrix": [0, 6], "x": 6.5, "y": 1},
{"matrix": [4, 0], "x": 7.5, "y": 1},
{"matrix": [4, 1], "x": 8.5, "y": 1},
{"matrix": [4, 2], "x": 9.5, "y": 1},
{"matrix": [4, 3], "x": 10.5, "y": 1},
{"matrix": [4, 4], "x": 11.5, "y": 1},
{"matrix": [4, 5], "x": 12.5, "y": 1},
{"matrix": [4, 6], "x": 13.5, "y": 1, "w": 1.5},
{"x": 0, "y": 2, "w": 1.5},
{"x": 1.5, "y": 2},
{"x": 2.5, "y": 2},
{"x": 3.5, "y": 2},
{"x": 4.5, "y": 2},
{"x": 5.5, "y": 2},
{"x": 6.5, "y": 2},
{"x": 7.5, "y": 2},
{"x": 8.5, "y": 2},
{"x": 9.5, "y": 2},
{"x": 10.5, "y": 2},
{"x": 11.5, "y": 2},
{"x": 12.5, "y": 2, "w": 1.5},
{"x": 14, "y": 2},
{"matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
{"matrix": [1, 1], "x": 1.5, "y": 2},
{"matrix": [1, 2], "x": 2.5, "y": 2},
{"matrix": [1, 3], "x": 3.5, "y": 2},
{"matrix": [1, 4], "x": 4.5, "y": 2},
{"matrix": [1, 5], "x": 5.5, "y": 2},
{"matrix": [1, 6], "x": 6.5, "y": 2},
{"matrix": [5, 0], "x": 7.5, "y": 2},
{"matrix": [5, 1], "x": 8.5, "y": 2},
{"matrix": [5, 2], "x": 9.5, "y": 2},
{"matrix": [5, 3], "x": 10.5, "y": 2},
{"matrix": [5, 4], "x": 11.5, "y": 2},
{"matrix": [5, 5], "x": 12.5, "y": 2, "w": 1.5},
{"matrix": [5, 6], "x": 14, "y": 2},
{"x": 0, "y": 3, "w": 1.5},
{"x": 1.5, "y": 3},
{"x": 2.5, "y": 3},
{"x": 3.5, "y": 3},
{"x": 4.5, "y": 3},
{"x": 5.5, "y": 3},
{"x": 6.5, "y": 3},
{"x": 7.5, "y": 3},
{"x": 8.5, "y": 3},
{"x": 9.5, "y": 3},
{"x": 10.5, "y": 3},
{"x": 11.5, "y": 3, "w": 1.5},
{"x": 13, "y": 3},
{"x": 14, "y": 3},
{"matrix": [2, 0], "x": 0, "y": 3, "w": 1.5},
{"matrix": [2, 1], "x": 1.5, "y": 3},
{"matrix": [2, 2], "x": 2.5, "y": 3},
{"matrix": [2, 3], "x": 3.5, "y": 3},
{"matrix": [2, 4], "x": 4.5, "y": 3},
{"matrix": [2, 5], "x": 5.5, "y": 3},
{"matrix": [2, 6], "x": 6.5, "y": 3},
{"matrix": [6, 0], "x": 7.5, "y": 3},
{"matrix": [6, 1], "x": 8.5, "y": 3},
{"matrix": [6, 2], "x": 9.5, "y": 3},
{"matrix": [6, 3], "x": 10.5, "y": 3},
{"matrix": [6, 4], "x": 11.5, "y": 3, "w": 1.5},
{"matrix": [6, 5], "x": 13, "y": 3},
{"matrix": [6, 6], "x": 14, "y": 3},
{"x": 1.5, "y": 4},
{"x": 2.5, "y": 4, "w": 1.5},
{"x": 4, "y": 4, "w": 7},
{"x": 11, "y": 4, "w": 1.5},
{"x": 12.5, "y": 4}
{"matrix": [3, 1], "x": 1.5, "y": 4},
{"matrix": [3, 2], "x": 2.5, "y": 4, "w": 1.5},
{"matrix": [3, 6], "x": 4, "y": 4, "w": 7},
{"matrix": [7, 4], "x": 11, "y": 4, "w": 1.5},
{"matrix": [7, 5], "x": 12.5, "y": 4}
]
}
}

View file

@ -14,7 +14,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "rhino.h"
#include "quantum.h"
#include QMK_KEYBOARD_H
bool encoder_update_kb(uint8_t index, bool clockwise) {
if (!encoder_update_user(index, clockwise)) { return false; }

View file

@ -1,80 +0,0 @@
/* Copyright 2021 Christian Sandven
*
* 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_ortho_2x2u( \
k70, \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, k31, k32, k33, \
k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52, k53, \
k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 \
) { \
{ k00, k01, k02, k03, k04, k05, k06 }, \
{ k20, k21, k22, k23, k24, k25, k26 }, \
{ k40, k41, k42, k43, k44, k45, k46 }, \
{ KC_NO, k60, k61, k62, k63, KC_NO, k64 }, \
{ k07, k08, k09, k10, k11, k12, k13 }, \
{ k27, k28, k29, k30, k31, k32, k33 }, \
{ k47, k48, k49, k50, k51, k52, k53 }, \
{ k65, KC_NO, k66, k67, k68, k69, k70 } \
}
#define LAYOUT_ergo_2x2u( \
k70, \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, k31, k32, k33, \
k40, k41, k42, k43, k44, k45, k48, k49, k50, k51, k52, k53, \
k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 \
) { \
{ k00, k01, k02, k03, k04, k05, k06 }, \
{ k20, k21, k22, k23, k24, k25, KC_NO }, \
{ k40, k41, k42, k43, k44, k45, k26 }, \
{ KC_NO, k60, k61, k62, k63, KC_NO, k64 }, \
{ k07, k08, k09, k10, k11, k12, k13 }, \
{ KC_NO, k28, k29, k30, k31, k32, k33 }, \
{ k27, k48, k49, k50, k51, k52, k53 }, \
{ k65, KC_NO, k66, k67, k68, k69, k70 } \
}
#define LAYOUT_ortho_7u( \
k65, \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, k31, k32, k33, \
k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52, k53, \
k60, k61, k62, k63, k64 \
) { \
{ k00, k01, k02, k03, k04, k05, k06 }, \
{ k20, k21, k22, k23, k24, k25, k26 }, \
{ k40, k41, k42, k43, k44, k45, k46 }, \
{ KC_NO, k60, k61, KC_NO, KC_NO, KC_NO, k62 }, \
{ k07, k08, k09, k10, k11, k12, k13 }, \
{ k27, k28, k29, k30, k31, k32, k33 }, \
{ k47, k48, k49, k50, k51, k52, k53 }, \
{ KC_NO, KC_NO, KC_NO, KC_NO, k63, k64, k65 } \
}