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

This commit is contained in:
QMK Bot 2023-08-07 23:28:12 +00:00
commit 3c03799d5a
2 changed files with 22 additions and 19 deletions

View File

@ -118,6 +118,10 @@
{"matrix": [2, 5], "label": "HOME", "x": 5.25, "y": 2.25},
{"matrix": [2, 6], "label": "PGUP", "x": 6.25, "y": 2.25},
{"matrix": [5, 5], "label": "KNOB_L", "x": 7.5, "y": 2.25},
{"matrix": [5, 6], "label": "KNOB_R", "x": 9.5, "y": 2.25},
{"matrix": [3, 0], "label": "4", "x": 0, "y": 3.25},
{"matrix": [3, 1], "label": "5", "x": 1, "y": 3.25},
{"matrix": [3, 2], "label": "6", "x": 2, "y": 3.25},
@ -131,14 +135,13 @@
{"matrix": [4, 3], "label": "PENT", "x": 3, "y": 4.25, "h": 2},
{"matrix": [4, 5], "label": "UP", "x": 5.25, "y": 4.25},
{"matrix": [5, 7], "label": "KNOB_D", "x": 7.5, "y": 3.25, "w": 3, "h": 3}
{"matrix": [5, 0], "label": "0", "x": 0, "y": 5.25, "w": 2},
{"matrix": [5, 1], "label": "PDOT", "x": 2, "y": 5.25},
{"matrix": [5, 2], "label": "LEFT", "x": 4.25, "y": 5.25},
{"matrix": [5, 3], "label": "DOWN", "x": 5.25, "y": 5.25},
{"matrix": [5, 4], "label": "RIGHT", "x": 6.25, "y": 5.25},
{"matrix": [5, 5], "label": "KNOB_L", "x": 7.5, "y": 2.25},
{"matrix": [5, 6], "label": "KNOB_R", "x": 9.5, "y": 2.25},
{"matrix": [5, 7], "label": "KNOB_D", "x": 7.5, "y": 3.25, "w": 3, "h": 3}
{"matrix": [5, 4], "label": "RIGHT", "x": 6.25, "y": 5.25}
]
}
}

View File

@ -27,31 +27,31 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*
*
* NUM / * - PASSCRPSC
*
* 7 8 9 INSHOMPGU
* +
* 4 5 6 ENDDELPGD
*
* 1 2 3 E UP
* N
* 0 DEL T LFTDWNRHT O O O
*
*
* 7 8 9 INSHOMPGUHOM END
* +
* 4 5 6 ENDDELPGD
*
* 1 2 3 E UP B
* N
* 0 DEL T LFTDWNRHT
*
*/
[_QWERTY] = LAYOUT(
MO(1), KC_BSPC, RGB_RMOD, RGB_TOG, RGB_MOD, KC_F1, KC_F2, KC_F3,
KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_PAUS, KC_SCRL, KC_PSCR,
KC_P7, KC_P8, KC_P9, KC_PPLS, KC_INS, KC_HOME, KC_PGUP,
KC_P7, KC_P8, KC_P9, KC_PPLS, KC_INS, KC_HOME, KC_PGUP, KC_HOME, KC_END,
KC_P4, KC_P5, KC_P6, KC_END, KC_DEL, KC_PGDN,
KC_P1, KC_P2, KC_P3, KC_PENT, KC_UP,
KC_P0, KC_PDOT, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME, KC_END, KC_B
KC_P1, KC_P2, KC_P3, KC_PENT, KC_UP, KC_B,
KC_P0, KC_PDOT, KC_LEFT, KC_DOWN, KC_RGHT
),
[_LAYERTWO] = LAYOUT(
_______, KC_BSPC, RGB_RMOD, RGB_TOG, RGB_MOD, KC_A, QK_RBT, QK_BOOT,
KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_PAUS, KC_SCRL, KC_PSCR,
KC_P7, KC_P8, KC_P9, KC_PPLS, KC_INS, KC_HOME, KC_PGUP,
KC_P7, KC_P8, KC_P9, KC_PPLS, KC_INS, KC_HOME, KC_PGUP, KC_HOME, KC_END,
KC_P4, KC_P5, KC_P6, KC_END, KC_DEL, KC_PGDN,
KC_P1, KC_P2, KC_P3, KC_PENT, KC_UP,
KC_P0, KC_PDOT, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME, KC_END, KC_B
KC_P1, KC_P2, KC_P3, KC_PENT, KC_UP, KC_B,
KC_P0, KC_PDOT, KC_LEFT, KC_DOWN, KC_RGHT
)
};