sporq/qmk-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move small macropad-ish layouts to data driven (#20341)

Browse Source
This commit is contained in:
Ryan
2023-04-05 15:46:59 +10:00
committed by GitHub
parent 06c5c02804
commit 364c06d939
421 changed files with 2788 additions and 7128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
keyboards/doio/kb16/kb16.c
View File

@@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "kb16.h"
#include "quantum.h"
// OLED animation
#include "./lib/logo.h"

45
keyboards/doio/kb16/kb16.h
View File

@@ -1,45 +0,0 @@
/* Copyright 2022 DOIO
* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
*
* 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 XXX KC_NO
/* ┌───┬───┬───┬───┐ ┌───┐ ┌───┐
* │00 │01 │02 │03 │ │04 │ │14 │
* ├───┼───┼───┼───┤ └───┘ └───┘
* │10 │11 │12 │13 │
* ├───┼───┼───┼───┤
* │20 │21 │22 │23 │ ┌───┐
* ├───┼───┼───┼───┤ │24 │
* │30 │31 │32 │33 │ └───┘
* └───┴───┴───┴───┘
*/
#define LAYOUT( \
K00, K01, K02, K03, K04, \
K10, K11, K12, K13, K14, \
K20, K21, K22, K23, K24, \
K30, K31, K32, K33 \
) { \
{ K00, K01, K02, K03, K04 }, \
{ K10, K11, K12, K13, K14 }, \
{ K20, K21, K22, K23, K24 }, \
{ K30, K31, K32, K33, XXX } \
}

38
keyboards/doio/kb16/rev1/info.json
View File

@@ -25,31 +25,31 @@
"layouts": {
"LAYOUT": {
"layout": [
{"label":"1!", "x":0, "y":0},
{"label":"2@", "x":1, "y":0},
{"label":"3#", "x":2, "y":0},
{"label":"4$", "x":3, "y":0},
{"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},
{"label":"Encoder 1", "x":4.75, "y":0},
{"matrix": [0, 4], "x": 4.75, "y": 0},
{"label":"5%", "x":0, "y":1},
{"label":"6^", "x":1, "y":1},
{"label":"7&", "x":2, "y":1},
{"label":"8*", "x":3, "y":1},
{"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},
{"label":"Encoder 2", "x":6, "y":0},
{"matrix": [1, 4], "x": 6, "y": 0},
{"label":"9(", "x":0, "y":2},
{"label":"0)", "x":1, "y":2},
{"label":"\u2191", "x":2, "y":2},
{"label":"Enter", "x":3, "y":2},
{"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},
{"label":"Encoder 3", "x":5.375, "y":2.5},
{"matrix": [2, 4], "x": 5.375, "y": 2.5},
{"label":"Fn", "x":0, "y":3},
{"label":"\u2190", "x":1, "y":3},
{"label":"\u2193", "x":2, "y":3},
{"label":"\u2192", "x":3, "y":3}
{"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}
]
}
}

38
keyboards/doio/kb16/rev2/info.json
View File

@@ -25,31 +25,31 @@
"layouts": {
"LAYOUT": {
"layout": [
{"label":"1!", "x":0, "y":0},
{"label":"2@", "x":1, "y":0},
{"label":"3#", "x":2, "y":0},
{"label":"4$", "x":3, "y":0},
{"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},
{"label":"Encoder 1", "x":4.75, "y":0},
{"matrix": [0, 4], "x": 4.75, "y": 0},
{"label":"5%", "x":0, "y":1},
{"label":"6^", "x":1, "y":1},
{"label":"7&", "x":2, "y":1},
{"label":"8*", "x":3, "y":1},
{"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},
{"label":"Encoder 2", "x":6, "y":0},
{"matrix": [1, 4], "x": 6, "y": 0},
{"label":"9(", "x":0, "y":2},
{"label":"0)", "x":1, "y":2},
{"label":"\u2191", "x":2, "y":2},
{"label":"Enter", "x":3, "y":2},
{"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},
{"label":"Encoder 3", "x":5.375, "y":2.5},
{"matrix": [2, 4], "x": 5.375, "y": 2.5},
{"label":"Fn", "x":0, "y":3},
{"label":"\u2190", "x":1, "y":3},
{"label":"\u2193", "x":2, "y":3},
{"label":"\u2192", "x":3, "y":3}
{"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}
]
}
}

73
keyboards/doio/kb30/info.json
View File

@@ -25,46 +25,51 @@
"layouts": {
"LAYOUT": {
"layout": [
{"label":"K00", "x":0, "y":0},
{"label":"K01", "x":1, "y":0},
{"label":"K02", "x":2, "y":0},
{"label":"K03", "x":3, "y":0},
{"label":"K04", "x":4.25, "y":0},
{"label":"K05", "x":5.25, "y":0},
{"label":"K06", "x":6.25, "y":0},
{"label":"K10", "x":0, "y":1},
{"label":"K11", "x":1, "y":1},
{"label":"K12", "x":2, "y":1},
{"label":"K13", "x":3, "y":1, "h":2},
{"label":"K14", "x":4.25, "y":1},
{"label":"K15", "x":5.25, "y":1},
{"label":"K16", "x":6.25, "y":1},
{"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},
{"label":"Encoder 1", "x":8.25, "y":2},
{"matrix": [0, 4], "x": 4.25, "y": 0},
{"matrix": [0, 5], "x": 5.25, "y": 0},
{"matrix": [0, 6], "x": 6.25, "y": 0},
{"label":"K20", "x":0, "y":2},
{"label":"K21", "x":1, "y":2},
{"label":"K22", "x":2, "y":2},
{"label":"K23", "x":4.25, "y":2},
{"label":"K24", "x":5.25, "y":2},
{"label":"K25", "x":6.25, "y":2},
{"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, "h": 2},
{"label":"Encoder 2", "x":11, "y":2},
{"matrix": [1, 4], "x": 4.25, "y": 1},
{"matrix": [1, 5], "x": 5.25, "y": 1},
{"matrix": [1, 6], "x": 6.25, "y": 1},
{"label":"K30", "x":0, "y":3},
{"label":"K31", "x":1, "y":3},
{"label":"K32", "x":2, "y":3},
{"label":"K33", "x":4.25, "y":3, "h":2},
{"label":"K35", "x":5.25, "y":3},
{"matrix": [2, 0], "x": 8.25, "y": 2},
{"label":"Encoder 3", "x":9, "y":4},
{"matrix": [2, 1], "x": 0, "y": 2},
{"matrix": [2, 2], "x": 1, "y": 2},
{"matrix": [2, 3], "x": 2, "y": 2},
{"label":"K40", "x":0, "y":4, "w":2},
{"label":"K41", "x":2, "y":4},
{"label":"K42", "x":4.25, "y":4},
{"label":"K43", "x":5.25, "y":4},
{"label":"K44", "x":6.25, "y":4}
{"matrix": [2, 4], "x": 4.25, "y": 2},
{"matrix": [2, 5], "x": 5.25, "y": 2},
{"matrix": [3, 0], "x": 6.25, "y": 2},
{"matrix": [3, 1], "x": 11, "y": 2},
{"matrix": [3, 2], "x": 0, "y": 3},
{"matrix": [3, 3], "x": 1, "y": 3},
{"matrix": [3, 5], "x": 2, "y": 3},
{"matrix": [4, 0], "x": 4.25, "y": 3, "h": 2},
{"matrix": [4, 1], "x": 5.25, "y": 3},
{"matrix": [4, 2], "x": 9, "y": 4},
{"matrix": [4, 3], "x": 0, "y": 4, "w": 2},
{"matrix": [4, 4], "x": 2, "y": 4},
{"matrix": [5, 4], "x": 4.25, "y": 4},
{"matrix": [5, 5], "x": 5.25, "y": 4},
{"matrix": [5, 6], "x": 6.25, "y": 4}
]
}
}

2
keyboards/doio/kb30/kb30.c
View File

@@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "kb30.h"
#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE

45
keyboards/doio/kb30/kb30.h
View File

@@ -1,45 +0,0 @@
/* Copyright 2022 DOIO
* Copyright 2022 DOIO2022 <https://github.com/DOIO2022>
*
* 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 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( \
K00, K01, K02, K03, K04, K05, K06, \
K10, K11, K12, K13, K14, K15, K16, \
K20, K21, K22, K23, K24, K25, \
K30, K31, K32, K33, K35, \
K40, K41, K42, K43, K44, \
K54, K55, K56 \
) { \
{ K00, K01, K02, K03, K04, K05, K06 }, \
{ K10, K11, K12, K13, K14, K15, K16 }, \
{ K20, K21, K22, K23, K24, K25, KC_NO}, \
{ K30, K31, K32, K33, KC_NO, K35, KC_NO}, \
{ K40, K41, K42, K43, K44, KC_NO, KC_NO}, \
{ KC_NO, KC_NO, KC_NO, KC_NO, K54, K55, K56 } \
}