Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
QMK Bot
commit
3b67310bef
@ -11,8 +11,8 @@
|
|||||||
"processor": "atmega32u4",
|
"processor": "atmega32u4",
|
||||||
"bootloader": "caterina",
|
"bootloader": "caterina",
|
||||||
"matrix_pins": {
|
"matrix_pins": {
|
||||||
"rows": ["F0", "F1", "F5", "B4"],
|
"rows": ["C6", "D4", "D0", "D1"],
|
||||||
"cols": ["F4", "D7", "B5", "B6", "C6", "C7", "D4", "D6", "D5", "D0", "D1", "D2"]
|
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "D7", "B2", "B6", "B5", "B4", "E6"]
|
||||||
},
|
},
|
||||||
"diode_direction": "COL2ROW",
|
"diode_direction": "COL2ROW",
|
||||||
"features": {
|
"features": {
|
||||||
@ -30,46 +30,46 @@
|
|||||||
"layouts": {
|
"layouts": {
|
||||||
"LAYOUT": {
|
"LAYOUT": {
|
||||||
"layout": [
|
"layout": [
|
||||||
{"label": "K00 (F0,F4)", "matrix": [0, 0], "x": 0, "y": 0},
|
{"label": "K00 (C6,F4)", "matrix": [0, 0], "x": 0, "y": 0},
|
||||||
{"label": "K01 (F0,D7)", "matrix": [0, 1], "x": 1, "y": 0},
|
{"label": "K01 (C6,F5)", "matrix": [0, 1], "x": 1, "y": 0},
|
||||||
{"label": "K02 (F0,B5)", "matrix": [0, 2], "x": 2, "y": 0},
|
{"label": "K02 (C6,F6)", "matrix": [0, 2], "x": 2, "y": 0},
|
||||||
{"label": "K03 (F0,B6)", "matrix": [0, 3], "x": 3, "y": 0},
|
{"label": "K03 (C6,F7)", "matrix": [0, 3], "x": 3, "y": 0},
|
||||||
{"label": "K04 (F0,C6)", "matrix": [0, 4], "x": 4, "y": 0},
|
{"label": "K04 (C6,B1)", "matrix": [0, 4], "x": 4, "y": 0},
|
||||||
{"label": "K05 (F0,C7)", "matrix": [0, 5], "x": 5, "y": 0},
|
{"label": "K05 (C6,B3)", "matrix": [0, 5], "x": 5, "y": 0},
|
||||||
{"label": "K06 (F0,D4)", "matrix": [0, 6], "x": 6, "y": 0},
|
{"label": "K06 (C6,D7)", "matrix": [0, 6], "x": 6, "y": 0},
|
||||||
{"label": "K07 (F0,D6)", "matrix": [0, 7], "x": 7, "y": 0},
|
{"label": "K07 (C6,B2)", "matrix": [0, 7], "x": 7, "y": 0},
|
||||||
{"label": "K08 (F0,D5)", "matrix": [0, 8], "x": 8, "y": 0},
|
{"label": "K08 (C6,B6)", "matrix": [0, 8], "x": 8, "y": 0},
|
||||||
{"label": "K09 (F0,D0)", "matrix": [0, 9], "x": 9, "y": 0},
|
{"label": "K09 (C6,B5)", "matrix": [0, 9], "x": 9, "y": 0},
|
||||||
{"label": "K0A (F0,D1)", "matrix": [0, 10], "x": 10, "y": 0},
|
{"label": "K0A (C6,B4)", "matrix": [0, 10], "x": 10, "y": 0},
|
||||||
{"label": "K0B (F0,D2)", "matrix": [0, 11], "x": 11, "y": 0},
|
{"label": "K0B (C6,E6)", "matrix": [0, 11], "x": 11, "y": 0},
|
||||||
{"label": "K10 (F1,F4)", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
|
{"label": "K10 (D4,F4)", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
|
||||||
{"label": "K11 (F1,D7)", "matrix": [1, 1], "x": 1.25, "y": 1},
|
{"label": "K11 (D4,F5)", "matrix": [1, 1], "x": 1.25, "y": 1},
|
||||||
{"label": "K12 (F1,B5)", "matrix": [1, 2], "x": 2.25, "y": 1},
|
{"label": "K12 (D4,F6)", "matrix": [1, 2], "x": 2.25, "y": 1},
|
||||||
{"label": "K13 (F1,B6)", "matrix": [1, 3], "x": 3.25, "y": 1},
|
{"label": "K13 (D4,F7)", "matrix": [1, 3], "x": 3.25, "y": 1},
|
||||||
{"label": "K14 (F1,C6)", "matrix": [1, 4], "x": 4.25, "y": 1},
|
{"label": "K14 (D4,B1)", "matrix": [1, 4], "x": 4.25, "y": 1},
|
||||||
{"label": "K15 (F1,C7)", "matrix": [1, 5], "x": 5.25, "y": 1},
|
{"label": "K15 (D4,B3)", "matrix": [1, 5], "x": 5.25, "y": 1},
|
||||||
{"label": "K16 (F1,D4)", "matrix": [1, 6], "x": 6.25, "y": 1},
|
{"label": "K16 (D4,D7)", "matrix": [1, 6], "x": 6.25, "y": 1},
|
||||||
{"label": "K17 (F1,D6)", "matrix": [1, 7], "x": 7.25, "y": 1},
|
{"label": "K17 (D4,B2)", "matrix": [1, 7], "x": 7.25, "y": 1},
|
||||||
{"label": "K18 (F1,D5)", "matrix": [1, 8], "x": 8.25, "y": 1},
|
{"label": "K18 (D4,B6)", "matrix": [1, 8], "x": 8.25, "y": 1},
|
||||||
{"label": "K19 (F1,D0)", "matrix": [1, 9], "x": 9.25, "y": 1},
|
{"label": "K19 (D4,B5)", "matrix": [1, 9], "x": 9.25, "y": 1},
|
||||||
{"label": "K1B (F1,D2)", "matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75},
|
{"label": "K1B (D4,E6)", "matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75},
|
||||||
{"label": "K20 (F5,F4)", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
|
{"label": "K20 (D0,F4)", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
|
||||||
{"label": "K22 (F5,B5)", "matrix": [2, 2], "x": 1.75, "y": 2},
|
{"label": "K22 (D0,F6)", "matrix": [2, 2], "x": 1.75, "y": 2},
|
||||||
{"label": "K23 (F5,B6)", "matrix": [2, 3], "x": 2.75, "y": 2},
|
{"label": "K23 (D0,F7)", "matrix": [2, 3], "x": 2.75, "y": 2},
|
||||||
{"label": "K24 (F5,C6)", "matrix": [2, 4], "x": 3.75, "y": 2},
|
{"label": "K24 (D0,B1)", "matrix": [2, 4], "x": 3.75, "y": 2},
|
||||||
{"label": "K25 (F5,C7)", "matrix": [2, 5], "x": 4.75, "y": 2},
|
{"label": "K25 (D0,B3)", "matrix": [2, 5], "x": 4.75, "y": 2},
|
||||||
{"label": "K26 (F5,D4)", "matrix": [2, 6], "x": 5.75, "y": 2},
|
{"label": "K26 (D0,D7)", "matrix": [2, 6], "x": 5.75, "y": 2},
|
||||||
{"label": "K27 (F5,D6)", "matrix": [2, 7], "x": 6.75, "y": 2},
|
{"label": "K27 (D0,B2)", "matrix": [2, 7], "x": 6.75, "y": 2},
|
||||||
{"label": "K28 (F5,D5)", "matrix": [2, 8], "x": 7.75, "y": 2},
|
{"label": "K28 (D0,B6)", "matrix": [2, 8], "x": 7.75, "y": 2},
|
||||||
{"label": "K29 (F5,D0)", "matrix": [2, 9], "x": 8.75, "y": 2},
|
{"label": "K29 (D0,B5)", "matrix": [2, 9], "x": 8.75, "y": 2},
|
||||||
{"label": "K2A (F5,D1)", "matrix": [2, 10], "x": 9.75, "y": 2, "w": 1.25},
|
{"label": "K2A (D0,B4)", "matrix": [2, 10], "x": 9.75, "y": 2, "w": 1.25},
|
||||||
{"label": "K2B (F5,D2)", "matrix": [2, 11], "x": 11, "y": 2},
|
{"label": "K2B (D0,E6)", "matrix": [2, 11], "x": 11, "y": 2},
|
||||||
{"label": "K30 (B4,F4)", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
|
{"label": "K30 (D1,F4)", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
|
||||||
{"label": "K31 (B4,D7)", "matrix": [3, 1], "x": 1.25, "y": 3},
|
{"label": "K31 (D1,F5)", "matrix": [3, 1], "x": 1.25, "y": 3},
|
||||||
{"label": "K32 (B4,B5)", "matrix": [3, 2], "x": 2.25, "y": 3},
|
{"label": "K32 (D1,F6)", "matrix": [3, 2], "x": 2.25, "y": 3},
|
||||||
{"label": "K36 (B4,D4)", "matrix": [3, 6], "x": 3.25, "y": 3, "w": 6.25},
|
{"label": "K36 (D1,D7)", "matrix": [3, 6], "x": 3.25, "y": 3, "w": 6.25},
|
||||||
{"label": "K3A (B4,D1)", "matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.25},
|
{"label": "K3A (D1,B4)", "matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.25},
|
||||||
{"label": "K3B (B4,D2)", "matrix": [3, 11], "x": 10.75, "y": 3, "w": 1.25}
|
{"label": "K3B (D1,E6)", "matrix": [3, 11], "x": 10.75, "y": 3, "w": 1.25}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@ -22,13 +22,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||||||
KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
|
KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
|
||||||
KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT,
|
KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT,
|
||||||
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_DOT, KC_RSFT, MO(3),
|
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_DOT, KC_RSFT, MO(3),
|
||||||
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(2), MO(1)
|
KC_LCTL, LT(3,KC_LGUI), LT(1,KC_LALT), KC_SPC, TG(2), MO(1)
|
||||||
),
|
),
|
||||||
|
|
||||||
[1] = LAYOUT(
|
[1] = LAYOUT(
|
||||||
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
|
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
|
||||||
KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_ENT,
|
KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_ENT,
|
||||||
KC_PSCR, KC_MPLY, KC_VOLD, KC_VOLU, KC_INS, KC_DEL, KC_COMM, KC_DOT, KC_SLSH, KC_PGUP, _______,
|
KC_PSCR, KC_MPLY, KC_VOLD, KC_VOLU, LSG(KC_S), MAGIC_TOGGLE_NKRO, KC_COMM, KC_DOT, KC_SLSH, KC_PGUP, _______,
|
||||||
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_PGDN, _______
|
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_PGDN, _______
|
||||||
),
|
),
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||||||
KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
|
KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
|
||||||
KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT,
|
KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT,
|
||||||
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_DOT, KC_RSFT, MO(3),
|
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_DOT, KC_RSFT, MO(3),
|
||||||
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(2), MO(1)
|
KC_LCTL, LT(3,KC_LGUI), LT(1,KC_LALT), KC_SPC, TG(2), MO(1)
|
||||||
),
|
),
|
||||||
|
|
||||||
[1] = LAYOUT(
|
[1] = LAYOUT(
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user