Skip to content

Commit

Permalink
GMMK2 65% ANSI Touch-Up (#21544)
Browse files Browse the repository at this point in the history 
* [chore] correct layout data

* [chore] rename LAYOUT to LAYOUT_65_ansi_blocker

Also adds a layout alias so as to not have to edit the user keymaps.

* [enhancement] enable Community Layout support
  • Loading branch information
@noroadsleft
noroadsleft authored Jul 17, 2023
1 parent f1aabbf commit 30f52ea
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 17 deletions.
26 changes: 15 additions & 11 deletions keyboards/gmmk/gmmk2/p65/ansi/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,12 @@
},
"processor": "WB32F3G71",
"bootloader": "wb32-dfu",
"layout_aliases": {
"LAYOUT": "LAYOUT_65_ansi_blocker"
},
"community_layouts": ["65_ansi_blocker"],
"layouts": {
"LAYOUT": {
"LAYOUT_65_ansi_blocker": {
"layout": [
{"matrix": [1, 3], "x": 0, "y": 0},
{"matrix": [1, 7], "x": 1, "y": 0},
Expand All @@ -37,8 +41,8 @@
{"matrix": [8, 7], "x": 10, "y": 0},
{"matrix": [8, 6], "x": 11, "y": 0},
{"matrix": [6, 6], "x": 12, "y": 0},
{"matrix": [7, 1], "x": 13, "y": 0, "w": 2.25},
{"matrix": [2, 5], "x": 15.25, "y": 0},
{"matrix": [7, 1], "x": 13, "y": 0, "w": 2},
{"matrix": [2, 5], "x": 15, "y": 0},

{"matrix": [1, 1], "x": 0, "y": 1, "w": 1.5},
{"matrix": [1, 0], "x": 1.5, "y": 1},
Expand All @@ -53,8 +57,8 @@
{"matrix": [8, 0], "x": 10.5, "y": 1},
{"matrix": [8, 1], "x": 11.5, "y": 1},
{"matrix": [6, 1], "x": 12.5, "y": 1},
{"matrix": [7, 6], "x": 13.5, "y": 1, "w": 1.75},
{"matrix": [2, 6], "x": 15.25, "y": 1},
{"matrix": [7, 6], "x": 13.5, "y": 1, "w": 1.5},
{"matrix": [2, 6], "x": 15, "y": 1},

{"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
{"matrix": [1, 2], "x": 1.75, "y": 2},
Expand All @@ -69,7 +73,7 @@
{"matrix": [8, 2], "x": 10.75, "y": 2},
{"matrix": [8, 3], "x": 11.75, "y": 2},
{"matrix": [8, 4], "x": 12.75, "y": 2, "w": 2.25},
{"matrix": [6, 5], "x": 15.25, "y": 2},
{"matrix": [6, 5], "x": 15, "y": 2},

{"matrix": [0, 0], "x": 0, "y": 3, "w": 2.25},
{"matrix": [1, 4], "x": 2.25, "y": 3},
Expand All @@ -83,8 +87,8 @@
{"matrix": [7, 4], "x": 10.25, "y": 3},
{"matrix": [8, 5], "x": 11.25, "y": 3},
{"matrix": [0, 7], "x": 12.25, "y": 3, "w": 1.75},
{"matrix": [3, 5], "x": 14.25, "y": 3},
{"matrix": [0, 1], "x": 15.25, "y": 3},
{"matrix": [3, 5], "x": 14, "y": 3},
{"matrix": [0, 1], "x": 15, "y": 3},

{"matrix": [0, 6], "x": 0, "y": 4, "w": 1.25},
{"matrix": [1, 5], "x": 1.25, "y": 4, "w": 1.25},
Expand All @@ -93,9 +97,9 @@
{"matrix": [3, 6], "x": 10, "y": 4, "w": 1.25},
{"matrix": [3, 3], "x": 11.25, "y": 4, "w": 1.25},

{"matrix": [0, 3], "x": 13.25, "y": 4},
{"matrix": [7, 3], "x": 14.25, "y": 4},
{"matrix": [0, 5], "x": 15.25, "y": 4}
{"matrix": [0, 3], "x": 13, "y": 4},
{"matrix": [7, 3], "x": 14, "y": 4},
{"matrix": [0, 5], "x": 15, "y": 4}
]
}
}
Expand Down
4 changes: 2 additions & 2 deletions keyboards/gmmk/gmmk2/p65/ansi/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ enum custom_layers {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Keymap _BL: Base Layer (Default Layer)
*/
[_BL] = LAYOUT(
[_BL] = LAYOUT_65_ansi_blocker(
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,
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_BSLS, KC_PGUP,
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_ENT, KC_PGDN,
Expand All @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

/* Keymap _FL: Function Layer
*/
[_FL] = LAYOUT(
[_FL] = LAYOUT_65_ansi_blocker(
KC_GRV, 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,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
Expand Down
8 changes: 4 additions & 4 deletions keyboards/gmmk/gmmk2/p65/ansi/keymaps/via/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Keymap _BL: Base Layer (Default Layer)
*/
[0] = LAYOUT(
[0] = LAYOUT_65_ansi_blocker(
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,
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_BSLS, KC_PGUP,
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_ENT, KC_PGDN,
Expand All @@ -30,22 +30,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

/* Keymap _FL: Function Layer
*/
[1] = LAYOUT(
[1] = LAYOUT_65_ansi_blocker(
KC_GRV, 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,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, RGB_HUI, RGB_HUD, RGB_SPD, RGB_SPI, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, _______, RGB_VAI, KC_HOME,
_______, _______, _______, QK_BOOT, _______, _______, RGB_RMOD, RGB_VAD, RGB_MOD
),

[2] = LAYOUT(
[2] = LAYOUT_65_ansi_blocker(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
),
[3] = LAYOUT(
[3] = LAYOUT_65_ansi_blocker(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
Expand Down

0 comments on commit 30f52ea

Please sign in to comment.