aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoy Lee <[email protected]>2025-01-29 11:09:12 +0800
committerGitHub <[email protected]>2025-01-28 20:09:12 -0700
commit08dcc8856f078e50f6dbdd6a75647f131e270645 (patch)
treee305643092d007237559e481c41bb5f686748042
parent8afa3f2f084ce16a2f55ae72efcc2b8db1b74269 (diff)
downloadqmk_firmware-08dcc8856f078e50f6dbdd6a75647f131e270645.tar.gz
qmk_firmware-08dcc8856f078e50f6dbdd6a75647f131e270645.zip
Add more layout for skiller_sgk50_s4 (#24784)
* Add more layout for skiller_sgk50_s4 * Update skiller_sgk50_s4 default keymap * update keymap.c Co-authored-by: Ryan <[email protected]> * Update keymap.c Co-authored-by: Ryan <[email protected]> * Update keyboard.json * Update keyboard.json * Update keyboard.json * Update keyboard.json --------- Co-authored-by: wb <[email protected]> Co-authored-by: Ryan <[email protected]>
-rw-r--r--keyboards/sharkoon/skiller_sgk50_s4/keyboard.json130
-rw-r--r--keyboards/sharkoon/skiller_sgk50_s4/keymaps/default/keymap.c12
2 files changed, 80 insertions, 62 deletions
diff --git a/keyboards/sharkoon/skiller_sgk50_s4/keyboard.json b/keyboards/sharkoon/skiller_sgk50_s4/keyboard.json
index 7d36616e52..b7a628fd78 100644
--- a/keyboards/sharkoon/skiller_sgk50_s4/keyboard.json
+++ b/keyboards/sharkoon/skiller_sgk50_s4/keyboard.json
@@ -21,7 +21,7 @@
"rgb_matrix": true
},
"matrix_pins": {
- "cols": ["C0", "C1", "C2", "C3", "A6", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7"],
+ "cols": ["C0", "C1", "C2", "C3", "A6", "B1", "B10", "B11", "B12", "B13", "B14", "C6", "C7", "C8", "C9", "A8"],
"rows": ["A0", "A1", "A2", "A3", "C13"]
},
"processor": "WB32FQ95",
@@ -77,11 +77,15 @@
"driver": "ws2812",
"layout": [
{"matrix": [4, 6], "x": 103, "y": 64, "flags": 4},
+ {"matrix": [4, 9], "x": 154, "y": 64, "flags": 4},
{"matrix": [4, 10], "x": 172, "y": 64, "flags": 4},
{"matrix": [4, 11], "x": 190, "y": 64, "flags": 4},
{"matrix": [4, 12], "x": 207, "y": 64, "flags": 4},
- {"matrix": [4, 13], "x": 224, "y": 64, "flags": 4},
- {"matrix": [3, 13], "x": 224, "y": 48, "flags": 4},
+ {"matrix": [4, 15], "x": 224, "y": 64, "flags": 4},
+ {"matrix": [3, 15], "x": 224, "y": 48, "flags": 4},
+ {"matrix": [3, 14], "x": 224, "y": 48, "flags": 4},
+ {"matrix": [3, 13], "x": 210, "y": 48, "flags": 4},
+ {"matrix": [3, 12], "x": 200, "y": 48, "flags": 4},
{"matrix": [3, 11], "x": 190, "y": 48, "flags": 4},
{"matrix": [3, 10], "x": 172, "y": 48, "flags": 4},
{"matrix": [3, 9], "x": 155, "y": 48, "flags": 4},
@@ -93,6 +97,7 @@
{"matrix": [3, 3], "x": 52, "y": 48, "flags": 4},
{"matrix": [3, 2], "x": 34, "y": 48, "flags": 4},
{"matrix": [3, 1], "x": 17, "y": 48, "flags": 4},
+ {"matrix": [4, 3], "x": 52, "y": 64, "flags": 4},
{"matrix": [4, 2], "x": 34, "y": 64, "flags": 4},
{"matrix": [4, 1], "x": 17, "y": 64, "flags": 4},
{"matrix": [4, 0], "x": 0, "y": 64, "flags": 4},
@@ -109,8 +114,10 @@
{"matrix": [2, 9], "x": 155, "y": 32, "flags": 4},
{"matrix": [2, 10], "x": 172, "y": 32, "flags": 4},
{"matrix": [2, 11], "x": 190, "y": 32, "flags": 4},
- {"matrix": [2, 13], "x": 207, "y": 32, "flags": 4},
- {"matrix": [2, 12], "x": 224, "y": 16, "flags": 4},
+ {"matrix": [2, 12], "x": 200, "y": 32, "flags": 4},
+ {"matrix": [2, 13], "x": 224, "y": 32, "flags": 4},
+ {"matrix": [1, 14], "x": 224, "y": 16, "flags": 4},
+ {"matrix": [1, 13], "x": 224, "y": 16, "flags": 4},
{"matrix": [1, 12], "x": 207, "y": 16, "flags": 4},
{"matrix": [1, 11], "x": 190, "y": 16, "flags": 4},
{"matrix": [1, 10], "x": 172, "y": 16, "flags": 4},
@@ -137,7 +144,9 @@
{"matrix": [0, 10], "x": 172, "y": 0, "flags": 4},
{"matrix": [0, 11], "x": 190, "y": 0, "flags": 4},
{"matrix": [0, 12], "x": 207, "y": 0, "flags": 4},
- {"matrix": [0, 13], "x": 224, "y": 0, "flags": 4}
+ {"matrix": [0, 13], "x": 210, "y": 0, "flags": 4},
+ {"matrix": [0, 14], "x": 210, "y": 0, "flags": 4},
+ {"matrix": [0, 15], "x": 224, "y": 0, "flags": 4}
],
"max_brightness": 110,
"sleep": true,
@@ -145,13 +154,13 @@
},
"url": "",
"usb": {
- "device_version": "1.0.0",
+ "device_version": "1.1.0",
"pid": "0x1020",
"suspend_wakeup_delay": 1000,
"vid": "0x6332"
},
"ws2812": {
- "pin": "A8"
+ "pin": "B15"
},
"community_layouts": ["60_ansi", "60_iso"],
"layouts": {
@@ -170,7 +179,9 @@
{"matrix": [0, 10], "x": 10, "y": 0},
{"matrix": [0, 11], "x": 11, "y": 0},
{"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 0.5},
+ {"matrix": [0, 14], "x": 13.5, "y": 0},
+ {"matrix": [0, 15], "x": 14.5, "y": 0, "w": 0.5},
{"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
{"matrix": [1, 1], "x": 1.5, "y": 1},
{"matrix": [1, 2], "x": 2.5, "y": 1},
@@ -184,7 +195,8 @@
{"matrix": [1, 10], "x": 10.5, "y": 1},
{"matrix": [1, 11], "x": 11.5, "y": 1},
{"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 13], "x": 13.5, "y": 1},
+ {"matrix": [1, 14], "x": 14.5, "y": 1, "w": 0.5},
{"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
{"matrix": [2, 1], "x": 1.75, "y": 2},
{"matrix": [2, 2], "x": 2.75, "y": 2},
@@ -197,28 +209,34 @@
{"matrix": [2, 9], "x": 9.75, "y": 2},
{"matrix": [2, 10], "x": 10.75, "y": 2},
{"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 0.75},
+ {"matrix": [3, 1], "x": 0.75, "y": 3, "w": 0.5},
+ {"matrix": [3, 2], "x": 1.25, "y": 3},
+ {"matrix": [3, 3], "x": 2.25, "y": 3},
+ {"matrix": [3, 4], "x": 3.25, "y": 3},
+ {"matrix": [3, 5], "x": 4.25, "y": 3},
+ {"matrix": [3, 6], "x": 5.25, "y": 3},
+ {"matrix": [3, 7], "x": 6.25, "y": 3},
+ {"matrix": [3, 8], "x": 7.25, "y": 3},
+ {"matrix": [3, 9], "x": 8.25, "y": 3},
+ {"matrix": [3, 10], "x": 9.25, "y": 3},
+ {"matrix": [3, 11], "x": 10.25, "y": 3},
+ {"matrix": [3, 12], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3},
+ {"matrix": [3, 14], "x": 13.25, "y": 3, "w": 0.75},
+ {"matrix": [3, 15], "x": 14, "y": 3},
{"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
{"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
{"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4},
+ {"matrix": [4, 6], "x": 4.75, "y": 4, "w": 4.25},
+ {"matrix": [4, 9], "x": 9, "y": 4},
{"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
{"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
{"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ {"matrix": [4, 15], "x": 13.75, "y": 4, "w": 1.25}
]
},
"LAYOUT_60_ansi": {
@@ -236,7 +254,7 @@
{"matrix": [0, 10], "x": 10, "y": 0},
{"matrix": [0, 11], "x": 11, "y": 0},
{"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
{"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
{"matrix": [1, 1], "x": 1.5, "y": 1},
{"matrix": [1, 2], "x": 2.5, "y": 1},
@@ -250,7 +268,7 @@
{"matrix": [1, 10], "x": 10.5, "y": 1},
{"matrix": [1, 11], "x": 11.5, "y": 1},
{"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
{"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
{"matrix": [2, 1], "x": 1.75, "y": 2},
{"matrix": [2, 2], "x": 2.75, "y": 2},
@@ -264,18 +282,18 @@
{"matrix": [2, 10], "x": 10.75, "y": 2},
{"matrix": [2, 11], "x": 11.75, "y": 2},
{"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+ {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 3], "x": 2.25, "y": 3},
+ {"matrix": [3, 4], "x": 3.25, "y": 3},
+ {"matrix": [3, 5], "x": 4.25, "y": 3},
+ {"matrix": [3, 6], "x": 5.25, "y": 3},
+ {"matrix": [3, 7], "x": 6.25, "y": 3},
+ {"matrix": [3, 8], "x": 7.25, "y": 3},
+ {"matrix": [3, 9], "x": 8.25, "y": 3},
+ {"matrix": [3, 10], "x": 9.25, "y": 3},
+ {"matrix": [3, 11], "x": 10.25, "y": 3},
+ {"matrix": [3, 12], "x": 11.25, "y": 3},
+ {"matrix": [3, 14], "x": 12.25, "y": 3, "w": 2.75},
{"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
{"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
{"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
@@ -283,7 +301,7 @@
{"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
{"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
{"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ {"matrix": [4, 15], "x": 13.75, "y": 4, "w": 1.25}
]
},
"LAYOUT_60_iso": {
@@ -301,7 +319,7 @@
{"matrix": [0, 10], "x": 10, "y": 0},
{"matrix": [0, 11], "x": 11, "y": 0},
{"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
{"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
{"matrix": [1, 1], "x": 1.5, "y": 1},
{"matrix": [1, 2], "x": 2.5, "y": 1},
@@ -328,20 +346,20 @@
{"matrix": [2, 10], "x": 10.75, "y": 2},
{"matrix": [2, 11], "x": 11.75, "y": 2},
{"matrix": [2, 12], "x": 12.75, "y": 2},
- {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [1, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
{"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+ {"matrix": [3, 2], "x": 1.25, "y": 3},
+ {"matrix": [3, 3], "x": 2.25, "y": 3},
+ {"matrix": [3, 4], "x": 3.25, "y": 3},
+ {"matrix": [3, 5], "x": 4.25, "y": 3},
+ {"matrix": [3, 6], "x": 5.25, "y": 3},
+ {"matrix": [3, 7], "x": 6.25, "y": 3},
+ {"matrix": [3, 8], "x": 7.25, "y": 3},
+ {"matrix": [3, 9], "x": 8.25, "y": 3},
+ {"matrix": [3, 10], "x": 9.25, "y": 3},
+ {"matrix": [3, 11], "x": 10.25, "y": 3},
+ {"matrix": [3, 12], "x": 11.25, "y": 3},
+ {"matrix": [3, 14], "x": 12.25, "y": 3, "w": 2.75},
{"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
{"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
{"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
@@ -349,7 +367,7 @@
{"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
{"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
{"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ {"matrix": [4, 15], "x": 13.75, "y": 4, "w": 1.25}
]
}
}
diff --git a/keyboards/sharkoon/skiller_sgk50_s4/keymaps/default/keymap.c b/keyboards/sharkoon/skiller_sgk50_s4/keymaps/default/keymap.c
index a8a64d1f2d..9a9e207113 100644
--- a/keyboards/sharkoon/skiller_sgk50_s4/keymaps/default/keymap.c
+++ b/keyboards/sharkoon/skiller_sgk50_s4/keymaps/default/keymap.c
@@ -4,18 +4,18 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT_all(
+ [0] = LAYOUT_60_iso(
KC_ESC, 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_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_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_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_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_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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL
),
- [1] = LAYOUT_all(
+ [1] = LAYOUT_60_iso(
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_DEL,
- _______, _______, _______, _______, _______, _______, KC_INS, _______, KC_UP, KC_PAUS, KC_PGUP, KC_HOME, KC_PSCR, RM_VALU,
- _______, _______, _______, _______, _______, _______, KC_SCRL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END, _______,
+ _______, _______, _______, _______, _______, _______, KC_INS, _______, KC_UP, KC_PAUS, KC_PGUP, KC_HOME, KC_PSCR,
+ _______, _______, _______, _______, _______, _______, KC_SCRL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END, RM_VALU, _______,
_______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, RM_VALD, _______,
_______, GU_TOGG, _______, _______, _______, _______, RM_HUEU, RM_NEXT
)