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

Support for Logitech G815 and G513 #1802

Merged
merged 9 commits into from
May 17, 2020
Merged

Support for Logitech G815 and G513 #1802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
20fbf95
Support for Logitech G815 and G513 (for real this time)
lucyydotp Nov 12, 2019
181c45c
Fixed new layouts not being copied to the output folder
diogotr7 Nov 12, 2019
2e189db
Added FN key cosmetic change for G513
lucyydotp Nov 13, 2019
e9a31af
Merge branch 'dev' into dev
lucyydotp Nov 29, 2019
ebea477
Merge branch 'dev' into dev
lucyydotp Dec 11, 2019
c7291e6
Merge branch 'dev' into dev
lucyydotp Mar 17, 2020
890c21f
Merge branch 'dev' into g815
diogotr7 May 17, 2020
318bee5
fixed tabs, removed g213 duplicate
diogotr7 May 17, 2020
4d729c7
Merge branch 'dev' into dev
diogotr7 May 17, 2020
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
9 changes: 9 additions & 0 deletions Project-Aurora/Project-Aurora/Project-Aurora.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,6 +827,15 @@
<Content Include="kb_layouts\Extra Features\images\Roccat_Kone_Pure_outline.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<None Include="kb_layouts\Extra Features\logitech_g815_features.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="kb_layouts\logitech_g513.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="kb_layouts\logitech_g815.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<Content Include="Profiles\Overlays\SkypeOverlay\Event_SkypeOverlay.cs" />
<Content Include="Profiles\Overlays\SkypeOverlay\SkypeOverlaySettings.cs" />
<Content Include="Profiles\Overlays\SkypeOverlay\State_SkypeOverlay.cs" />
Expand Down
6 changes: 5 additions & 1 deletion Project-Aurora/Project-Aurora/Settings/Configuration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,11 @@ public enum PreferredKeyboard
Logitech_GPRO = 103,
[Description("Logitech - G213")]
Logitech_G213 = 104,

[Description("Logitech - G815")]
diogotr7 marked this conversation as resolved.
Show resolved Hide resolved
Logitech_G815 = 105,
[Description("Logitech - G513")]
Logitech_G513 = 106,

//Corsair range is 200-299
[Description("Corsair - K95")]
Corsair_K95 = 200,
Expand Down
4 changes: 4 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 @@ -696,6 +696,10 @@ public void LoadBrand(PreferredKeyboard keyboard_preference = PreferredKeyboard.
layoutConfigPath = Path.Combine(layoutsPath, "logitech_gpro.json");
else if (keyboard_preference == PreferredKeyboard.Logitech_G410)
layoutConfigPath = Path.Combine(layoutsPath, "logitech_g410.json");
else if (keyboard_preference == PreferredKeyboard.Logitech_G815)
layoutConfigPath = Path.Combine(layoutsPath, "logitech_g815.json");
else if (keyboard_preference == PreferredKeyboard.Logitech_G513)
layoutConfigPath = Path.Combine(layoutsPath, "logitech_g513.json");
else if (keyboard_preference == PreferredKeyboard.Logitech_G213)
layoutConfigPath = Path.Combine(layoutsPath, "logitech_g213.json");
else if (keyboard_preference == PreferredKeyboard.Corsair_K95)
Expand Down
97 changes: 97 additions & 0 deletions Project-Aurora/Project-Aurora/kb_layouts/Extra Features/logitech_g815_features.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
{
"group_tag": "keyboard",
"origin_region": 1,
"grouped_keys": [
{
"visualName": "LOGO",
"tag": 128,
"margin_left": -47.0,
"margin_top": -45.0,
"width": 35.0,
"height": 35.0,
"font_size": 9.0,
"width_bits": 3,
"height_bits": 3,
"margin_left_bits": -4,
"margin_top_bits": 0,
"image": "Logi_G810_logo.png",
"enabled": true,
"absolute_location": true
},
{
"visualName": "G1",
"tag": 108,
"margin_left": -45.0,
"margin_top": 37.0,
"width": 30.0,
"height": 30.0,
"font_size": 12.0,
"width_bits": 3,
"height_bits": 3,
"margin_left_bits": -4,
"margin_top_bits": 3,
"enabled": true,
"absolute_location": true
},
{
"visualName": "G2",
"tag": 109,
"margin_left": -45.0,
"margin_top": 74.0,
"width": 30.0,
"height": 30.0,
"font_size": 12.0,
"width_bits": 3,
"height_bits": 3,
"margin_left_bits": -4,
"margin_top_bits": 6,
"enabled": true,
"absolute_location": true
},
{
"visualName": "G3",
"tag": 110,
"margin_left": -45.0,
"margin_top": 111.0,
"width": 30.0,
"height": 30.0,
"font_size": 12.0,
"width_bits": 3,
"height_bits": 3,
"margin_left_bits": -4,
"margin_top_bits": 9,
"enabled": true,
"absolute_location": true
},
{
"visualName": "G4",
"tag": 111,
"margin_left": -45.0,
"margin_top": 148.0,
"width": 30.0,
"height": 30.0,
"font_size": 12.0,
"width_bits": 3,
"height_bits": 3,
"margin_left_bits": -4,
"margin_top_bits": 12,
"enabled": true,
"absolute_location": true
},
{
"visualName": "G5",
"tag": 112,
"margin_left": -45.0,
"margin_top": 185.0,
"width": 30.0,
"height": 30.0,
"font_size": 12.0,
"width_bits": 3,
"height_bits": 3,
"margin_left_bits": -4,
"margin_top_bits": 15,
"enabled": true,
"absolute_location": true
}
]
}
21 changes: 21 additions & 0 deletions Project-Aurora/Project-Aurora/kb_layouts/logitech_g513.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"keys_to_remove": [],
"key_modifications": {
"99": {
"visualName": "FN",
"tag": 99,
"line_break": null,
"margin_left": null,
"margin_top": null,
"width": null,
"height": null,
"font_size": null,
"width_bits": null,
"height_bits": null,
"margin_left_bits": null,
"margin_top_bits": null,
"enabled": null
}
},
"included_features": []
}
7 changes: 7 additions & 0 deletions Project-Aurora/Project-Aurora/kb_layouts/logitech_g815.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"keys_to_remove": [],
"key_modifications": {},
"included_features": [
"logitech_g815_features.json"
]
}