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

43
keyboards/mechwild/murphpad/info.json
View File

@@ -27,13 +27,42 @@
"layouts": {
"LAYOUT": {
"layout": [
{"label": "k00", "x": 1, "y": 0}, {"label": "k01", "x": 2, "y": 0}, {"label": "k02", "x": 3, "y": 0}, {"label": "k03", "x": 4, "y": 0},
{"label": "k10", "x": 1, "y": 1}, {"label": "k11", "x": 2, "y": 1}, {"label": "k12", "x": 3, "y": 1}, {"label": "k13", "x": 4, "y": 1},
{"label": "k20", "x": 1, "y": 2}, {"label": "k21", "x": 2, "y": 2}, {"label": "k22", "x": 3, "y": 2}, {"label": "k23", "x": 4, "y": 2},
{"label": "k30", "x": 0, "y": 3}, {"label": "k31", "x": 1, "y": 3}, {"label": "k32", "x": 2, "y": 3}, {"label": "k33", "x": 3, "y": 3}, {"label": "k34", "x": 4, "y": 3},
{"label": "k40", "x": 0, "y": 4}, {"label": "k41", "x": 1, "y": 4}, {"label": "k42", "x": 2, "y": 4}, {"label": "k43", "x": 3, "y": 4}, {"label": "k44", "x": 4, "y": 4},
{"label": "k50", "x": 0, "y": 5}, {"label": "k51", "x": 1, "y": 5}, {"label": "k52", "x": 2, "y": 5}, {"label": "k53", "x": 3, "y": 5}, {"label": "k54", "x": 4, "y": 5},
{"label": "BACK00", "x": 1, "y": 6}, {"label": "BACK01", "x": 2, "y": 6}, {"label": "BACK02", "x": 3, "y": 6}
{"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": [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": [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": [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": [4, 0], "x": 0, "y": 4},
{"matrix": [4, 1], "x": 1, "y": 4},
{"matrix": [4, 2], "x": 2, "y": 4},
{"matrix": [4, 3], "x": 3, "y": 4},
{"matrix": [4, 4], "x": 4, "y": 4},
{"matrix": [5, 0], "x": 0, "y": 5},
{"matrix": [5, 1], "x": 1, "y": 5},
{"matrix": [5, 2], "x": 2, "y": 5},
{"matrix": [5, 3], "x": 3, "y": 5},
{"matrix": [5, 4], "x": 4, "y": 5},
{"matrix": [0, 0], "x": 1, "y": 6},
{"matrix": [1, 0], "x": 2, "y": 6},
{"matrix": [2, 0], "x": 3, "y": 6}
]
}
}

2
keyboards/mechwild/murphpad/murphpad.c
View File

@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "murphpad.h"
#include "quantum.h"
#ifdef ENCODER_ENABLE
bool encoder_update_kb(uint8_t index, bool clockwise) {

48
keyboards/mechwild/murphpad/murphpad.h
View File

@@ -1,48 +0,0 @@
/* Copyright 2021 Kyle McCreery
*
* 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 ___ KC_NO
/* 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( \
k00, k01, k02, k03, \
k10, k11, k12, k13, \
k20, k21, k22, k23, \
k30, k31, k32, k33, k34, \
k40, k41, k42, k43, k44, \
k50, k51, k52, k53, k54, \
\
BACK00, BACK01, BACK02 \
\
) { \
{ BACK00, k00, k01, k02, k03 }, \
{ BACK01, k10, k11, k12, k13 }, \
{ BACK02, k20, k21, k22, k23 }, \
{ k30, k31, k32, k33, k34 }, \
{ k40, k41, k42, k43, k44 }, \
{ k50, k51, k52, k53, k54 } \
}

35
keyboards/mechwild/puckbuddy/info.json
View File

@@ -29,21 +29,26 @@
"layouts": {
"LAYOUT": {
"layout": [
{"label":"k00", "x":0, "y":0},
{"label":"k01", "x":1.5, "y":0},
{"label":"k02", "x":2.5, "y":0},
{"label":"k03", "x":3.5, "y":0},
{"label":"k05", "x":5, "y":0},
{"label":"k10", "x":0, "y":1.25},
{"label":"k15", "x":5, "y":1.25},
{"label":"k20", "x":0, "y":2.25},
{"label":"k25", "x":5, "y":2.25},
{"label":"k30", "x":0, "y":3.25},
{"label":"k35", "x":5, "y":3.25},
{"label":"k31", "x":1, "y":4.5},
{"label":"k32", "x":2, "y":4.5},
{"label":"k33", "x":3, "y":4.5},
{"label":"k34", "x":4, "y":4.5}]
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1.5, "y": 0},
{"matrix": [1, 1], "x": 2.5, "y": 0},
{"matrix": [2, 1], "x": 3.5, "y": 0},
{"matrix": [0, 2], "x": 5, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1.25},
{"matrix": [1, 2], "x": 5, "y": 1.25},
{"matrix": [2, 0], "x": 0, "y": 2.25},
{"matrix": [2, 2], "x": 5, "y": 2.25},
{"matrix": [3, 0], "x": 0, "y": 3.25},
{"matrix": [3, 2], "x": 5, "y": 3.25},
{"matrix": [0, 3], "x": 1, "y": 4.5},
{"matrix": [1, 3], "x": 2, "y": 4.5},
{"matrix": [2, 3], "x": 3, "y": 4.5},
{"matrix": [3, 3], "x": 4, "y": 4.5}
]
}
}
}

23
keyboards/mechwild/puckbuddy/puckbuddy.h
View File

@@ -5,29 +5,6 @@
#include "quantum.h"
#define ___ KC_NO
/* 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( \
k00, k01, k02, k03, k05,\
k10, k15,\
k20, k25,\
k30, k35,\
k31, k32, k33, k34 \
) { \
{ k00, k01, k05, k31 }, \
{ k10, k02, k15, k32 }, \
{ k20, k03, k25, k33 }, \
{ k30, ___, k35, k34 } \
}
typedef union {
uint32_t raw;
struct {