1
0
Fork 0
forked from forks/qmk_firmware

Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2021-07-22 08:11:39 +00:00
commit 62099dc120
3 changed files with 265 additions and 1 deletions

View file

@ -44,7 +44,7 @@
#define DIODE_DIRECTION COL2ROW #define DIODE_DIRECTION COL2ROW
#define BACKLIGHT_PIN B6 #define BACKLIGHT_PIN B7
#define BACKLIGHT_BREATHING #define BACKLIGHT_BREATHING
#define BACKLIGHT_LEVELS 3 #define BACKLIGHT_LEVELS 3

View file

@ -59,6 +59,222 @@
{"label":"K3A (B1,B4)", "x":10, "y":3}, {"label":"K3A (B1,B4)", "x":10, "y":3},
{"label":"K3B (B1,D7)", "x":11, "y":3} {"label":"K3B (B1,D7)", "x":11, "y":3}
] ]
},
"LAYOUT_ortho_4x12_2x2u": {
"layout": [
{"label":"K00 (D0,F1)", "x":0, "y":0},
{"label":"K01 (D0,F0)", "x":1, "y":0},
{"label":"K02 (D0,B0)", "x":2, "y":0},
{"label":"K03 (D0,C7)", "x":3, "y":0},
{"label":"K04 (D0,F4)", "x":4, "y":0},
{"label":"K05 (D0,F5)", "x":5, "y":0},
{"label":"K06 (D0,F6)", "x":6, "y":0},
{"label":"K07 (D0,F7)", "x":7, "y":0},
{"label":"K08 (D0,D4)", "x":8, "y":0},
{"label":"K09 (D0,D6)", "x":9, "y":0},
{"label":"K0A (D0,B4)", "x":10, "y":0},
{"label":"K0B (D0,D7)", "x":11, "y":0},
{"label":"K10 (B3,F1)", "x":0, "y":1},
{"label":"K11 (B3,F0)", "x":1, "y":1},
{"label":"K12 (B3,B0)", "x":2, "y":1},
{"label":"K13 (B3,C7)", "x":3, "y":1},
{"label":"K14 (B3,F4)", "x":4, "y":1},
{"label":"K15 (B3,F5)", "x":5, "y":1},
{"label":"K16 (B3,F6)", "x":6, "y":1},
{"label":"K17 (B3,F7)", "x":7, "y":1},
{"label":"K18 (B3,D4)", "x":8, "y":1},
{"label":"K19 (B3,D6)", "x":9, "y":1},
{"label":"K1A (B3,B4)", "x":10, "y":1},
{"label":"K1B (B3,D7)", "x":11, "y":1},
{"label":"K20 (B2,F1)", "x":0, "y":2},
{"label":"K21 (B2,F0)", "x":1, "y":2},
{"label":"K22 (B2,B0)", "x":2, "y":2},
{"label":"K23 (B2,C7)", "x":3, "y":2},
{"label":"K24 (B2,F4)", "x":4, "y":2},
{"label":"K25 (B2,F5)", "x":5, "y":2},
{"label":"K26 (B2,F6)", "x":6, "y":2},
{"label":"K27 (B2,F7)", "x":7, "y":2},
{"label":"K28 (B2,D4)", "x":8, "y":2},
{"label":"K29 (B2,D6)", "x":9, "y":2},
{"label":"K2A (B2,B4)", "x":10, "y":2},
{"label":"K2B (B2,D7)", "x":11, "y":2},
{"label":"K30 (B1,F1)", "x":0, "y":3},
{"label":"K31 (B1,F0)", "x":1, "y":3},
{"label":"K32 (B1,B0)", "x":2, "y":3},
{"label":"K33 (B1,C7)", "x":3, "y":3},
{"label":"K34 (B1,F4)", "x":4, "y":3, "w":2},
{"label":"K37 (B1,F7)", "x":6, "y":3, "w":2},
{"label":"K38 (B1,D4)", "x":8, "y":3},
{"label":"K39 (B1,D6)", "x":9, "y":3},
{"label":"K3A (B1,B4)", "x":10, "y":3},
{"label":"K3B (B1,D7)", "x":11, "y":3}
]
},
"LAYOUT_ortho_4x12_1x2uR": {
"layout": [
{"label":"K00 (D0,F1)", "x":0, "y":0},
{"label":"K01 (D0,F0)", "x":1, "y":0},
{"label":"K02 (D0,B0)", "x":2, "y":0},
{"label":"K03 (D0,C7)", "x":3, "y":0},
{"label":"K04 (D0,F4)", "x":4, "y":0},
{"label":"K05 (D0,F5)", "x":5, "y":0},
{"label":"K06 (D0,F6)", "x":6, "y":0},
{"label":"K07 (D0,F7)", "x":7, "y":0},
{"label":"K08 (D0,D4)", "x":8, "y":0},
{"label":"K09 (D0,D6)", "x":9, "y":0},
{"label":"K0A (D0,B4)", "x":10, "y":0},
{"label":"K0B (D0,D7)", "x":11, "y":0},
{"label":"K10 (B3,F1)", "x":0, "y":1},
{"label":"K11 (B3,F0)", "x":1, "y":1},
{"label":"K12 (B3,B0)", "x":2, "y":1},
{"label":"K13 (B3,C7)", "x":3, "y":1},
{"label":"K14 (B3,F4)", "x":4, "y":1},
{"label":"K15 (B3,F5)", "x":5, "y":1},
{"label":"K16 (B3,F6)", "x":6, "y":1},
{"label":"K17 (B3,F7)", "x":7, "y":1},
{"label":"K18 (B3,D4)", "x":8, "y":1},
{"label":"K19 (B3,D6)", "x":9, "y":1},
{"label":"K1A (B3,B4)", "x":10, "y":1},
{"label":"K1B (B3,D7)", "x":11, "y":1},
{"label":"K20 (B2,F1)", "x":0, "y":2},
{"label":"K21 (B2,F0)", "x":1, "y":2},
{"label":"K22 (B2,B0)", "x":2, "y":2},
{"label":"K23 (B2,C7)", "x":3, "y":2},
{"label":"K24 (B2,F4)", "x":4, "y":2},
{"label":"K25 (B2,F5)", "x":5, "y":2},
{"label":"K26 (B2,F6)", "x":6, "y":2},
{"label":"K27 (B2,F7)", "x":7, "y":2},
{"label":"K28 (B2,D4)", "x":8, "y":2},
{"label":"K29 (B2,D6)", "x":9, "y":2},
{"label":"K2A (B2,B4)", "x":10, "y":2},
{"label":"K2B (B2,D7)", "x":11, "y":2},
{"label":"K30 (B1,F1)", "x":0, "y":3},
{"label":"K31 (B1,F0)", "x":1, "y":3},
{"label":"K32 (B1,B0)", "x":2, "y":3},
{"label":"K33 (B1,C7)", "x":3, "y":3},
{"label":"K34 (B1,F4)", "x":4, "y":3},
{"label":"K35 (B1,F5)", "x":5, "y":3},
{"label":"K37 (B1,F7)", "x":6, "y":3, "w":2},
{"label":"K38 (B1,D4)", "x":8, "y":3},
{"label":"K39 (B1,D6)", "x":9, "y":3},
{"label":"K3A (B1,B4)", "x":10, "y":3},
{"label":"K3B (B1,D7)", "x":11, "y":3}
]
},
"LAYOUT_ortho_4x12_1x2uL": {
"layout": [
{"label":"K00 (D0,F1)", "x":0, "y":0},
{"label":"K01 (D0,F0)", "x":1, "y":0},
{"label":"K02 (D0,B0)", "x":2, "y":0},
{"label":"K03 (D0,C7)", "x":3, "y":0},
{"label":"K04 (D0,F4)", "x":4, "y":0},
{"label":"K05 (D0,F5)", "x":5, "y":0},
{"label":"K06 (D0,F6)", "x":6, "y":0},
{"label":"K07 (D0,F7)", "x":7, "y":0},
{"label":"K08 (D0,D4)", "x":8, "y":0},
{"label":"K09 (D0,D6)", "x":9, "y":0},
{"label":"K0A (D0,B4)", "x":10, "y":0},
{"label":"K0B (D0,D7)", "x":11, "y":0},
{"label":"K10 (B3,F1)", "x":0, "y":1},
{"label":"K11 (B3,F0)", "x":1, "y":1},
{"label":"K12 (B3,B0)", "x":2, "y":1},
{"label":"K13 (B3,C7)", "x":3, "y":1},
{"label":"K14 (B3,F4)", "x":4, "y":1},
{"label":"K15 (B3,F5)", "x":5, "y":1},
{"label":"K16 (B3,F6)", "x":6, "y":1},
{"label":"K17 (B3,F7)", "x":7, "y":1},
{"label":"K18 (B3,D4)", "x":8, "y":1},
{"label":"K19 (B3,D6)", "x":9, "y":1},
{"label":"K1A (B3,B4)", "x":10, "y":1},
{"label":"K1B (B3,D7)", "x":11, "y":1},
{"label":"K20 (B2,F1)", "x":0, "y":2},
{"label":"K21 (B2,F0)", "x":1, "y":2},
{"label":"K22 (B2,B0)", "x":2, "y":2},
{"label":"K23 (B2,C7)", "x":3, "y":2},
{"label":"K24 (B2,F4)", "x":4, "y":2},
{"label":"K25 (B2,F5)", "x":5, "y":2},
{"label":"K26 (B2,F6)", "x":6, "y":2},
{"label":"K27 (B2,F7)", "x":7, "y":2},
{"label":"K28 (B2,D4)", "x":8, "y":2},
{"label":"K29 (B2,D6)", "x":9, "y":2},
{"label":"K2A (B2,B4)", "x":10, "y":2},
{"label":"K2B (B2,D7)", "x":11, "y":2},
{"label":"K30 (B1,F1)", "x":0, "y":3},
{"label":"K31 (B1,F0)", "x":1, "y":3},
{"label":"K32 (B1,B0)", "x":2, "y":3},
{"label":"K33 (B1,C7)", "x":3, "y":3},
{"label":"K34 (B1,F4)", "x":4, "y":3, "w":2},
{"label":"K36 (B1,F6)", "x":6, "y":3},
{"label":"K37 (B1,F7)", "x":7, "y":3},
{"label":"K38 (B1,D4)", "x":8, "y":3},
{"label":"K39 (B1,D6)", "x":9, "y":3},
{"label":"K3A (B1,B4)", "x":10, "y":3},
{"label":"K3B (B1,D7)", "x":11, "y":3}
]
},
"LAYOUT_ortho_4x12_1x2uC": {
"layout": [
{"label":"K00 (D0,F1)", "x":0, "y":0},
{"label":"K01 (D0,F0)", "x":1, "y":0},
{"label":"K02 (D0,B0)", "x":2, "y":0},
{"label":"K03 (D0,C7)", "x":3, "y":0},
{"label":"K04 (D0,F4)", "x":4, "y":0},
{"label":"K05 (D0,F5)", "x":5, "y":0},
{"label":"K06 (D0,F6)", "x":6, "y":0},
{"label":"K07 (D0,F7)", "x":7, "y":0},
{"label":"K08 (D0,D4)", "x":8, "y":0},
{"label":"K09 (D0,D6)", "x":9, "y":0},
{"label":"K0A (D0,B4)", "x":10, "y":0},
{"label":"K0B (D0,D7)", "x":11, "y":0},
{"label":"K10 (B3,F1)", "x":0, "y":1},
{"label":"K11 (B3,F0)", "x":1, "y":1},
{"label":"K12 (B3,B0)", "x":2, "y":1},
{"label":"K13 (B3,C7)", "x":3, "y":1},
{"label":"K14 (B3,F4)", "x":4, "y":1},
{"label":"K15 (B3,F5)", "x":5, "y":1},
{"label":"K16 (B3,F6)", "x":6, "y":1},
{"label":"K17 (B3,F7)", "x":7, "y":1},
{"label":"K18 (B3,D4)", "x":8, "y":1},
{"label":"K19 (B3,D6)", "x":9, "y":1},
{"label":"K1A (B3,B4)", "x":10, "y":1},
{"label":"K1B (B3,D7)", "x":11, "y":1},
{"label":"K20 (B2,F1)", "x":0, "y":2},
{"label":"K21 (B2,F0)", "x":1, "y":2},
{"label":"K22 (B2,B0)", "x":2, "y":2},
{"label":"K23 (B2,C7)", "x":3, "y":2},
{"label":"K24 (B2,F4)", "x":4, "y":2},
{"label":"K25 (B2,F5)", "x":5, "y":2},
{"label":"K26 (B2,F6)", "x":6, "y":2},
{"label":"K27 (B2,F7)", "x":7, "y":2},
{"label":"K28 (B2,D4)", "x":8, "y":2},
{"label":"K29 (B2,D6)", "x":9, "y":2},
{"label":"K2A (B2,B4)", "x":10, "y":2},
{"label":"K2B (B2,D7)", "x":11, "y":2},
{"label":"K30 (B1,F1)", "x":0, "y":3},
{"label":"K31 (B1,F0)", "x":1, "y":3},
{"label":"K32 (B1,B0)", "x":2, "y":3},
{"label":"K33 (B1,C7)", "x":3, "y":3},
{"label":"K34 (B1,F4)", "x":4, "y":3},
{"label":"K35 (B1,F5)", "x":5, "y":3, "w":2},
{"label":"K37 (B1,F7)", "x":7, "y":3},
{"label":"K38 (B1,D4)", "x":8, "y":3},
{"label":"K39 (B1,D6)", "x":9, "y":3},
{"label":"K3A (B1,B4)", "x":10, "y":3},
{"label":"K3B (B1,D7)", "x":11, "y":3}
]
} }
} }
} }

View file

@ -29,3 +29,51 @@
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B }, \ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B }, \
} }
#define LAYOUT_ortho_4x12_2x2u( \
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, 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, KC_NO, KC_NO, K37, K38, K39, K3A, K3B }, \
}
#define LAYOUT_ortho_4x12_1x2uR( \
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, 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, KC_NO, K37, K38, K39, K3A, K3B }, \
}
#define LAYOUT_ortho_4x12_1x2uL( \
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, 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, KC_NO, K36, K37, K38, K39, K3A, K3B }, \
}
#define LAYOUT_ortho_4x12_1x2uC( \
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, 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, KC_NO, K37, K38, K39, K3A, K3B }, \
}