From cbe05b1a7c6329007e622cf3704788adf22e6823 Mon Sep 17 00:00:00 2001 From: Serge <5920850+seerge@users.noreply.github.com> Date: Tue, 1 Aug 2023 22:30:14 +0200 Subject: [PATCH 1/3] Update README.md --- docs/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/README.md b/docs/README.md index cf8d5663..89c7719a 100644 --- a/docs/README.md +++ b/docs/README.md @@ -244,6 +244,8 @@ You can disable app's OSD (for performance modes, keyboard backlight, etc) by ad - ``Ctrl + M1 / M2`` - Screen brightness Down / Up - ``Shift + M1 / M2`` - Backlight brightness Down / Up +If you don't want this bindings to work you can add ``"skip_hotkeys":1,`` to ``%AppData%\GHelper\config.json`` + ### Keybinding to toggle performance modes (on external keyboards) By default the app will toggle performance modes with Ctr+Shift+F5. You can change this binding by adding ``"keybind_profile": 116`` in config.json (under ``%AppData%\GHelper``), where 116 is [numerical code for desired key](https://www.oreilly.com/library/view/javascript-dhtml/9780596514082/apb.html). Put 0 to completely disable this binding. From fbdfdd2f03c152b1cb27ad15dd5f6556fc775f8a Mon Sep 17 00:00:00 2001 From: Serge <5920850+seerge@users.noreply.github.com> Date: Tue, 1 Aug 2023 22:45:38 +0200 Subject: [PATCH 2/3] Skip custom keybindings https://github.com/seerge/g-helper/issues/960 --- app/AsusUSB.cs | 9 ++++++--- app/Input/InputDispatcher.cs | 15 ++++++++++----- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/app/AsusUSB.cs b/app/AsusUSB.cs index 2322d1f9..61943a57 100644 --- a/app/AsusUSB.cs +++ b/app/AsusUSB.cs @@ -508,13 +508,16 @@ namespace GHelper auraDevice.WriteFeatureData(LED_INIT3); auraDevice.WriteFeatureData(LED_INIT4); auraDevice.WriteFeatureData(LED_INIT5); - auraDevice.WriteFeatureData(PrepareAuraMessage(new byte[] { AURA_HID_ID, 0xbc, 1, 0, 0, 0 })); - auraDevice.WriteFeatureData(PrepareAuraMessage(new byte[] { AURA_HID_ID, 0xbc, 1, 1, 4, 0 })); + + auraDevice.WriteFeatureData(new byte[] { AURA_HID_ID, 0xbc, 1, 0, 0 }); + auraDevice.WriteFeatureData(new byte[] { AURA_HID_ID, 0xbc, 1, 1, 4 }); } + auraDevice.WriteFeatureData(new byte[] { AURA_HID_ID, 0xbc, 1, 0, 0 }); auraDevice.WriteFeatureData(msg); - } else + } + else { auraDevice.WriteFeatureData(AuraMessage(0, color, color, 0)); auraDevice.WriteFeatureData(MESSAGE_SET); diff --git a/app/Input/InputDispatcher.cs b/app/Input/InputDispatcher.cs index 88a6bed8..9d4cffa7 100644 --- a/app/Input/InputDispatcher.cs +++ b/app/Input/InputDispatcher.cs @@ -104,14 +104,19 @@ namespace GHelper.Input if (keyProfile != Keys.None) hook.RegisterHotKey(ModifierKeys.Shift | ModifierKeys.Control, keyProfile); if (keyApp != Keys.None) hook.RegisterHotKey(ModifierKeys.Shift | ModifierKeys.Control, keyApp); - hook.RegisterHotKey(ModifierKeys.Control, Keys.VolumeDown); - hook.RegisterHotKey(ModifierKeys.Control, Keys.VolumeUp); - hook.RegisterHotKey(ModifierKeys.Shift, Keys.VolumeDown); - hook.RegisterHotKey(ModifierKeys.Shift, Keys.VolumeUp); + if (!AppConfig.Is("skip_hotkeys")) + { + hook.RegisterHotKey(ModifierKeys.Control, Keys.VolumeDown); + hook.RegisterHotKey(ModifierKeys.Control, Keys.VolumeUp); + hook.RegisterHotKey(ModifierKeys.Shift, Keys.VolumeDown); + hook.RegisterHotKey(ModifierKeys.Shift, Keys.VolumeUp); + } if (!AppConfig.ContainsModel("Z13")) + { if (actionM1 is not null && actionM1.Length > 0) hook.RegisterHotKey(ModifierKeys.None, Keys.VolumeDown); - if (actionM2 is not null && actionM2.Length > 0) hook.RegisterHotKey(ModifierKeys.None, Keys.VolumeUp); + if (actionM2 is not null && actionM2.Length > 0) hook.RegisterHotKey(ModifierKeys.None, Keys.VolumeUp); + } // FN-Lock group From 33311611ab0a3a0267b3991a568e2d4eaaf2d401 Mon Sep 17 00:00:00 2001 From: Serge <5920850+seerge@users.noreply.github.com> Date: Tue, 1 Aug 2023 23:54:13 +0200 Subject: [PATCH 3/3] Fixed heatmap https://github.com/seerge/g-helper/issues/967 --- app/AsusUSB.cs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/app/AsusUSB.cs b/app/AsusUSB.cs index 61943a57..aff68f3b 100644 --- a/app/AsusUSB.cs +++ b/app/AsusUSB.cs @@ -503,24 +503,24 @@ namespace GHelper if (init) { - auraDevice.WriteFeatureData(LED_INIT1); - auraDevice.WriteFeatureData(LED_INIT2); - auraDevice.WriteFeatureData(LED_INIT3); - auraDevice.WriteFeatureData(LED_INIT4); - auraDevice.WriteFeatureData(LED_INIT5); + auraDevice.Write(LED_INIT1); + auraDevice.Write(LED_INIT2); + auraDevice.Write(LED_INIT3); + auraDevice.Write(LED_INIT4); + auraDevice.Write(LED_INIT5); - auraDevice.WriteFeatureData(new byte[] { AURA_HID_ID, 0xbc, 1, 0, 0 }); - auraDevice.WriteFeatureData(new byte[] { AURA_HID_ID, 0xbc, 1, 1, 4 }); + auraDevice.Write(new byte[] { AURA_HID_ID, 0xbc, 1, 0, 0 }); + auraDevice.Write(new byte[] { AURA_HID_ID, 0xbc, 1, 1, 4 }); } - auraDevice.WriteFeatureData(new byte[] { AURA_HID_ID, 0xbc, 1, 0, 0 }); - auraDevice.WriteFeatureData(msg); + //auraDevice.Write(new byte[] { AURA_HID_ID, 0xbc, 1, 0, 0 }); + auraDevice.Write(msg); } else { - auraDevice.WriteFeatureData(AuraMessage(0, color, color, 0)); - auraDevice.WriteFeatureData(MESSAGE_SET); + auraDevice.Write(AuraMessage(0, color, color, 0)); + auraDevice.Write(MESSAGE_SET); } }