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

Add Cooler Master SK630 Keyboard support #2260

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Add Cooler Master SK630 Keyboard support #2260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b925e6f
add Cooler Master SK630 Keyboard support
Herringway Jan 16, 2021
8ade87c
Merge branch 'dev' into sk630
Herringway Sep 24, 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
144 changes: 144 additions & 0 deletions Project-Aurora/Project-Aurora/Devices/CoolerMaster/KeyMaps.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,6 +667,149 @@ public static class KeyMaps
[DK.ADDITIONALLIGHT57] = (7, 23),

};
public static readonly Dictionary<DK, (int row, int column)> SK630 = new Dictionary<DK, (int row, int column)>
{
[DK.ESC] = (0, 0),
[DK.F1] = (0, 1),
[DK.F2] = (0, 2),
[DK.F3] = (0, 3),
[DK.F4] = (0, 4),
[DK.F5] = (0, 6),
[DK.F6] = (0, 7),
[DK.F7] = (0, 8),
[DK.F8] = (0, 9),
[DK.F9] = (0, 11),
[DK.F10] = (0, 12),
[DK.F11] = (0, 13),
[DK.F12] = (0, 14),
[DK.PRINT_SCREEN] = (0, 15),
[DK.SCROLL_LOCK] = (0, 16),
[DK.PAUSE_BREAK] = (0, 17),
[DK.ADDITIONALLIGHT1] = (0, 22),
[DK.ADDITIONALLIGHT25] = (0, 23),
[DK.TILDE] = (1, 0),
[DK.ONE] = (1, 1),
[DK.TWO] = (1, 2),
[DK.THREE] = (1, 3),
[DK.FOUR] = (1, 4),
[DK.FIVE] = (1, 5),
[DK.SIX] = (1, 6),
[DK.SEVEN] = (1, 7),
[DK.EIGHT] = (1, 8),
[DK.NINE] = (1, 9),
[DK.ZERO] = (1, 10),
[DK.MINUS] = (1, 11),
[DK.EQUALS] = (1, 12),
[DK.BACKSPACE] = (1, 14),
[DK.INSERT] = (1, 15),
[DK.HOME] = (1, 16),
[DK.PAGE_UP] = (1, 17),
[DK.ADDITIONALLIGHT2] = (1, 22),
[DK.ADDITIONALLIGHT26] = (1, 23),
[DK.TAB] = (2, 0),
[DK.Q] = (2, 1),
[DK.W] = (2, 2),
[DK.E] = (2, 3),
[DK.R] = (2, 4),
[DK.T] = (2, 5),
[DK.Y] = (2, 6),
[DK.U] = (2, 7),
[DK.I] = (2, 8),
[DK.O] = (2, 9),
[DK.P] = (2, 10),
[DK.OPEN_BRACKET] = (2, 11),
[DK.CLOSE_BRACKET] = (2, 12),
[DK.BACKSLASH] = (2, 14),
[DK.DELETE] = (2, 15),
[DK.END] = (2, 16),
[DK.PAGE_DOWN] = (2, 17),
[DK.ADDITIONALLIGHT3] = (2, 22),
[DK.ADDITIONALLIGHT27] = (2, 23),
[DK.CAPS_LOCK] = (3, 0),
[DK.A] = (3, 1),
[DK.S] = (3, 2),
[DK.D] = (3, 3),
[DK.F] = (3, 4),
[DK.G] = (3, 5),
[DK.H] = (3, 6),
[DK.J] = (3, 7),
[DK.K] = (3, 8),
[DK.L] = (3, 9),
[DK.SEMICOLON] = (3, 10),
[DK.APOSTROPHE] = (3, 11),
[DK.HASHTAG] = (3, 12),
[DK.ENTER] = (3, 14),
[DK.ADDITIONALLIGHT4] = (3, 22),
[DK.ADDITIONALLIGHT28] = (3, 23),
[DK.LEFT_SHIFT] = (4, 0),
[DK.BACKSLASH_UK] = (4, 1),
[DK.Z] = (4, 2),
[DK.X] = (4, 3),
[DK.C] = (4, 4),
[DK.V] = (4, 5),
[DK.B] = (4, 6),
[DK.N] = (4, 7),
[DK.M] = (4, 8),
[DK.COMMA] = (4, 9),
[DK.PERIOD] = (4, 10),
[DK.FORWARD_SLASH] = (4, 11),
[DK.RIGHT_SHIFT] = (4, 14),
[DK.ARROW_UP] = (4, 16),
[DK.ADDITIONALLIGHT5] = (4, 22),
[DK.ADDITIONALLIGHT29] = (4, 23),
[DK.LEFT_CONTROL] = (5, 0),
[DK.LEFT_WINDOWS] = (5, 1),
[DK.LEFT_ALT] = (5, 2),
[DK.SPACE] = (5, 6),
[DK.RIGHT_ALT] = (5, 10),
[DK.RIGHT_WINDOWS] = (5, 11),
[DK.APPLICATION_SELECT] = (5, 12),
[DK.RIGHT_CONTROL] = (5, 14),
[DK.ARROW_LEFT] = (5, 15),
[DK.ARROW_DOWN] = (5, 16),
[DK.ARROW_RIGHT] = (5, 17),
[DK.ADDITIONALLIGHT6] = (6, 0),
[DK.ADDITIONALLIGHT7] = (6, 1),
[DK.ADDITIONALLIGHT8] = (6, 2),
[DK.ADDITIONALLIGHT9] = (6, 3),
[DK.ADDITIONALLIGHT10] = (6, 4),
[DK.ADDITIONALLIGHT11] = (6, 5),
[DK.ADDITIONALLIGHT12] = (6, 6),
[DK.ADDITIONALLIGHT13] = (6, 7),
[DK.ADDITIONALLIGHT14] = (6, 8),
[DK.ADDITIONALLIGHT15] = (6, 9),
[DK.ADDITIONALLIGHT16] = (6, 10),
[DK.ADDITIONALLIGHT17] = (6, 11),
[DK.ADDITIONALLIGHT18] = (6, 12),
[DK.ADDITIONALLIGHT19] = (6, 13),
[DK.ADDITIONALLIGHT20] = (6, 14),
[DK.ADDITIONALLIGHT21] = (6, 15),
[DK.ADDITIONALLIGHT22] = (6, 16),
[DK.ADDITIONALLIGHT23] = (6, 17),
[DK.ADDITIONALLIGHT24] = (6, 18),
[DK.ADDITIONALLIGHT30] = (7, 0),
[DK.ADDITIONALLIGHT31] = (7, 1),
[DK.ADDITIONALLIGHT32] = (7, 2),
[DK.ADDITIONALLIGHT33] = (7, 3),
[DK.ADDITIONALLIGHT34] = (7, 4),
[DK.ADDITIONALLIGHT35] = (7, 5),
[DK.ADDITIONALLIGHT36] = (7, 6),
[DK.ADDITIONALLIGHT37] = (7, 7),
[DK.ADDITIONALLIGHT38] = (7, 8),
[DK.ADDITIONALLIGHT39] = (7, 9),
[DK.ADDITIONALLIGHT40] = (7, 10),
[DK.ADDITIONALLIGHT41] = (7, 11),
[DK.ADDITIONALLIGHT42] = (7, 12),
[DK.ADDITIONALLIGHT43] = (7, 13),
[DK.ADDITIONALLIGHT44] = (7, 14),
[DK.ADDITIONALLIGHT45] = (7, 15),
[DK.ADDITIONALLIGHT46] = (7, 16),
[DK.ADDITIONALLIGHT47] = (7, 17),
[DK.ADDITIONALLIGHT48] = (7, 18),
[DK.ADDITIONALLIGHT49] = (7, 19),
[DK.ADDITIONALLIGHT50] = (7, 20),

};


public static readonly Dictionary<Native.DEVICE_INDEX, Dictionary<DK, (int row, int column)>> LayoutMapping = new Dictionary<Native.DEVICE_INDEX, Dictionary<DK, (int row, int column)>>
Expand All @@ -684,6 +827,7 @@ public static class KeyMaps
[Native.DEVICE_INDEX.MK750] = MK750,
[Native.DEVICE_INDEX.MK730] = MK730,
[Native.DEVICE_INDEX.SK650] = SK650,
[Native.DEVICE_INDEX.SK630] = SK630,

//TODO
[Native.DEVICE_INDEX.MMouse_L] = new Dictionary<DK, (int row, int column)>()
Expand Down
2 changes: 2 additions & 0 deletions Project-Aurora/Project-Aurora/Settings/Configuration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,8 @@ public enum PreferredKeyboard
Masterkeys_MK730 = 504,
[Description("Cooler Master - SK650")]
Cooler_Master_SK650 = 505,
[Description("Cooler Master - SK630")]
Cooler_Master_SK630 = 506,

//Roccat range is 600-699
[Description("Roccat Ryos")]
Expand Down
2 changes: 2 additions & 0 deletions Project-Aurora/Project-Aurora/Settings/KeyboardLayoutManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,6 +738,8 @@ public void LoadBrand(PreferredKeyboard keyboard_preference = PreferredKeyboard.
layoutConfigPath = Path.Combine(layoutsPath, "masterkeys_mk730.json");
else if (keyboard_preference == PreferredKeyboard.Cooler_Master_SK650)
layoutConfigPath = Path.Combine(layoutsPath, "cooler_master_sk650.json");
else if (keyboard_preference == PreferredKeyboard.Cooler_Master_SK630)
layoutConfigPath = Path.Combine(layoutsPath, "cooler_master_sk630.json");
else if (keyboard_preference == PreferredKeyboard.Roccat_Ryos)
layoutConfigPath = Path.Combine(layoutsPath, "roccat_ryos.json");
else if (keyboard_preference == PreferredKeyboard.SteelSeries_Apex_M800)
Expand Down
Loading