Added on/off control for aura lightbar, lid and logo

app/AnimeMatrix/AnimeMatrixDevice.cs

@@ -1,14 +1,10 @@
 // Source thanks to https://github.com/vddCore/Starlight with some adjustments from me
 
 using Starlight.Communication;
-using System.Management;
 using System.Drawing.Drawing2D;
-using System.Text;
 using System.Globalization;
-using System;
+using System.Management;
-using System.Drawing;
+using System.Text;
-using OSD;
-using System.Diagnostics;
 
 namespace Starlight.AnimeMatrix
 {

app/Aura.cs

@@ -208,25 +208,37 @@ namespace GHelper
 
             List<AuraDev19b6> flags = new List<AuraDev19b6>();
 
-            if (awake) flags.Add(AuraDev19b6.AwakeKeyb);
+            if (awake)
-            if (boot) flags.Add(AuraDev19b6.BootKeyb);
+            {
-            if (sleep) flags.Add(AuraDev19b6.SleepKeyb);
+                flags.Add(AuraDev19b6.AwakeKeyb);
-            if (shutdown) flags.Add(AuraDev19b6.ShutdownKeyb);
-
                 flags.Add(AuraDev19b6.AwakeBar);
-            flags.Add(AuraDev19b6.BootBar);
-            flags.Add(AuraDev19b6.SleepBar);
-            flags.Add(AuraDev19b6.ShutdownBar);
-
                 flags.Add(AuraDev19b6.AwakeLid);
-            flags.Add(AuraDev19b6.BootLid);
-            flags.Add(AuraDev19b6.SleepLid);
-            flags.Add(AuraDev19b6.ShutdownLid);
-
                 flags.Add(AuraDev19b6.AwakeLogo);
+            }
+
+            if (boot)
+            {
+                flags.Add(AuraDev19b6.BootKeyb);
+                flags.Add(AuraDev19b6.BootBar);
+                flags.Add(AuraDev19b6.BootLid);
                 flags.Add(AuraDev19b6.BootLogo);
+            }
+
+            if (sleep)
+            {
+                flags.Add(AuraDev19b6.SleepKeyb);
+                flags.Add(AuraDev19b6.SleepBar);
+                flags.Add(AuraDev19b6.SleepLid);
                 flags.Add(AuraDev19b6.SleepLogo);
+            }
+
+            if (shutdown)
+            {
+                flags.Add(AuraDev19b6.ShutdownKeyb);
+                flags.Add(AuraDev19b6.ShutdownBar);
+                flags.Add(AuraDev19b6.ShutdownLid);
                 flags.Add(AuraDev19b6.ShutdownLogo);
+            }
 
             byte[] msg = AuraDev19b6Extensions.ToBytes(flags.ToArray());
 

app/ControlHelper.cs

@@ -1,8 +1,7 @@
 using CustomControls;
-using WinFormsSliderBar;
 using System.Drawing.Drawing2D;
 using System.Windows.Forms.DataVisualization.Charting;
-using System.Windows.Forms;
+using WinFormsSliderBar;
 
 public static class ControlHelper
 {

app/CustomControls.cs

@@ -30,6 +30,11 @@ namespace CustomControls
 
         public bool darkTheme = false;
 
+        public RForm()
+        {
+            DoubleBuffered = true;
+        }
+
         public static void InitColors(bool darkTheme)
         {
             if (darkTheme)
@@ -332,8 +337,9 @@ namespace CustomControls
 
         public RButton()
         {
-            this.FlatStyle = FlatStyle.Flat;
+            DoubleBuffered = true;
-            this.FlatAppearance.BorderSize = 0;
+            FlatStyle = FlatStyle.Flat;
+            FlatAppearance.BorderSize = 0;
         }
 
         private GraphicsPath GetFigurePath(Rectangle rect, int radius)

app/Fans.cs

@@ -1,7 +1,6 @@
-using System.Diagnostics;
+using CustomControls;
+using System.Diagnostics;
 using System.Windows.Forms.DataVisualization.Charting;
-using CustomControls;
-using GHelper.Gpu;
 
 namespace GHelper
 {

app/HardwareMonitor.cs

@@ -155,14 +155,16 @@ public static class HardwareMonitor
             }
 
             _gpuControl.Dispose();
+
+            /*
             _gpuControl = new AmdGpuControl();
             if (_gpuControl.IsValid)
             {
                 GpuControl = _gpuControl;
                 return;
             }
-
             _gpuControl.Dispose();
+            */
 
             GpuControl = null;
         }

app/Program.cs

@@ -5,7 +5,6 @@ using System.Management;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Security.Principal;
-using System.Windows.Forms;
 using Tools;
 
 namespace GHelper
@@ -173,11 +172,15 @@ namespace GHelper
                 SettingsToggle();
             }
 
+            settingsForm.RefreshSensors();
+
             Application.Run();
 
 
         }
 
+
+
         static void SystemEvents_UserPreferenceChanged(object sender, UserPreferenceChangedEventArgs e)
         {
 
@@ -373,6 +376,7 @@ namespace GHelper
             {
                 SettingsToggle();
             }
+
         }
 
 

app/Settings.cs

@@ -1,11 +1,11 @@
 using CustomControls;
 using Starlight.AnimeMatrix;
+using System;
 using System.Diagnostics;
 using System.Drawing.Imaging;
-using System.Globalization;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Text.Json;
-using System.Threading;
 using System.Timers;
 using Tools;
 
@@ -16,7 +16,7 @@ namespace GHelper
     {
 
         private ContextMenuStrip contextMenuStrip = new CustomContextMenu();
-        private ToolStripMenuItem menuSilent, menuBalanced, menuTurbo;
+        private ToolStripMenuItem menuSilent, menuBalanced, menuTurbo, menuEco, menuStandard, menuUltimate, menuOptimized;
 
         public static System.Timers.Timer aTimer = default!;
         public static Point trayPoint;
@@ -132,6 +132,7 @@ namespace GHelper
 
             aTimer = new System.Timers.Timer(1000);
             aTimer.Elapsed += OnTimedEvent;
+            aTimer.Enabled = true;
 
             SetVersionLabel(Properties.Strings.VersionLabel + ": " + Assembly.GetExecutingAssembly().GetName().Version);
 
@@ -141,7 +142,7 @@ namespace GHelper
 
             labelModel.Text = model;
 
-            this.TopMost = Program.config.getConfig("topmost") == 1;
+            TopMost = Program.config.getConfig("topmost") == 1;
 
             SetContextMenu();
 
@@ -151,18 +152,49 @@ namespace GHelper
                 CheckForUpdatesAsync();
             });
 
-
         }
 
-        private void SetContextMenu()
+        public void SetContextMenu()
         {
 
+            contextMenuStrip.Items.Clear();
+
             Padding padding = new Padding(5, 5, 5, 5);
 
-            var menuTitle = new ToolStripMenuItem(Properties.Strings.PerformanceMode);
+            /*
-            menuTitle.Margin = padding;
+            TableLayoutPanel[] tables = { tablePerf, tableGPU };
-            menuTitle.Enabled = false;
+            string[] titles = { Properties.Strings.PerformanceMode, Properties.Strings.GPUMode};
-            contextMenuStrip.Items.Add(menuTitle);
+
+            int index = 0;
+            foreach (TableLayoutPanel table in tables)
+            {
+
+                var title = new ToolStripMenuItem(titles[index]);
+                title.Margin = padding;
+                title.Enabled = false;
+                contextMenuStrip.Items.Add(title);
+
+                foreach (Control control in table.Controls)
+                {
+                    var button = control as RButton;
+                    if (button != null && !button.Secondary && button.Enabled)
+                    {
+                        var menu = new ToolStripMenuItem(button.Text);
+                        menu.Margin = padding;
+                        menu.Checked = button.Activated;
+                        menu.Click += delegate { button.PerformClick(); };
+                        contextMenuStrip.Items.Add(menu);
+                    }
+                }
+                contextMenuStrip.Items.Add("-");
+                index++;
+            }*/
+
+
+            var title = new ToolStripMenuItem(Properties.Strings.PerformanceMode);
+            title.Margin = padding;
+            title.Enabled = false;
+            contextMenuStrip.Items.Add(title);
 
             menuSilent = new ToolStripMenuItem(Properties.Strings.Silent);
             menuSilent.Click += ButtonSilent_Click;
@@ -180,6 +212,40 @@ namespace GHelper
             menuTurbo.Margin = padding;
             contextMenuStrip.Items.Add(menuTurbo);
 
+            contextMenuStrip.Items.Add("-");
+
+            var titleGPU = new ToolStripMenuItem(Properties.Strings.GPUMode);
+            titleGPU.Margin = padding;
+            titleGPU.Enabled = false;
+            contextMenuStrip.Items.Add(titleGPU);
+
+            menuEco = new ToolStripMenuItem(Properties.Strings.EcoMode);
+            menuEco.Click += ButtonEco_Click;
+            menuEco.Margin = padding;
+            contextMenuStrip.Items.Add(menuEco);
+
+            menuStandard = new ToolStripMenuItem(Properties.Strings.StandardMode);
+            menuStandard.Click += ButtonStandard_Click;
+            menuStandard.Margin = padding;
+            contextMenuStrip.Items.Add(menuStandard);
+
+            menuUltimate = new ToolStripMenuItem(Properties.Strings.UltimateMode);
+            menuUltimate.Click += ButtonUltimate_Click;
+            menuUltimate.Margin = padding;
+            contextMenuStrip.Items.Add(menuUltimate);
+
+            menuOptimized = new ToolStripMenuItem(Properties.Strings.Optimized);
+            menuOptimized.Click += ButtonOptimized_Click;
+            menuOptimized.Margin = padding;
+            contextMenuStrip.Items.Add(menuOptimized);
+
+            contextMenuStrip.Items.Add("-");
+
+            var quit = new ToolStripMenuItem(Properties.Strings.Quit);
+            quit.Click += ButtonQuit_Click;
+            quit.Margin = padding;
+            contextMenuStrip.Items.Add(quit);
+
             contextMenuStrip.ShowCheckMargin = true;
             contextMenuStrip.RenderMode = ToolStripRenderMode.System;
 
@@ -199,7 +265,8 @@ namespace GHelper
             if (Program.wmi.DeviceGet(ASUSWmi.GPUXG) == 1)
             {
                 Program.wmi.DeviceSet(ASUSWmi.GPUXG, 0, "GPU XGM");
-            } else
+            }
+            else
             {
                 Program.wmi.DeviceSet(ASUSWmi.GPUXG, 1, "GPU XGM");
             }
@@ -802,7 +869,7 @@ namespace GHelper
             ButtonEnabled(buttonMiniled, screenEnabled);
 
             labelSreen.Text = screenEnabled
-                ? Properties.Strings.LaptopScreen + ": " + frequency + "Hz" + ((overdrive == 1) ? " + " + Properties.Strings.Overdrive : "")
+                ? Properties.Strings.LaptopScreen + ": " + frequency + "Hz" + ((overdrive == 1 && overdriveSetting) ? " + " + Properties.Strings.Overdrive : "")
                 : Properties.Strings.LaptopScreen + ": " + Properties.Strings.TurnedOff;
 
             button60Hz.Activated = false;
@@ -826,7 +893,8 @@ namespace GHelper
             {
                 button120Hz.Text = maxFrequency.ToString() + "Hz" + (overdriveSetting ? " + OD" : "");
                 panelScreen.Visible = true;
-            } else if (maxFrequency > 0)
+            }
+            else if (maxFrequency > 0)
             {
                 panelScreen.Visible = false;
             }
@@ -876,8 +944,7 @@ namespace GHelper
             SetGPUMode(ASUSWmi.GPUModeEco);
         }
 
-
+        public void RefreshSensors(bool force = false)
-        private void RefreshSensors(bool force = false)
         {
 
             if (!force && Math.Abs(DateTimeOffset.Now.ToUnixTimeMilliseconds() - lastRefresh) < 2000) return;
@@ -930,11 +997,7 @@ namespace GHelper
                 this.Top = Screen.FromControl(this).WorkingArea.Height - 10 - this.Height;
                 this.Activate();
 
-                Task.Run(async () =>
-                {
-                    await Task.Delay(TimeSpan.FromSeconds(1));
                 aTimer.Enabled = true;
-                });
 
             }
             else
@@ -1074,30 +1137,27 @@ namespace GHelper
             buttonBalanced.Activated = false;
             buttonTurbo.Activated = false;
 
-            menuSilent.Checked = false;
-            menuBalanced.Checked = false;
-            menuTurbo.Checked = false;
-
             switch (PerformanceMode)
             {
                 case ASUSWmi.PerformanceSilent:
                     buttonSilent.Activated = true;
-                    menuSilent.Checked = true;
                     perfName = Properties.Strings.Silent;
                     break;
                 case ASUSWmi.PerformanceTurbo:
                     buttonTurbo.Activated = true;
-                    menuTurbo.Checked = true;
                     perfName = Properties.Strings.Turbo;
                     break;
                 default:
                     buttonBalanced.Activated = true;
-                    menuBalanced.Checked = true;
                     PerformanceMode = ASUSWmi.PerformanceBalanced;
                     perfName = Properties.Strings.Balanced;
                     break;
             }
 
+            menuSilent.Checked = buttonSilent.Activated;
+            menuBalanced.Checked = buttonBalanced.Activated;
+            menuTurbo.Checked = buttonTurbo.Activated;
+
             int oldMode = Program.config.getConfig("performance_mode");
             Program.config.setConfig("performance_" + (int)SystemInformation.PowerStatus.PowerLineStatus, PerformanceMode);
             Program.config.setConfig("performance_mode", PerformanceMode);
@@ -1268,6 +1328,7 @@ namespace GHelper
                 tablePerf.ColumnCount = 0;
                 tableGPU.ColumnCount = 0;
                 tableScreen.ColumnCount = 0;
+                menuUltimate.Visible = false;
 
             }
             //tableLayoutMatrix.ColumnCount = 0;
@@ -1278,7 +1339,7 @@ namespace GHelper
             int connected = Program.wmi.DeviceGet(ASUSWmi.GPUXGConnected);
             int enabled = Program.wmi.DeviceGet(ASUSWmi.GPUXG);
 
-            buttonXGM.Visible = (connected == 1);
+            buttonXGM.Enabled = buttonXGM.Visible = (connected == 1);
             buttonXGM.Activated = (enabled == 1);
 
         }
@@ -1461,6 +1522,10 @@ namespace GHelper
                     break;
             }
 
+            menuEco.Checked = buttonEco.Activated;
+            menuStandard.Checked = buttonStandard.Activated;
+            menuUltimate.Checked = buttonUltimate.Activated;
+            menuOptimized.Checked = buttonOptimized.Activated;
 
         }
 

app/app.manifest

@@ -4,8 +4,6 @@
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-		  <requestedExecutionLevel level="asInvoker" uiAccess="false" />
-		  
         <!-- UAC Manifest Options
              If you want to change the Windows User Account Control level replace the 
              requestedExecutionLevel node with one of the following.