Merge branch 'seerge:main' into brightnessControls

app/AsusUSB.cs

@@ -175,12 +175,14 @@ namespace GHelper
 
         public static void SetColor(int colorCode)
         {
-            Color1 = Color.FromArgb(colorCode);
+            if (colorCode == -1) Color1 = Color.Red;
+            else Color1 = Color.FromArgb(colorCode);
         }
 
         public static void SetColor2(int colorCode)
         {
-            Color2 = Color.FromArgb(colorCode);
+            if (colorCode == -1) Color2 = Color.White;
+            else Color2 = Color.FromArgb(colorCode);
         }
 
 
@@ -367,6 +369,11 @@ namespace GHelper
         public static void ApplyAura()
         {
 
+            Mode = AppConfig.Get("aura_mode");
+            Speed = AppConfig.Get("aura_speed");
+            SetColor(AppConfig.Get("aura_color"));
+            SetColor2(AppConfig.Get("aura_color2"));
+
             int _speed;
 
             switch (Speed)

app/Extra.cs

@@ -444,7 +444,7 @@ namespace GHelper
         private void ComboKeyboardSpeed_SelectedValueChanged(object? sender, EventArgs e)
         {
             AppConfig.Set("aura_speed", (int)comboKeyboardSpeed.SelectedValue);
-            Program.settingsForm.SetAura();
+            AsusUSB.ApplyAura();
         }
 
 

app/Helpers/ToastForm.cs

@@ -132,6 +132,9 @@ namespace GHelper.Helpers
 
         public void RunToast(string text, ToastIcon? icon = null)
         {
+
+            if (AppConfig.Is("disable_osd")) return;
+
             Program.settingsForm.Invoke(delegate
             {
                 //Hide();

app/Settings.cs

@@ -489,7 +489,8 @@ namespace GHelper
             if (colorDlg.ShowDialog() == DialogResult.OK)
             {
                 AppConfig.Set("aura_color2", colorDlg.Color.ToArgb());
-                SetAura();
+                AsusUSB.ApplyAura();
+                VisualiseAura();
             }
         }
 
@@ -554,7 +555,8 @@ namespace GHelper
             if (colorDlg.ShowDialog() == DialogResult.OK)
             {
                 AppConfig.Set("aura_color", colorDlg.Color.ToArgb());
-                SetAura();
+                AsusUSB.ApplyAura();
+                VisualiseAura();
             }
         }
 
@@ -572,9 +574,6 @@ namespace GHelper
             comboKeyboard.SelectedValue = AsusUSB.Mode;
             comboKeyboard.SelectedValueChanged += ComboKeyboard_SelectedValueChanged;
 
-            pictureColor.BackColor = AsusUSB.Color1;
-            pictureColor2.BackColor = AsusUSB.Color2;
-            pictureColor2.Visible = AsusUSB.HasSecondColor();
 
             if (AsusUSB.HasColor())
             {
@@ -586,6 +585,15 @@ namespace GHelper
                 comboKeyboard.Visible = false;
             }
 
+            VisualiseAura();
+
+        }
+
+        public void VisualiseAura()
+        {
+            pictureColor.BackColor = AsusUSB.Color1;
+            pictureColor2.BackColor = AsusUSB.Color2;
+            pictureColor2.Visible = AsusUSB.HasSecondColor();
         }
 
         public void InitMatrix()
@@ -606,21 +614,6 @@ namespace GHelper
         }
 
 
-        public void SetAura()
-        {
-            AsusUSB.Mode = AppConfig.Get("aura_mode");
-            AsusUSB.Speed = AppConfig.Get("aura_speed");
-            AsusUSB.SetColor(AppConfig.Get("aura_color"));
-            AsusUSB.SetColor2(AppConfig.Get("aura_color2"));
-
-            pictureColor.BackColor = AsusUSB.Color1;
-            pictureColor2.BackColor = AsusUSB.Color2;
-            pictureColor2.Visible = AsusUSB.HasSecondColor();
-
-            AsusUSB.ApplyAura();
-
-        }
-
         public void CycleAuraMode()
         {
             if (comboKeyboard.SelectedIndex < comboKeyboard.Items.Count - 1)
@@ -632,7 +625,8 @@ namespace GHelper
         private void ComboKeyboard_SelectedValueChanged(object? sender, EventArgs e)
         {
             AppConfig.Set("aura_mode", (int)comboKeyboard.SelectedValue);
-            SetAura();
+            AsusUSB.ApplyAura();
+            VisualiseAura();
         }
 
 
@@ -861,9 +855,11 @@ namespace GHelper
 
         public void AutoKeyboard()
         {
-            InputDispatcher.SetBacklightAuto(true);
 
             AsusUSB.ApplyAuraPower();
+            AsusUSB.ApplyAura();
+
+            InputDispatcher.SetBacklightAuto(true);
 
             if (Program.acpi.IsXGConnected())
                 AsusUSB.ApplyXGMLight(AppConfig.Is("xmg_light"));

docs/README.md

@@ -219,13 +219,11 @@ Full list of keycodes https://learn.microsoft.com/en-us/windows/win32/inputdev/v
 
 ![Screenshot 2023-07-17 192155](https://github.com/seerge/g-helper/assets/5920850/e450e124-1589-4787-bce8-7c37ffe72fbd)
 
-### Workaround for [bugged bios on G15](https://github.com/seerge/g-helper/issues/253) when external monitor is connected
+### Disable OSD
-
+You can disable app's OSD (for performance modes, keyboard backlight, etc) by adding following line to ``%AppData%\GHelper\config.json``
-Some people reported that on G15 model bios can be bugged and either not turn on or not turn off fans, when you set custom fan curve (in Armoury or g-helper, or any other app)
+```
-I have added a very optional workaround as it was asked, on launch app will try to disable and re-enable dGPU when external monitor is connected, that seems to wake up fans :)
+"disable_osd": 1,
-
+```
-To enable this custom workaround you need to add an extra line in config.json (under ``%AppData%\GHelper``) 
-``gpu_reenable : 1,``
 
 ### Keybinding to toggle performance modes (on external keyboards)