Fix layout macro keys with no matrix position (#20033)

This commit is contained in:
Ryan 2023-03-13 23:02:03 +11:00 • committed by GitHub
commit cf5e9d172d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
43 changed files with 402 additions and 508 deletions

View file

@ -1 +0,0 @@
#include "4x4.h"

View file

@ -1,58 +0,0 @@
#pragma once
#include "quantum.h"
#define ___ KC_NO
// This a shortcut to help you visually see your layout.
// The first section contains all of the arguments
// The second converts the arguments into a two-dimensional array
#define LAYOUT_ortho_4x4( \
K00, K01, K02, K03, \
K10, K11, K12, K13, \
K20, K21, K22, K23, \
K30, K31, K32, K33 \
) \
{ \
{ K00, K01, K02, K03, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___}, \
{ K10, K11, K12, K13, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___}, \
{ K20, K21, K22, K23, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___}, \
{ K30, K31, K32, K33, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___} \
}
#define LAYOUT_ortho_4x8( \
K00, K01, K02, K03, K04, K05, K06, K07, \
K10, K11, K12, K13, K14, K15, K16, K17, \
K20, K21, K22, K23, K24, K25, K26, K27, \
K30, K31, K32, K33, K34, K35, K36, K37\
) \
{ \
{ K00, K01, K02, K03, K04, K05, K06, K07, ___, ___, ___, ___, ___, ___, ___, ___}, \
{ K10, K11, K12, K13, K14, K15, K16, K17, ___, ___, ___, ___, ___, ___, ___, ___}, \
{ K20, K21, K22, K23, K24, K25, K26, K27, ___, ___, ___, ___, ___, ___, ___, ___}, \
{ K30, K31, K32, K33, K34, K35, K35, K37, ___, ___, ___, ___, ___, ___, ___, ___} \
}
#define LAYOUT_ortho_4x12( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, \
K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b \
) \
{ \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, ___, ___, ___, ___}, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, ___, ___, ___, ___}, \
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, ___, ___, ___, ___}, \
{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, ___, ___, ___, ___} \
}
#define LAYOUT_ortho_4x16( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d, K0e, K0f, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, K1d, K1e, K1f, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, K2e, K2f, \
K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e, K3f \
) \
{ \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d, K0e, K0f }, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, K1d, K1e, K1f }, \
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, K2e, K2f }, \
{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e, K3f } \
}

View file

@ -19,190 +19,190 @@
"layouts": {
"LAYOUT_ortho_4x4": {
"layout": [
{"x":0, "y":0},
{"x":1, "y":0},
{"x":2, "y":0},
{"x":3, "y":0},
{"x":0, "y":0, "matrix": [0, 0]},
{"x":1, "y":0, "matrix": [0, 1]},
{"x":2, "y":0, "matrix": [0, 2]},
{"x":3, "y":0, "matrix": [0, 3]},
{"x":0, "y":1},
{"x":1, "y":1},
{"x":2, "y":1},
{"x":3, "y":1},
{"x":0, "y":1, "matrix": [1, 0]},
{"x":1, "y":1, "matrix": [1, 1]},
{"x":2, "y":1, "matrix": [1, 2]},
{"x":3, "y":1, "matrix": [1, 3]},
{"x":0, "y":2},
{"x":1, "y":2},
{"x":2, "y":2},
{"x":3, "y":2},
{"x":0, "y":2, "matrix": [2, 0]},
{"x":1, "y":2, "matrix": [2, 1]},
{"x":2, "y":2, "matrix": [2, 2]},
{"x":3, "y":2, "matrix": [2, 3]},
{"x":0, "y":3},
{"x":1, "y":3},
{"x":2, "y":3},
{"x":3, "y":3}
{"x":0, "y":3, "matrix": [3, 0]},
{"x":1, "y":3, "matrix": [3, 1]},
{"x":2, "y":3, "matrix": [3, 2]},
{"x":3, "y":3, "matrix": [3, 3]}
]
},
"LAYOUT_ortho_4x8": {
"layout": [
{"x":0, "y":0},
{"x":1, "y":0},
{"x":2, "y":0},
{"x":3, "y":0},
{"x":4, "y":0},
{"x":5, "y":0},
{"x":6, "y":0},
{"x":7, "y":0},
{"x":0, "y":0, "matrix": [0, 0]},
{"x":1, "y":0, "matrix": [0, 1]},
{"x":2, "y":0, "matrix": [0, 2]},
{"x":3, "y":0, "matrix": [0, 3]},
{"x":4, "y":0, "matrix": [0, 4]},
{"x":5, "y":0, "matrix": [0, 5]},
{"x":6, "y":0, "matrix": [0, 6]},
{"x":7, "y":0, "matrix": [0, 7]},
{"x":0, "y":1},
{"x":1, "y":1},
{"x":2, "y":1},
{"x":3, "y":1},
{"x":4, "y":1},
{"x":5, "y":1},
{"x":6, "y":1},
{"x":7, "y":1},
{"x":0, "y":1, "matrix": [1, 0]},
{"x":1, "y":1, "matrix": [1, 1]},
{"x":2, "y":1, "matrix": [1, 2]},
{"x":3, "y":1, "matrix": [1, 3]},
{"x":4, "y":1, "matrix": [1, 4]},
{"x":5, "y":1, "matrix": [1, 5]},
{"x":6, "y":1, "matrix": [1, 6]},
{"x":7, "y":1, "matrix": [1, 7]},
{"x":0, "y":2},
{"x":1, "y":2},
{"x":2, "y":2},
{"x":3, "y":2},
{"x":4, "y":2},
{"x":5, "y":2},
{"x":6, "y":2},
{"x":7, "y":2},
{"x":0, "y":2, "matrix": [2, 0]},
{"x":1, "y":2, "matrix": [2, 1]},
{"x":2, "y":2, "matrix": [2, 2]},
{"x":3, "y":2, "matrix": [2, 3]},
{"x":4, "y":2, "matrix": [2, 4]},
{"x":5, "y":2, "matrix": [2, 5]},
{"x":6, "y":2, "matrix": [2, 6]},
{"x":7, "y":2, "matrix": [2, 7]},
{"x":0, "y":3},
{"x":1, "y":3},
{"x":2, "y":3},
{"x":3, "y":3},
{"x":4, "y":3},
{"x":5, "y":3},
{"x":6, "y":3},
{"x":7, "y":3}
{"x":0, "y":3, "matrix": [3, 0]},
{"x":1, "y":3, "matrix": [3, 1]},
{"x":2, "y":3, "matrix": [3, 2]},
{"x":3, "y":3, "matrix": [3, 3]},
{"x":4, "y":3, "matrix": [3, 4]},
{"x":5, "y":3, "matrix": [3, 5]},
{"x":6, "y":3, "matrix": [3, 6]},
{"x":7, "y":3, "matrix": [3, 7]}
]
},
"LAYOUT_ortho_4x12": {
"layout": [
{"x":0, "y":0},
{"x":1, "y":0},
{"x":2, "y":0},
{"x":3, "y":0},
{"x":4, "y":0},
{"x":5, "y":0},
{"x":6, "y":0},
{"x":7, "y":0},
{"x":8, "y":0},
{"x":9, "y":0},
{"x":10, "y":0},
{"x":11, "y":0},
{"x":0, "y":0, "matrix": [0, 0]},
{"x":1, "y":0, "matrix": [0, 1]},
{"x":2, "y":0, "matrix": [0, 2]},
{"x":3, "y":0, "matrix": [0, 3]},
{"x":4, "y":0, "matrix": [0, 4]},
{"x":5, "y":0, "matrix": [0, 5]},
{"x":6, "y":0, "matrix": [0, 6]},
{"x":7, "y":0, "matrix": [0, 7]},
{"x":8, "y":0, "matrix": [0, 8]},
{"x":9, "y":0, "matrix": [0, 9]},
{"x":10, "y":0, "matrix": [0, 10]},
{"x":11, "y":0, "matrix": [0, 11]},
{"x":0, "y":1},
{"x":1, "y":1},
{"x":2, "y":1},
{"x":3, "y":1},
{"x":4, "y":1},
{"x":5, "y":1},
{"x":6, "y":1},
{"x":7, "y":1},
{"x":8, "y":1},
{"x":9, "y":1},
{"x":10, "y":1},
{"x":11, "y":1},
{"x":0, "y":1, "matrix": [1, 0]},
{"x":1, "y":1, "matrix": [1, 1]},
{"x":2, "y":1, "matrix": [1, 2]},
{"x":3, "y":1, "matrix": [1, 3]},
{"x":4, "y":1, "matrix": [1, 4]},
{"x":5, "y":1, "matrix": [1, 5]},
{"x":6, "y":1, "matrix": [1, 6]},
{"x":7, "y":1, "matrix": [1, 7]},
{"x":8, "y":1, "matrix": [1, 8]},
{"x":9, "y":1, "matrix": [1, 9]},
{"x":10, "y":1, "matrix": [1, 10]},
{"x":11, "y":1, "matrix": [1, 11]},
{"x":0, "y":2},
{"x":1, "y":2},
{"x":2, "y":2},
{"x":3, "y":2},
{"x":4, "y":2},
{"x":5, "y":2},
{"x":6, "y":2},
{"x":7, "y":2},
{"x":8, "y":2},
{"x":9, "y":2},
{"x":10, "y":2},
{"x":11, "y":2},
{"x":0, "y":2, "matrix": [2, 0]},
{"x":1, "y":2, "matrix": [2, 1]},
{"x":2, "y":2, "matrix": [2, 2]},
{"x":3, "y":2, "matrix": [2, 3]},
{"x":4, "y":2, "matrix": [2, 4]},
{"x":5, "y":2, "matrix": [2, 5]},
{"x":6, "y":2, "matrix": [2, 6]},
{"x":7, "y":2, "matrix": [2, 7]},
{"x":8, "y":2, "matrix": [2, 8]},
{"x":9, "y":2, "matrix": [2, 9]},
{"x":10, "y":2, "matrix": [2, 10]},
{"x":11, "y":2, "matrix": [2, 11]},
{"x":0, "y":3},
{"x":1, "y":3},
{"x":2, "y":3},
{"x":3, "y":3},
{"x":4, "y":3},
{"x":5, "y":3},
{"x":6, "y":3},
{"x":7, "y":3},
{"x":8, "y":3},
{"x":9, "y":3},
{"x":10, "y":3},
{"x":11, "y":3}
{"x":0, "y":3, "matrix": [3, 0]},
{"x":1, "y":3, "matrix": [3, 1]},
{"x":2, "y":3, "matrix": [3, 2]},
{"x":3, "y":3, "matrix": [3, 3]},
{"x":4, "y":3, "matrix": [3, 4]},
{"x":5, "y":3, "matrix": [3, 5]},
{"x":6, "y":3, "matrix": [3, 6]},
{"x":7, "y":3, "matrix": [3, 7]},
{"x":8, "y":3, "matrix": [3, 8]},
{"x":9, "y":3, "matrix": [3, 9]},
{"x":10, "y":3, "matrix": [3, 10]},
{"x":11, "y":3, "matrix": [3, 11]}
]
},
"LAYOUT_ortho_4x16": {
"layout": [
{"x":0, "y":0},
{"x":1, "y":0},
{"x":2, "y":0},
{"x":3, "y":0},
{"x":4, "y":0},
{"x":5, "y":0},
{"x":6, "y":0},
{"x":7, "y":0},
{"x":8, "y":0},
{"x":9, "y":0},
{"x":10, "y":0},
{"x":11, "y":0},
{"x":12, "y":0},
{"x":13, "y":0},
{"x":14, "y":0},
{"x":15, "y":0},
{"x":0, "y":0, "matrix": [0, 0]},
{"x":1, "y":0, "matrix": [0, 1]},
{"x":2, "y":0, "matrix": [0, 2]},
{"x":3, "y":0, "matrix": [0, 3]},
{"x":4, "y":0, "matrix": [0, 4]},
{"x":5, "y":0, "matrix": [0, 5]},
{"x":6, "y":0, "matrix": [0, 6]},
{"x":7, "y":0, "matrix": [0, 7]},
{"x":8, "y":0, "matrix": [0, 8]},
{"x":9, "y":0, "matrix": [0, 9]},
{"x":10, "y":0, "matrix": [0, 10]},
{"x":11, "y":0, "matrix": [0, 11]},
{"x":12, "y":0, "matrix": [0, 12]},
{"x":13, "y":0, "matrix": [0, 13]},
{"x":14, "y":0, "matrix": [0, 14]},
{"x":15, "y":0, "matrix": [0, 15]},
{"x":0, "y":1},
{"x":1, "y":1},
{"x":2, "y":1},
{"x":3, "y":1},
{"x":4, "y":1},
{"x":5, "y":1},
{"x":6, "y":1},
{"x":7, "y":1},
{"x":8, "y":1},
{"x":9, "y":1},
{"x":10, "y":1},
{"x":11, "y":1},
{"x":12, "y":1},
{"x":13, "y":1},
{"x":14, "y":1},
{"x":15, "y":1},
{"x":0, "y":1, "matrix": [1, 0]},
{"x":1, "y":1, "matrix": [1, 1]},
{"x":2, "y":1, "matrix": [1, 2]},
{"x":3, "y":1, "matrix": [1, 3]},
{"x":4, "y":1, "matrix": [1, 4]},
{"x":5, "y":1, "matrix": [1, 5]},
{"x":6, "y":1, "matrix": [1, 6]},
{"x":7, "y":1, "matrix": [1, 7]},
{"x":8, "y":1, "matrix": [1, 8]},
{"x":9, "y":1, "matrix": [1, 9]},
{"x":10, "y":1, "matrix": [1, 10]},
{"x":11, "y":1, "matrix": [1, 11]},
{"x":12, "y":1, "matrix": [1, 12]},
{"x":13, "y":1, "matrix": [1, 13]},
{"x":14, "y":1, "matrix": [1, 14]},
{"x":15, "y":1, "matrix": [1, 15]},
{"x":0, "y":2},
{"x":1, "y":2},
{"x":2, "y":2},
{"x":3, "y":2},
{"x":4, "y":2},
{"x":5, "y":2},
{"x":6, "y":2},
{"x":7, "y":2},
{"x":8, "y":2},
{"x":9, "y":2},
{"x":10, "y":2},
{"x":11, "y":2},
{"x":12, "y":2},
{"x":13, "y":2},
{"x":14, "y":2},
{"x":15, "y":2},
{"x":0, "y":2, "matrix": [2, 0]},
{"x":1, "y":2, "matrix": [2, 1]},
{"x":2, "y":2, "matrix": [2, 2]},
{"x":3, "y":2, "matrix": [2, 3]},
{"x":4, "y":2, "matrix": [2, 4]},
{"x":5, "y":2, "matrix": [2, 5]},
{"x":6, "y":2, "matrix": [2, 6]},
{"x":7, "y":2, "matrix": [2, 7]},
{"x":8, "y":2, "matrix": [2, 8]},
{"x":9, "y":2, "matrix": [2, 9]},
{"x":10, "y":2, "matrix": [2, 10]},
{"x":11, "y":2, "matrix": [2, 11]},
{"x":12, "y":2, "matrix": [2, 12]},
{"x":13, "y":2, "matrix": [2, 13]},
{"x":14, "y":2, "matrix": [2, 14]},
{"x":15, "y":2, "matrix": [2, 15]},
{"x":0, "y":3},
{"x":1, "y":3},
{"x":2, "y":3},
{"x":3, "y":3},
{"x":4, "y":3},
{"x":5, "y":3},
{"x":6, "y":3},
{"x":7, "y":3},
{"x":8, "y":3},
{"x":9, "y":3},
{"x":10, "y":3},
{"x":11, "y":3},
{"x":12, "y":3},
{"x":13, "y":3},
{"x":14, "y":3},
{"x":15, "y":3}
{"x":0, "y":3, "matrix": [3, 0]},
{"x":1, "y":3, "matrix": [3, 1]},
{"x":2, "y":3, "matrix": [3, 2]},
{"x":3, "y":3, "matrix": [3, 3]},
{"x":4, "y":3, "matrix": [3, 4]},
{"x":5, "y":3, "matrix": [3, 5]},
{"x":6, "y":3, "matrix": [3, 6]},
{"x":7, "y":3, "matrix": [3, 7]},
{"x":8, "y":3, "matrix": [3, 8]},
{"x":9, "y":3, "matrix": [3, 9]},
{"x":10, "y":3, "matrix": [3, 10]},
{"x":11, "y":3, "matrix": [3, 11]},
{"x":12, "y":3, "matrix": [3, 12]},
{"x":13, "y":3, "matrix": [3, 13]},
{"x":14, "y":3, "matrix": [3, 14]},
{"x":15, "y":3, "matrix": [3, 15]}
]
}
}

View file

@ -38,7 +38,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
{ K070, K071, K072, K073, K074, K075, K076, ____, ____ }, \
{ K080, K081, K082, K083, K084, K085, K086, K087, ____ }, \
{ K090, K091, K092, K093, K094, K095, K096, K097, ____ }, \
{ K100, K101, ____, ____, ____, ____, K106, K107, K108 }, \
{ K100, K101, ____, ____, ____, K105, K106, K107, K108 }, \
{ K110, ____, ____, K113, ____, K115, K116, K117, ____ } \
}

View file

@ -90,8 +90,8 @@ ANSI Layout :
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
{ K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
{ K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX, K3E }, \
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX, K3E }, \
{ K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, XXX, K4B, K4C, K4D, XXX }, \
{ K50, K51, K52, XXX, XXX, K55, XXX, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E } \
}

View file

@ -71,5 +71,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* 4 */ { KC_NO, KC_NO, KC4, KC_NO, KE4, KF4, KG4, KH4, KI4, KJ4, KK4, KL4, KM4, KC_NO, KO4, KP4, KQ4, KR4 },\
/* 5 */ { KC_NO, KC_NO, KC5, KC_NO, KE5, KF5, KG5, KH5, KI5, KJ5, KK5, KL5, KM5, KN5, KO5, KP5, KC_NO, KC_NO },\
/* 6 */ { KC_NO, KC_NO, KC6, KC_NO, KC_NO, KF6, KG6, KC_NO, KI6, KJ6, KK6, KL6, KC_NO, KN6, KO6, KC_NO, KQ6, KC_NO },\
/* 7 */ { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KF7, KG7, KH7, KI7, KJ7, KK7, KL7, KK7, KL7, KO7, KP7, KC_NO, KC_NO } \
/* 7 */ { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KF7, KG7, KH7, KI7, KJ7, KK7, KL7, KM7, KN7, KO7, KP7, KC_NO, KC_NO } \
}

View file

@ -52,7 +52,7 @@
k30, k31, k32, k36, k39, k3B, k3C \
) { \
{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, kOC }, \
{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k2C }, \
{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k3C }, \
{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C }, \
{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C }, \
{ k30, k31, k32, XXX, XXX, XXX, k36, XXX, XXX, k39, XXX, k3B, k3C } \
}

View file

@ -47,7 +47,7 @@
{ k30, k31, k32, k33, k34, k35 }, \
{ k40, k41, k42, k43, k44, k45 }, \
{ k50, k51, k52, k53, k54, k55 }, \
{ k60, k61, k62, XXX, k64, k65 }, \
{ k60, k61, k62, k63, k64, k65 }, \
{ k70, k71, XXX, k73, k74, k75 } \
}
#define LAYOUT_2x225u( \

View file

@ -31,7 +31,7 @@
{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX, k1E, k1F }, \
{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, XXX, k2E, k2F }, \
{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, XXX, k3C, XXX, k3E, k3F }, \
{ k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4A, XXX, XXX, k4D, k4E, k4F } \
{ k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4A, XXX, k4C, k4D, k4E, k4F } \
}
#define LAYOUT_65_ansi_blocker( \

View file

@ -21,16 +21,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define ___ KC_NO
#define LAYOUT( \
k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, \
k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, \
k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, k36, k37, k38, \
k39, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52, \
k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66 \
) \
{ \
{ k01, k01, k03, k04, k05, k06, ___, ___, k07, k08, k09, k10, k11, k12 }, \
{ k13, k15, k15, k16, k17, k18, k19, ___, k20, k21, k22, k23, k24, k25 }, \
{ k26, k28, k28, k29, k30, k31, ___, k32, k33, k34, k35, k36, k37, k38 }, \
{ k39, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52 }, \
{ k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66 } \
k00, k01, k02, k03, k04, k05, k08, k09, k0A, k0B, k0C, k0D, \
k10, k11, k12, k13, k14, k15, k16, k18, k19, k1A, k1B, k1C, k1D, \
k20, k21, k22, k23, k24, k25, k27, k28, k29, k2A, k2B, k2C, k2D, \
k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, \
k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D \
) { \
{ k00, k01, k02, k03, k04, k05, ___, ___, k08, k09, k0A, k0B, k0C, k0D }, \
{ k10, k11, k12, k13, k14, k15, k16, ___, k18, k19, k1A, k1B, k1C, k1D }, \
{ k20, k21, k22, k23, k24, k25, ___, k27, k28, k29, k2A, k2B, k2C, k2D }, \
{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \
{ k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D } \
}

View file

@ -24,7 +24,7 @@
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2G, K2H, K2I, \
K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3G, K3H, K3I, \
K40, K41, K42, k43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4E, K4F, K4G, K4H, \
K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4E, K4F, K4G, K4H, \
K50, K51, K52, K53, K54, K5A, K5C, K5E, K5F, K5G, K5H, K5I \
) { \
{ K00, K01, K02, XXX, K04, K05, K06, K07, XXX, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, XXX, K0I, K0J }, \

View file

@ -129,7 +129,7 @@
{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, KC_NO, K015 }, \
{ K100, KC_NO, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115 }, \
{ K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO, K214, K215 }, \
{ K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314, K315 }, \
{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314, K315 }, \
{ K400, K401, KC_NO, K403, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, K411, KC_NO, K413, K414, K415 } \
}

View file

@ -103,11 +103,11 @@
k40, k41, k42, k44, k45, k46, k48, k49, k4b, k4c, k4d\
) \
{ \
{k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d},\
{k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d},\
{k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d},\
{KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d},\
{k40, k41, k42, k43, KC_NO, k45, KC_NO, KC_NO, k48, k49, KC_NO, k4b, k4c, k4d},\
{k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d},\
{k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d},\
{k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d},\
{KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d},\
{k40, k41, k42, k43, k44, k45, k46, KC_NO, k48, k49, KC_NO, k4b, k4c, k4d},\
}
#define LAYOUT_bd5( \
k43, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k2d,\

View file

@ -25,7 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
K40, K41, K42, K45, K49, K4A, K4B, K4D, K4E, K4F, K4G \
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K21, K1D, K1E, K1F, K1G }, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO, KC_NO, KC_NO }, \
{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, KC_NO, K3C, K3D, KC_NO, K3F, KC_NO }, \
{ K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, K4A, K4B, KC_NO, K4D, K4E, K4F, K4G } \

View file

@ -34,11 +34,11 @@
k40, k4D, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4E, k4C, \
k50, k51, k52, k54, k58, k59, k5A, k5B, k5E, k5C, k57 \
) { \
{ k00, KC_NO, k02, k03, k04, k05, KC_NO, k07, k08, k09, k0A, k0B, k0C, KC_NO, k0E }, \
{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, KC_NO, k2E }, \
{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, KC_NO, k3E }, \
{ k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E }, \
{ k50, k51, k52, KC_NO, k54, KC_NO, KC_NO, k57, k58, k59, k5A, k5B, k5C, KC_NO, k5E }, \
{ KC_NO, k61, k62, KC_NO, k64, k65, k66, k67, k68, KC_NO, KC_NO, KC_NO, k6C, KC_NO, k6E } \
{ k00, k01, k02, k03, k04, k05, KC_NO, k07, k08, k09, k0A, k0B, k0C, KC_NO, k0E }, \
{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, KC_NO, k2E }, \
{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, KC_NO, k3E }, \
{ k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E }, \
{ k50, k51, k52, KC_NO, k54, KC_NO, KC_NO, k57, k58, k59, k5A, k5B, k5C, KC_NO, k5E }, \
{ KC_NO, k61, k62, KC_NO, k64, k65, k66, k67, k68, KC_NO, KC_NO, KC_NO, k6C, KC_NO, k6E } \
}

View file

@ -47,7 +47,7 @@
k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k314, k315, \
k400, k402, k406, k411, k413, k414, k415 \
) { \
{ k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, KC_NO, k014 k015 }, \
{ k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, KC_NO, k014, k015 }, \
{ k100, KC_NO, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k115 }, \
{ k200, KC_NO, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, KC_NO, k215 }, \
{ k300, KC_NO, KC_NO, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k314, k315 }, \

View file

@ -13,6 +13,6 @@
{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c }, \
{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c }, \
{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c }, \
{ k30, k31, k32, k33, k34, k35, k35, k37, k38, k39, k3a, k3b, k3c }, \
{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c }, \
{ k40, k41, k42, k43, k44, k45, KC_NO, k47, k48, k49, k4a, k4b, k4c } \
}

View file

@ -49,7 +49,7 @@
{L20, L21, L22, L23, L24, L25, XXX, XXX}, \
{L30, L31, L32, L33, L34, L35, L36, XXX}, \
{L40, L41, L42, L43, L44, XXX, XXX, XXX}, \
{R07, XXX, R05, R04, R03, R02, R01, R00}, \
{R07, R06, R05, R04, R03, R02, R01, R00}, \
{R17, R16, R15, R14, R13, R12, R11, R10}, \
{R27, R26, R25, R24, R23, R22, R21, XXX}, \
{R37, R36, R35, R34, R33, R32, R31, XXX}, \

View file

@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
) \
{ \
{ K00, K01, K02, K03, K04, K05, K06, K07 }, \
{ K10, K11, K12, K13, K14, K15, K16, XXX }, \
{ K10, K11, K12, K13, K14, K15, K16, K17 }, \
{ K20, K21, K22, K23, K24, K25, K26, K27 }, \
{ K30, K31, K32, K33, K34, K35, K36, XXX }, \
{ K40, K41, K42, K43, K44, K45, K46, K47 }, \

View file

@ -134,7 +134,7 @@ void ergodox_blink_all_leds(void);
{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \
{ k20, k21, k22, k23, k24, k25, KC_NO, KC_NO, k28, k29, k2A, k2B, k2C, k2D }, \
{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \
{ k40, k41, k42, k43, k44, k45, k45, k47, k48, k49, k4A, k4B, k4C, k4D }, \
{ k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D }, \
{ KC_NO, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, KC_NO } \
}

Some files were not shown because too many files have changed in this diff Show more