From da8df7bc41f550c6c752f0eb39f5ca6d670f970e Mon Sep 17 00:00:00 2001 From: yener90 Date: Sun, 21 Feb 2021 20:29:48 +0100 Subject: [PATCH] Proper Logitech G815 support --- .../Devices/OpenRGB/OpenRGBKeyNames.cs | 3 + ....json => logitech_g815_left_features.json} | 16 ----- .../logitech_g815_right_features.json | 66 +++++++++++++++++++ .../logitech_g815_top_features.json | 37 +++++++++++ .../kb_layouts/logitech_g815.json | 4 +- 5 files changed, 109 insertions(+), 17 deletions(-) rename Project-Aurora/Project-Aurora/kb_layouts/Extra Features/{logitech_g815_features.json => logitech_g815_left_features.json} (82%) create mode 100644 Project-Aurora/Project-Aurora/kb_layouts/Extra Features/logitech_g815_right_features.json create mode 100644 Project-Aurora/Project-Aurora/kb_layouts/Extra Features/logitech_g815_top_features.json diff --git a/Project-Aurora/Project-Aurora/Devices/OpenRGB/OpenRGBKeyNames.cs b/Project-Aurora/Project-Aurora/Devices/OpenRGB/OpenRGBKeyNames.cs index 08f450b04..136c7565e 100644 --- a/Project-Aurora/Project-Aurora/Devices/OpenRGB/OpenRGBKeyNames.cs +++ b/Project-Aurora/Project-Aurora/Devices/OpenRGB/OpenRGBKeyNames.cs @@ -128,6 +128,7 @@ public static class OpenRGBKeyNames { "Key: Media Play/Pause" , DK.MEDIA_PLAY_PAUSE }, { "Key: Media Mute" , DK.VOLUME_MUTE }, { "Logo" , DK.LOGO }, + { "Lighting" , DK.BRIGHTNESS_SWITCH }, { "Key: Brightness" , DK.BRIGHTNESS_SWITCH }, { "Key: M1" , DK.G1 }, { "Key: M2" , DK.G2 }, @@ -138,6 +139,8 @@ public static class OpenRGBKeyNames { "Key: G1" , DK.G1 }, { "Key: G2" , DK.G2 }, { "Key: G3" , DK.G3 }, + { "Key: G4" , DK.G4 }, + { "Key: G5" , DK.G5 }, }; public static readonly Dictionary Mouse = new Dictionary() diff --git a/Project-Aurora/Project-Aurora/kb_layouts/Extra Features/logitech_g815_features.json b/Project-Aurora/Project-Aurora/kb_layouts/Extra Features/logitech_g815_left_features.json similarity index 82% rename from Project-Aurora/Project-Aurora/kb_layouts/Extra Features/logitech_g815_features.json rename to Project-Aurora/Project-Aurora/kb_layouts/Extra Features/logitech_g815_left_features.json index 23d8b87e5..4051c6e55 100644 --- a/Project-Aurora/Project-Aurora/kb_layouts/Extra Features/logitech_g815_features.json +++ b/Project-Aurora/Project-Aurora/kb_layouts/Extra Features/logitech_g815_left_features.json @@ -2,22 +2,6 @@ "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, diff --git a/Project-Aurora/Project-Aurora/kb_layouts/Extra Features/logitech_g815_right_features.json b/Project-Aurora/Project-Aurora/kb_layouts/Extra Features/logitech_g815_right_features.json new file mode 100644 index 000000000..723a355cd --- /dev/null +++ b/Project-Aurora/Project-Aurora/kb_layouts/Extra Features/logitech_g815_right_features.json @@ -0,0 +1,66 @@ +{ + "group_tag": "keyboard", + "origin_region": 2, + "grouped_keys": [ + { + "visualName": "PREV", + "tag": 137, + "margin_left": -141.0, + "margin_top": 45.0, + "width": 30.0, + "height": 30.0, + "font_size": 12.0, + "width_bits": 3, + "height_bits": 3, + "margin_left_bits": -12, + "margin_top_bits": 0, + "enabled": true, + "absolute_location": true + }, + { + "visualName": "PLAY", + "tag": 133, + "margin_left": -104.0, + "margin_top": 45.0, + "width": 30.0, + "height": 30.0, + "font_size": 12.0, + "width_bits": 3, + "height_bits": 3, + "margin_left_bits": -9, + "margin_top_bits": 0, + "enabled": true, + "absolute_location": true + }, + { + "visualName": "NEXT", + "tag": 138, + "margin_left": -67.0, + "margin_top": 45.0, + "width": 30.0, + "height": 30.0, + "font_size": 12.0, + "width_bits": 3, + "height_bits": 3, + "margin_left_bits": -6, + "margin_top_bits": 0, + "enabled": true, + "absolute_location": true + }, + { + "visualName": "Mute", + "tag": 139, + "margin_left": -30.0, + "margin_top": 45.0, + "width": 30.0, + "height": 30.0, + "font_size": 12.0, + "width_bits": 3, + "height_bits": 3, + "margin_left_bits": -3, + "margin_top_bits": 0, + "enabled": true, + "absolute_location": true + } + ] +} \ No newline at end of file diff --git a/Project-Aurora/Project-Aurora/kb_layouts/Extra Features/logitech_g815_top_features.json b/Project-Aurora/Project-Aurora/kb_layouts/Extra Features/logitech_g815_top_features.json new file mode 100644 index 000000000..7096b8551 --- /dev/null +++ b/Project-Aurora/Project-Aurora/kb_layouts/Extra Features/logitech_g815_top_features.json @@ -0,0 +1,37 @@ +{ + "group_tag": "keyboard", + "origin_region": 1, + "grouped_keys": [ + { + "visualName": "LOGO", + "tag": 128, + "margin_left": 0.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": "LIGHT", + "tag": 131, + "margin_left": 319.0, + "margin_top": -37.0, + "width": 30.0, + "height": 30.0, + "font_size": 12.0, + "width_bits": 3, + "height_bits": 3, + "margin_left_bits": -12, + "margin_top_bits": 0, + "enabled": true, + "absolute_location": true + } + ] +} \ No newline at end of file diff --git a/Project-Aurora/Project-Aurora/kb_layouts/logitech_g815.json b/Project-Aurora/Project-Aurora/kb_layouts/logitech_g815.json index 914b8a9dc..74641cf84 100644 --- a/Project-Aurora/Project-Aurora/kb_layouts/logitech_g815.json +++ b/Project-Aurora/Project-Aurora/kb_layouts/logitech_g815.json @@ -2,6 +2,8 @@ "keys_to_remove": [], "key_modifications": {}, "included_features": [ - "logitech_g815_features.json" + "logitech_g815_left_features.json", + "logitech_g815_top_features.json", + "logitech_g815_right_features.json", ] } \ No newline at end of file