Skip to content

Commit 28d3f35

Browse files
noroadsleftmechlovin
noroadsleft
authored and
mechlovin
committed
GMMK2 65% ISO Community Layout Support (qmk#22152)
* Refactor `LAYOUT` into `LAYOUT_65_iso_blocker` Move the Enter key to the end of the home row for Community Layout compatibility. [chore] [refactor] * Enable Community Layout support [enhancement]
1 parent 5096c77 commit 28d3f35

File tree

3 files changed

+20
-19
lines changed

3 files changed

+20
-19
lines changed

‎keyboards/gmmk/gmmk2/p65/iso/info.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@
2424
},
2525
"processor": "WB32F3G71",
2626
"bootloader": "wb32-dfu",
27+
"community_layouts": ["65_iso_blocker"],
2728
"layouts": {
28-
"LAYOUT": {
29+
"LAYOUT_65_iso_blocker": {
2930
"layout": [
3031
{"matrix": [1, 3], "x": 0, "y": 0},
3132
{"matrix": [1, 7], "x": 1, "y": 0},
@@ -56,7 +57,6 @@
5657
{"matrix": [8, 0], "x": 10.5, "y": 1},
5758
{"matrix": [8, 1], "x": 11.5, "y": 1},
5859
{"matrix": [6, 1], "x": 12.5, "y": 1},
59-
{"matrix": [8, 4], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
6060
{"matrix": [2, 6], "x": 15, "y": 1},
6161

6262
{"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
@@ -72,6 +72,7 @@
7272
{"matrix": [8, 2], "x": 10.75, "y": 2},
7373
{"matrix": [8, 3], "x": 11.75, "y": 2},
7474
{"matrix": [7, 5], "x": 12.75, "y": 2},
75+
{"matrix": [8, 4], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
7576
{"matrix": [6, 5], "x": 15, "y": 2},
7677

7778
{"matrix": [0, 0], "x": 0, "y": 3, "w": 1.25},

‎keyboards/gmmk/gmmk2/p65/iso/keymaps/default/keymap.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@ enum custom_layers {
2626
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
2727
/* Keymap _BL: Base Layer (Default Layer)
2828
*/
29-
[_BL] = LAYOUT(
29+
[_BL] = LAYOUT_65_iso_blocker(
3030
QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
31-
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_PGUP,
32-
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_PGDN,
31+
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGUP,
32+
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGDN,
3333
KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
3434
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
3535

3636
/* Keymap _FL: Function Layer
3737
*/
38-
[_FL] = LAYOUT(
38+
[_FL] = LAYOUT_65_iso_blocker(
3939
_______, 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_INS,
40-
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______,
41-
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
40+
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
41+
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
4242
_______, _______, RGB_HUI, RGB_HUD, RGB_SPD, RGB_SPI, KC_MUTE, KC_VOLU, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, _______, RGB_VAI, KC_HOME,
4343
_______, _______, _______, QK_BOOT, _______, _______, RGB_RMOD, RGB_VAD, RGB_MOD)
4444
};

‎keyboards/gmmk/gmmk2/p65/iso/keymaps/via/keymap.c

+11-11
Original file line numberDiff line numberDiff line change
@@ -19,32 +19,32 @@
1919
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
2020
/* Keymap _BL: Base Layer (Default Layer)
2121
*/
22-
[0] = LAYOUT(
22+
[0] = LAYOUT_65_iso_blocker(
2323
QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
24-
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_PGUP,
25-
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_PGDN,
24+
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGUP,
25+
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGDN,
2626
KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
2727
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
2828

2929
/* Keymap _FL: Function Layer
3030
*/
31-
[1] = LAYOUT(
32-
_______, 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_INS,
33-
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______,
34-
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
31+
[1] = LAYOUT_65_iso_blocker(
32+
_______, 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_INS,
33+
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
34+
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
3535
_______, _______, RGB_HUI, RGB_HUD, RGB_SPD, RGB_SPI, KC_MUTE, KC_VOLU, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, _______, RGB_VAI, KC_HOME,
3636
_______, _______, _______, QK_BOOT, _______, _______, RGB_RMOD, RGB_VAD, RGB_MOD),
3737

38-
[2] = LAYOUT(
39-
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
38+
[2] = LAYOUT_65_iso_blocker(
4039
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
4140
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
4241
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
43-
_______, _______, _______, _______, _______, _______, _______, _______, _______),
44-
[3] = LAYOUT(
4542
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
43+
_______, _______, _______, _______, _______, _______, _______, _______, _______),
44+
[3] = LAYOUT_65_iso_blocker(
4645
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
4746
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
4847
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
48+
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
4949
_______, _______, _______, _______, _______, _______, _______, _______, _______)
5050
};

0 commit comments

Comments
 (0)