Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added via layout to GMMK Pro #12555

Closed
wants to merge 3 commits into from
Closed

Added via layout to GMMK Pro #12555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b2eed9f
Added via layout to GMMK Pro
apierce376 Apr 11, 2021
9249014
Fixed swapped RAlt and FN keys
apierce376 Apr 11, 2021
6f6c316
Removed via.json
apierce376 Apr 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
166 changes: 83 additions & 83 deletions keyboards/gmmk/pro/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,104 +7,104 @@
"layouts": {
"LAYOUT": {
"layout": [
{"x":0, "y":0},
{"label": "k13", "x":0, "y":0},
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

labels aren't necessary, here.


{"x":1.25, "y":0},
{"x":2.25, "y":0},
{"x":3.25, "y":0},
{"x":4.25, "y":0},
{"label": "k26", "x":1.25, "y":0},
{"label": "k36", "x":2.25, "y":0},
{"label": "k31", "x":3.25, "y":0},
{"label": "k33", "x":4.25, "y":0},

{"x":5.5, "y":0},
{"x":6.5, "y":0},
{"x":7.5, "y":0},
{"x":8.5, "y":0},
{"label": "k07", "x":5.5, "y":0},
{"label": "k63", "x":6.5, "y":0},
{"label": "k71", "x":7.5, "y":0},
{"label": "k76", "x":8.5, "y":0},

{"x":9.75, "y":0},
{"x":10.75, "y":0},
{"x":11.75, "y":0},
{"x":12.75, "y":0},
{"label": "ka6", "x":9.75, "y":0},
{"label": "ka7", "x":10.75, "y":0},
{"label": "ka3", "x":11.75, "y":0},
{"label": "ka5", "x":12.75, "y":0},

{"x":14, "y":0},
{"x":15.5, "y":0},
{"label": "k97", "x":14, "y":0},
{"label": "k01", "x":15.5, "y":0},

{"x":0, "y":1.25},
{"x":1, "y":1.25},
{"x":2, "y":1.25},
{"x":3, "y":1.25},
{"x":4, "y":1.25},
{"x":5, "y":1.25},
{"x":6, "y":1.25},
{"x":7, "y":1.25},
{"x":8, "y":1.25},
{"x":9, "y":1.25},
{"x":10, "y":1.25},
{"x":11, "y":1.25},
{"x":12, "y":1.25},
{"x":13, "y":1.25, "w":2},
{"label": "k16", "x":0, "y":1.25},
{"label": "k17", "x":1, "y":1.25},
{"label": "k27", "x":2, "y":1.25},
{"label": "k37", "x":3, "y":1.25},
{"label": "k47", "x":4, "y":1.25},
{"label": "k46", "x":5, "y":1.25},
{"label": "k56", "x":6, "y":1.25},
{"label": "k57", "x":7, "y":1.25},
{"label": "k67", "x":8, "y":1.25},
{"label": "k77", "x":9, "y":1.25},
{"label": "k87", "x":10, "y":1.25},
{"label": "k86", "x":11, "y":1.25},
{"label": "k66", "x":12, "y":1.25},
{"label": "ka1", "x":13, "y":1.25, "w":2},

{"x":15.5, "y":1.25},
{"label": "k65", "x":15.5, "y":1.25},

{"x":0, "y":2.25, "w":1.5},
{"x":1.5, "y":2.25},
{"x":2.5, "y":2.25},
{"x":3.5, "y":2.25},
{"x":4.5, "y":2.25},
{"x":5.5, "y":2.25},
{"x":6.5, "y":2.25},
{"x":7.5, "y":2.25},
{"x":8.5, "y":2.25},
{"x":9.5, "y":2.25},
{"x":10.5, "y":2.25},
{"x":11.5, "y":2.25},
{"x":12.5, "y":2.25},
{"x":13.5, "y":2.25, "w":1.5},
{"label": "k11", "x":0, "y":2.25, "w":1.5},
{"label": "k10", "x":1.5, "y":2.25},
{"label": "k20", "x":2.5, "y":2.25},
{"label": "k30", "x":3.5, "y":2.25},
{"label": "k40", "x":4.5, "y":2.25},
{"label": "k41", "x":5.5, "y":2.25},
{"label": "k51", "x":6.5, "y":2.25},
{"label": "k50", "x":7.5, "y":2.25},
{"label": "k60", "x":8.5, "y":2.25},
{"label": "k70", "x":9.5, "y":2.25},
{"label": "k80", "x":10.5, "y":2.25},
{"label": "k81", "x":11.5, "y":2.25},
{"label": "k61", "x":12.5, "y":2.25},
{"label": "ka2", "x":13.5, "y":2.25, "w":1.5},

{"x":15.5, "y":2.25},
{"label": "k15", "x":15.5, "y":2.25},

{"x":0, "y":3.25, "w":1.75},
{"x":1.75, "y":3.25},
{"x":2.75, "y":3.25},
{"x":3.75, "y":3.25},
{"x":4.75, "y":3.25},
{"x":5.75, "y":3.25},
{"x":6.75, "y":3.25},
{"x":7.75, "y":3.25},
{"x":8.75, "y":3.25},
{"x":9.75, "y":3.25},
{"x":10.75, "y":3.25},
{"x":11.75, "y":3.25},
{"x":12.75, "y":3.25, "w":2.25},
{"label": "k21", "x":0, "y":3.25, "w":1.75},
{"label": "k12", "x":1.75, "y":3.25},
{"label": "k22", "x":2.75, "y":3.25},
{"label": "k32", "x":3.75, "y":3.25},
{"label": "k42", "x":4.75, "y":3.25},
{"label": "k43", "x":5.75, "y":3.25},
{"label": "k53", "x":6.75, "y":3.25},
{"label": "k52", "x":7.75, "y":3.25},
{"label": "k62", "x":8.75, "y":3.25},
{"label": "k72", "x":9.75, "y":3.25},
{"label": "k82", "x":10.75, "y":3.25},
{"label": "k83", "x":11.75, "y":3.25},
{"label": "ka4", "x":12.75, "y":3.25, "w":2.25},

{"x":15.5, "y":3.25},
{"label": "k25", "x":15.5, "y":3.25},

{"x":0, "y":4.25, "w":2.25},
{"x":2.25, "y":4.25},
{"x":3.25, "y":4.25},
{"x":4.25, "y":4.25},
{"x":5.25, "y":4.25},
{"x":6.25, "y":4.25},
{"x":7.25, "y":4.25},
{"x":8.25, "y":4.25},
{"x":9.25, "y":4.25},
{"x":10.25, "y":4.25},
{"x":11.25, "y":4.25},
{"x":12.25, "y":4.25, "w":1.75},
{"label": "k00", "x":0, "y":4.25, "w":2.25},
{"label": "k14", "x":2.25, "y":4.25},
{"label": "k24", "x":3.25, "y":4.25},
{"label": "k34", "x":4.25, "y":4.25},
{"label": "k44", "x":5.25, "y":4.25},
{"label": "k45", "x":6.25, "y":4.25},
{"label": "k55", "x":7.25, "y":4.25},
{"label": "k54", "x":8.25, "y":4.25},
{"label": "k64", "x":9.25, "y":4.25},
{"label": "k74", "x":10.25, "y":4.25},
{"label": "k85", "x":11.25, "y":4.25},
{"label": "k91", "x":12.25, "y":4.25, "w":1.75},

{"x":14.25, "y":4.5},
{"label": "k35", "x":14.25, "y":4.5},

{"x":15.5, "y":4.25},
{"label": "k75", "x":15.5, "y":4.25},

{"x":0, "y":5.25, "w":1.25},
{"x":1.25, "y":5.25, "w":1.25},
{"x":2.5, "y":5.25, "w":1.25},
{"x":3.75, "y":5.25, "w":6.25},
{"x":10, "y":5.25},
{"x":11, "y":5.25},
{"x":12, "y":5.25},
{"label": "k06", "x":0, "y":5.25, "w":1.25},
{"label": "k90", "x":1.25, "y":5.25, "w":1.25},
{"label": "k93", "x":2.5, "y":5.25, "w":1.25},
{"label": "k94", "x":3.75, "y":5.25, "w":6.25},
{"label": "k95", "x":10, "y":5.25},
{"label": "k92", "x":11, "y":5.25},
{"label": "k04", "x":12, "y":5.25},

{"x":13.25, "y":5.5},
{"x":14.25, "y":5.5},
{"x":15.25, "y":5.5}
{"label": "k03", "x":13.25, "y":5.5},
{"label": "k73", "x":14.25, "y":5.5},
{"label": "k05", "x":15.25, "y":5.5}
]
}
}
Expand Down
74 changes: 74 additions & 0 deletions keyboards/gmmk/pro/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

// ESC F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12 Prt Rotary(Mute)
// ~ 1 2 3 4 5 6 7 8 9 0 - (=) BackSpc Del
// Tab Q W E R T Y U I O P [ ] \ PgUp
// Caps A S D F G H J K L ; " Enter PgDn
// Sh_L Z X C V B N M , . ? Sh_R Up End
// Ct_L Win_L Alt_L SPACE Alt_R FN Ct_R Left Down Right


[0] = LAYOUT(
KC_ESC, 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_PSCR, KC_MUTE,
KC_GRV, 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,
KC_LSFT, 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,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),

[1] = LAYOUT(
RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),

[2] = LAYOUT(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),

[3] = LAYOUT(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
)

};


void encoder_update_user(uint8_t index, bool clockwise) {
if (clockwise) {
tap_code(KC_VOLU);
} else {
tap_code(KC_VOLD);
}
}
1 change: 1 addition & 0 deletions keyboards/gmmk/pro/keymaps/via/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VIA_ENABLE = yes
2 changes: 1 addition & 1 deletion keyboards/gmmk/pro/pro.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
k11, k10, k20, k30, k40, k41, k51, k50, k60, k70, k80, k81, k61, ka2, k15, \
k21, k12, k22, k32, k42, k43, k53, k52, k62, k72, k82, k83, ka4, k25, \
k00, k14, k24, k34, k44, k45, k55, k54, k64, k74, k85, k91, k35, k75, \
k06, k90, k93, k94, k92, k95, k04, k03, k73, k05 \
k06, k90, k93, k94, k95, k92, k04, k03, k73, k05 \
) \
{ \
{ k00, k01, ___, k03, k04, k05, k06, k07}, \
Expand Down