Fix "no matrix definition" errors for some boards (#18954)

This commit is contained in:
Ryan
2022-11-05 13:48:00 +11:00
committed by GitHub
parent f82e90bdea
commit 54682f961e
15 changed files with 847 additions and 485 deletions

View File

@@ -9,9 +9,23 @@
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_68_ansi": {
"LAYOUT_ortho_4x3": {
"layout": [
{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}
{"x":0, "y":0},
{"x":1, "y":0},
{"x":2, "y":0},
{"x":0, "y":1},
{"x":1, "y":1},
{"x":2, "y":1},
{"x":0, "y":2},
{"x":1, "y":2},
{"x":2, "y":2},
{"x":0, "y":3},
{"x":1, "y":3},
{"x":2, "y":3}
]
}
}

View File

@@ -16,25 +16,25 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_all( /* Base */
[0] = LAYOUT_ortho_4x3( /* Base */
KC_P7, KC_P8, KC_P9,
KC_P4, KC_P5, KC_P6,
KC_P1, KC_P2, KC_P3,
MO(1), KC_P0, KC_PDOT),
[1] = LAYOUT_all( /* FN */
[1] = LAYOUT_ortho_4x3( /* FN */
RGB_TOG, RGB_MOD, KC_TRNS,
EF_DEC, EF_INC, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_PENT),
[2] = LAYOUT_all( /* Empty for dynamic keymaps */
[2] = LAYOUT_ortho_4x3( /* Empty for dynamic keymaps */
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS),
[3] = LAYOUT_all( /* Empty for dynamic keymaps */
[3] = LAYOUT_ortho_4x3( /* Empty for dynamic keymaps */
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,

View File

@@ -16,25 +16,25 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_all( /* Base */
[0] = LAYOUT_ortho_4x3( /* Base */
KC_P7, KC_P8, KC_P9,
KC_P4, KC_P5, KC_P6,
KC_P1, KC_P2, KC_P3,
MO(1), KC_P0, KC_PDOT),
[1] = LAYOUT_all( /* FN */
[1] = LAYOUT_ortho_4x3( /* FN */
RGB_TOG, RGB_MOD, KC_TRNS,
EF_DEC, EF_INC, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_PENT),
[2] = LAYOUT_all( /* Empty for dynamic keymaps */
[2] = LAYOUT_ortho_4x3( /* Empty for dynamic keymaps */
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS),
[3] = LAYOUT_all( /* Empty for dynamic keymaps */
[3] = LAYOUT_ortho_4x3( /* Empty for dynamic keymaps */
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,

View File

@@ -22,14 +22,14 @@
// This a shortcut to help you visually see your layout.
#define LAYOUT_all( \
#define LAYOUT_ortho_4x3( \
K00, K01, K02, \
K10, K11, K12, \
K20, K21, K22, \
K30, K31, K32 \
) { \
{ K00, K01, K02, }, \
{ K10, K11, K12, }, \
{ K20, K21, K22, }, \
{ K30, K31, K32, } \
{ K00, K01, K02 }, \
{ K10, K11, K12 }, \
{ K20, K21, K22 }, \
{ K30, K31, K32 } \
}