Merge branch 'main' of https://github.com/seerge/g-helper

app/ASUSWmi.cs

@@ -12,6 +12,7 @@ public class ASUSWmi
 
     public const uint CPU_Fan = 0x00110013;
     public const uint GPU_Fan = 0x00110014;
+    public const uint Mid_Fan = 0x00110031;
 
     public const uint PerformanceMode = 0x00120075; // Thermal Control
 
@@ -24,6 +25,7 @@ public class ASUSWmi
 
     public const uint DevsCPUFanCurve = 0x00110024;
     public const uint DevsGPUFanCurve = 0x00110025;
+    public const uint DevsMidFanCurve = 0x00110032;
 
     public const int PPT_TotalA0 = 0x001200A0;  // Total PPT on 2022 and CPU PPT on 2021
     public const int PPT_EDCA1 = 0x001200A1;  // CPU EDC
@@ -185,12 +187,25 @@ public class ASUSWmi
         if (curve.Length != 16) return;
         if (curve.All(singleByte => singleByte == 0)) return;
 
-        Logger.WriteLine("Fans" + ((device == 1) ? "GPU" : "CPU") + " " + BitConverter.ToString(curve));
+        string name;
 
-        if (device == 1)
-            DeviceSet(DevsGPUFanCurve, curve);
-        else
-            DeviceSet(DevsCPUFanCurve, curve);
+        switch (device)
+        {
+            case 1:
+                DeviceSet(DevsGPUFanCurve, curve);
+                name = "GPU";
+                break;
+            case 2:
+                DeviceSet(DevsMidFanCurve, curve);
+                name = "Mid";
+                break;
+            default:
+                DeviceSet(DevsCPUFanCurve, curve);
+                name = "CPU";
+                break;
+        }
+
+        Logger.WriteLine("Fans" + name + " " + BitConverter.ToString(curve));
     }
 
     public byte[] GetFanCurve(int device, int mode = 0)
@@ -205,10 +220,15 @@ public class ASUSWmi
             default: fan_mode = 0; break;
         }
 
-        if (device == 1)
-            return DeviceGetBuffer(DevsGPUFanCurve, fan_mode);
-        else
-            return DeviceGetBuffer(DevsCPUFanCurve, fan_mode);
+        switch (device)
+        {
+            case 1:
+                return DeviceGetBuffer(DevsGPUFanCurve, fan_mode);
+            case 2:
+                return DeviceGetBuffer(DevsMidFanCurve, fan_mode);
+            default: 
+                return DeviceGetBuffer(DevsCPUFanCurve, fan_mode);
+        }
 
     }
 

app/AnimeMatrix/AnimeMatrixDevice.cs

@@ -1,12 +1,9 @@
 // Source thanks to https://github.com/vddCore/Starlight with some adjustments from me
 
 using Starlight.Communication;
-using System.Diagnostics;
-using System.Text;
+using System.Drawing;
 using System.Management;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.Window;
-using System.Drawing.Imaging;
-using System.Windows.Forms;
+using System.Text;
 
 namespace Starlight.AnimeMatrix
 {
@@ -65,8 +62,7 @@ namespace Starlight.AnimeMatrix
         Off = 0,
         Dim = 1,
         Medium = 2,
-        Full = 3,
-        Super = 4, //test, doesn't work
+        Full = 3
     }
 
 
@@ -78,11 +74,11 @@ namespace Starlight.AnimeMatrix
         byte[] _displayBuffer;
         List<byte[]> frames = new List<byte[]>();
 
-        public int MaxColumns = 34;
         public int MaxRows = 61;
         public int FullRows = 11;
+        public int FullEvenRows = -1;
 
-        public int EmptyFirstRow = 0;
+        public int MaxColumns = 34;
 
         private int frameIndex = 0;
 
@@ -90,15 +86,15 @@ namespace Starlight.AnimeMatrix
             : base(0x0B05, 0x193B, 640)
         {
             string model = GetModel();
-            Debug.WriteLine(model);
-
-            if (model is not null && model.Contains("401"))
+            if (model.Contains("401"))
             {
-                EmptyFirstRow = 1;
-                FullRows = 6;
                 MaxColumns = 33;
+
+                FullRows = 7;
+                FullEvenRows = 6;
+
                 MaxRows = 55;
-                LedCount = 1213;
+                LedCount = 1214;
                 UpdatePageLength = 410;
             }
 
@@ -126,7 +122,6 @@ namespace Starlight.AnimeMatrix
 
         public void PresentNextFrame()
         {
-            //Debug.WriteLine(frameIndex);
             if (frameIndex >= frames.Count) frameIndex = 0;
             _displayBuffer = frames[frameIndex];
             Present();
@@ -150,25 +145,25 @@ namespace Starlight.AnimeMatrix
         }
 
 
-        public int EmptyColumns(int row)
+        public int XStart(int row)
         {
-            if (row == 0) return EmptyFirstRow;
             return (int)Math.Ceiling(Math.Max(0, row - FullRows) / 2.0);
         }
-        public int Columns(int row)
+
+        public int XEnd(int row)
         {
-            EnsureRowInRange(row);
-            return MaxColumns - EmptyColumns(row);
+            if (row <= FullEvenRows && row % 2 == 0) return MaxColumns - 1;
+            return MaxColumns;
         }
 
         public int RowToLinearAddress(int row)
         {
             EnsureRowInRange(row);
 
-            var ret = 0;
+            int ret = 0;
 
             for (var i = 0; i < row; i++)
-                ret += Columns(i);
+                ret += XEnd(i) - XStart(i);
 
             return ret;
         }
@@ -198,13 +193,16 @@ namespace Starlight.AnimeMatrix
             Set(Packet<AnimeMatrixPacket>(0xC0, 0x03));
         }
 
-        public void SetLedPlanar(int x, int y, byte value)
+        public int SetLedPlanar(int x, int y, byte value)
         {
             EnsureRowInRange(y);
-            var start = RowToLinearAddress(y) - EmptyColumns(y);
-
-            if (x >= EmptyColumns(y))
+            var start = RowToLinearAddress(y) - XStart(y);
+            if (x >= XStart(y) && x < XEnd(y))
+            {
                 SetLedLinear(start + x, value);
+                return start + x;
+            }
+            return -1;
         }
 
         public void Clear(bool present = false)
@@ -274,13 +272,46 @@ namespace Starlight.AnimeMatrix
 
         static int GetColor(Bitmap bmp, int x, int y)
         {
-            var pixel = bmp.GetPixel(Math.Max(0,Math.Min(bmp.Width - 1,x)), Math.Max(0, Math.Min(bmp.Height - 1, y)));
-            return (Math.Max((pixel.R + pixel.G + pixel.B) / 3 - 10, 0));
+            var pixel = bmp.GetPixel(Math.Max(0, Math.Min(bmp.Width - 1, x)), Math.Max(0, Math.Min(bmp.Height - 1, y)));
+            return (Math.Min((pixel.R + pixel.G + pixel.B) / 3, 255));
         }
+
+
+        public void PresentText(string text, int fontSize = 8)
+        {
+            int width = MaxColumns * 3;
+            int height = MaxRows;
+
+            Bitmap bmp = new Bitmap(width, height);
+
+            using (Graphics g = Graphics.FromImage(bmp))
+            {
+                using (Font font = new Font("Arial", fontSize))
+                {
+                    
+                    g.CompositingQuality = System.Drawing.Drawing2D.CompositingQuality.HighQuality;
+                    g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
+                    SizeF textSize = g.MeasureString(text, font);
+                    
+                    /*
+                    g.TranslateTransform(bmp.Width / 2, bmp.Height / 2);
+                    g.RotateTransform(33);
+                    g.DrawString(text, font, Brushes.White, -textSize.Width/2, -textSize.Height / 2);
+                    */
+
+                    g.DrawString(text, font, Brushes.White, bmp.Width - textSize.Width + 5, 0);
+                }
+            }
+
+            GenerateFrame(bmp);
+            Present();
+
+        }
+
         public void GenerateFrame(Image image)
         {
 
-            int width = MaxColumns*3;
+            int width = MaxColumns * 3;
             int height = MaxRows;
             float scale;
 
@@ -304,11 +335,10 @@ namespace Starlight.AnimeMatrix
             {
                 for (int x = 0; x < bmp.Width; x++)
                 {
-                    if (x % 2 == (y % 2))
+                    if (x % 2 == y % 2)
                     {
                         var color = GetColor(bmp, x, y);
-                        //var color2= GetColor(bmp, x+1, y);
-                        SetLedPlanar(x/2,y, (byte)color);
+                        SetLedPlanar(x / 2, y, (byte)color);
                     }
                 }
             }

app/ControlHelper.cs

@@ -36,7 +36,7 @@ public static class ControlHelper
             foreMain = SystemColors.ControlText;
             foreAccent = Color.LightGray;
             borderMain = Color.LightGray;
-            buttonMain = SystemColors.ControlLight;
+            buttonMain = Color.FromArgb(255, 230, 230, 230);
         }
 
         container.BackColor = formBack;
@@ -45,6 +45,7 @@ public static class ControlHelper
         _invert = invert;
         AdjustControls(container.Controls);
         _invert = false;
+
     }
 
     public static void Resize(RForm container, float baseScale = 2)
@@ -92,7 +93,7 @@ public static class ControlHelper
             if (pictureBox != null && pictureBox.BackgroundImage is not null)
                 pictureBox.BackgroundImage = AdjustImage(pictureBox.BackgroundImage);
 
-
+            
             var combo = control as RComboBox;
             if (combo != null)
             {

app/CustomControls.cs

@@ -19,13 +19,13 @@ namespace CustomControls
         [DllImport("DwmApi")] //System.Runtime.InteropServices
         private static extern int DwmSetWindowAttribute(IntPtr hwnd, int attr, int[] attrValue, int attrSize);
 
-        public bool darkTheme = false;
+        public bool darkTheme;
 
         private static bool IsDarkTheme()
         {
             using var key = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize");
             var registryValueObject = key?.GetValue("AppsUseLightTheme");
-            
+
             if (registryValueObject == null) return false;
             return (int)registryValueObject <= 0;
         }
@@ -39,8 +39,12 @@ namespace CustomControls
             if (setDPI)
                 ControlHelper.Resize(this);
 
-            DwmSetWindowAttribute(this.Handle, 20, new[] { darkTheme ? 1 : 0 }, 4);
-            ControlHelper.Adjust(this, darkTheme, changed);
+            if (changed)
+            {
+                DwmSetWindowAttribute(this.Handle, 20, new[] { darkTheme ? 1 : 0 }, 4);
+                ControlHelper.Adjust(this, darkTheme, changed);
+            }
+
         }
 
     }
@@ -67,8 +71,8 @@ namespace CustomControls
                 }
             }
         }
-        private Color buttonColor = Color.LightGray;
-        [DefaultValue(typeof(Color), "LightGray")]
+        private Color buttonColor = Color.FromArgb(255,230, 230, 230);
+        [DefaultValue(typeof(Color), "230, 230, 230")]
         public Color ButtonColor
         {
             get { return buttonColor; }
@@ -235,13 +239,18 @@ namespace CustomControls
     {
         //Fields
         private int borderSize = 5;
+
         private int borderRadius = 5;
-        
-        private bool activated = false;
-        private bool secondary = false;
+        public int BorderRadius
+        {
+            get { return borderRadius; }
+            set
+            {
+                borderRadius = value;
+            }
+        }
 
         private Color borderColor = Color.Transparent;
-
         public Color BorderColor
         {
             get { return borderColor; }
@@ -252,6 +261,7 @@ namespace CustomControls
         }
 
 
+        private bool activated = false;
         public bool Activated
         {
             get { return activated; }
@@ -264,6 +274,7 @@ namespace CustomControls
             }
         }
 
+        private bool secondary = false;
         public bool Secondary
         {
             get { return secondary; }

app/Fans.Designer.cs

@@ -35,6 +35,8 @@ namespace GHelper
             Title title1 = new Title();
             ChartArea chartArea2 = new ChartArea();
             Title title2 = new Title();
+            ChartArea chartArea3 = new ChartArea();
+            Title title3 = new Title();
             panelFans = new Panel();
             labelTip = new Label();
             labelBoost = new Label();
@@ -43,6 +45,7 @@ namespace GHelper
             tableFanCharts = new TableLayoutPanel();
             chartGPU = new Chart();
             chartCPU = new Chart();
+            chartMid = new Chart();
             labelFans = new Label();
             checkAuto = new CheckBox();
             buttonReset = new RButton();
@@ -68,6 +71,7 @@ namespace GHelper
             tableFanCharts.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)chartGPU).BeginInit();
             ((System.ComponentModel.ISupportInitialize)chartCPU).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)chartMid).BeginInit();
             panelPower.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox1).BeginInit();
             panelCPU.SuspendLayout();
@@ -147,14 +151,14 @@ namespace GHelper
             tableFanCharts.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100F));
             tableFanCharts.Controls.Add(chartGPU, 0, 1);
             tableFanCharts.Controls.Add(chartCPU, 0, 0);
+            tableFanCharts.Controls.Add(chartMid, 0, 2);
             tableFanCharts.Location = new Point(28, 64);
             tableFanCharts.Margin = new Padding(6);
             tableFanCharts.Name = "tableFanCharts";
             tableFanCharts.RowCount = 2;
-            tableFanCharts.RowStyles.Add(new RowStyle(SizeType.Percent, 50F));
-            tableFanCharts.RowStyles.Add(new RowStyle(SizeType.Percent, 50F));
-            tableFanCharts.RowStyles.Add(new RowStyle(SizeType.Absolute, 40F));
-            tableFanCharts.RowStyles.Add(new RowStyle(SizeType.Absolute, 40F));
+            tableFanCharts.RowStyles.Add(new RowStyle(SizeType.Percent, 33F));
+            tableFanCharts.RowStyles.Add(new RowStyle(SizeType.Percent, 33F));
+            tableFanCharts.RowStyles.Add(new RowStyle(SizeType.Percent, 33F));
             tableFanCharts.Size = new Size(764, 992);
             tableFanCharts.TabIndex = 36;
             // 
@@ -163,12 +167,12 @@ namespace GHelper
             chartArea1.Name = "ChartArea1";
             chartGPU.ChartAreas.Add(chartArea1);
             chartGPU.Dock = DockStyle.Fill;
-            chartGPU.Location = new Point(2, 506);
+            chartGPU.Location = new Point(2, 340);
             chartGPU.Margin = new Padding(2, 10, 2, 10);
             chartGPU.Name = "chartGPU";
-            chartGPU.Size = new Size(760, 476);
+            chartGPU.Size = new Size(760, 310);
             chartGPU.TabIndex = 17;
-            chartGPU.Text = "chart1";
+            chartGPU.Text = "chartGPU";
             title1.Name = "Title1";
             chartGPU.Titles.Add(title1);
             // 
@@ -180,12 +184,27 @@ namespace GHelper
             chartCPU.Location = new Point(2, 10);
             chartCPU.Margin = new Padding(2, 10, 2, 10);
             chartCPU.Name = "chartCPU";
-            chartCPU.Size = new Size(760, 476);
+            chartCPU.Size = new Size(760, 310);
             chartCPU.TabIndex = 14;
             chartCPU.Text = "chartCPU";
             title2.Name = "Title1";
             chartCPU.Titles.Add(title2);
             // 
+            // chartMid
+            // 
+            chartArea3.Name = "ChartArea3";
+            chartMid.ChartAreas.Add(chartArea3);
+            chartMid.Dock = DockStyle.Fill;
+            chartMid.Location = new Point(2, 670);
+            chartMid.Margin = new Padding(2, 10, 2, 10);
+            chartMid.Name = "chartMid";
+            chartMid.Size = new Size(760, 312);
+            chartMid.TabIndex = 14;
+            chartMid.Text = "chartMid";
+            title3.Name = "Title3";
+            chartMid.Titles.Add(title3);
+            chartMid.Visible = false;
+            // 
             // labelFans
             // 
             labelFans.AutoSize = true;
@@ -213,8 +232,9 @@ namespace GHelper
             // 
             buttonReset.Activated = false;
             buttonReset.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonReset.BackColor = SystemColors.ControlLight;
+            buttonReset.BackColor = Color.FromArgb(230, 230, 230);
             buttonReset.BorderColor = Color.Transparent;
+            buttonReset.BorderRadius = 2;
             buttonReset.FlatStyle = FlatStyle.Flat;
             buttonReset.Location = new Point(30, 1081);
             buttonReset.Margin = new Padding(4, 2, 4, 2);
@@ -229,8 +249,9 @@ namespace GHelper
             // 
             buttonApply.Activated = false;
             buttonApply.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonApply.BackColor = SystemColors.ControlLight;
+            buttonApply.BackColor = Color.FromArgb(230, 230, 230);
             buttonApply.BorderColor = Color.Transparent;
+            buttonApply.BorderRadius = 2;
             buttonApply.FlatStyle = FlatStyle.Flat;
             buttonApply.Location = new Point(542, 1081);
             buttonApply.Margin = new Padding(4, 2, 4, 2);
@@ -299,8 +320,9 @@ namespace GHelper
             // 
             buttonApplyPower.Activated = false;
             buttonApplyPower.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
-            buttonApplyPower.BackColor = SystemColors.ControlLight;
+            buttonApplyPower.BackColor = Color.FromArgb(230, 230, 230);
             buttonApplyPower.BorderColor = Color.Transparent;
+            buttonApplyPower.BorderRadius = 2;
             buttonApplyPower.FlatStyle = FlatStyle.Flat;
             buttonApplyPower.Location = new Point(20, 1081);
             buttonApplyPower.Margin = new Padding(4, 2, 4, 2);
@@ -465,6 +487,7 @@ namespace GHelper
             tableFanCharts.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)chartGPU).EndInit();
             ((System.ComponentModel.ISupportInitialize)chartCPU).EndInit();
+            ((System.ComponentModel.ISupportInitialize)chartMid).EndInit();
             panelPower.ResumeLayout(false);
             panelPower.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox1).EndInit();
@@ -501,6 +524,7 @@ namespace GHelper
         private TableLayoutPanel tableFanCharts;
         private System.Windows.Forms.DataVisualization.Charting.Chart chartGPU;
         private System.Windows.Forms.DataVisualization.Charting.Chart chartCPU;
+        private System.Windows.Forms.DataVisualization.Charting.Chart chartMid;
         private Label labelFans;
         private PictureBox picturePerf;
         private PictureBox pictureBox1;

app/Fans.cs

@@ -10,6 +10,7 @@ namespace GHelper
         DataPoint curPoint = null;
         Series seriesCPU;
         Series seriesGPU;
+        Series seriesMid;
 
         static int MinRPM, MaxRPM;
 
@@ -27,6 +28,8 @@ namespace GHelper
 
             if (device == 1)
                 title = "GPU Fan Profile";
+            else if (device == 2)
+                title = "Middle Fan Profile";
             else
                 title = "CPU Fan Profile";
 
@@ -97,9 +100,11 @@ namespace GHelper
 
             seriesCPU = chartCPU.Series.Add("CPU");
             seriesGPU = chartGPU.Series.Add("GPU");
+            seriesMid = chartMid.Series.Add("Mid");
 
             seriesCPU.Color = colorStandard;
             seriesGPU.Color = colorTurbo;
+            seriesMid.Color = colorEco;
 
             chartCPU.MouseMove += ChartCPU_MouseMove;
             chartCPU.MouseUp += ChartCPU_MouseUp;
@@ -107,6 +112,9 @@ namespace GHelper
             chartGPU.MouseMove += ChartCPU_MouseMove;
             chartGPU.MouseUp += ChartCPU_MouseUp;
 
+            chartMid.MouseMove += ChartCPU_MouseMove;
+            chartMid.MouseUp += ChartCPU_MouseUp;
+
             buttonReset.Click += ButtonReset_Click;
             buttonApply.Click += ButtonApply_Click;
 
@@ -264,6 +272,22 @@ namespace GHelper
         public void InitFans()
         {
 
+            byte[] curve = Program.wmi.GetFanCurve(2);
+
+            if (curve.All(singleByte => singleByte == 0))
+            {
+                Program.config.setConfig("mid_fan", 0);
+
+            }
+            else
+            {
+                Program.config.setConfig("mid_fan", 1);
+                chartMid.Visible = true;
+                SetChart(chartMid, 2);
+                LoadProfile(seriesMid, 2);
+            }
+
+
             SetChart(chartCPU, 0);
             SetChart(chartGPU, 1);
 
@@ -328,6 +352,8 @@ namespace GHelper
         {
             ApplyProfile(seriesCPU, 0);
             ApplyProfile(seriesGPU, 1);
+            if (Program.config.getConfig("mid_fan") == 1)
+                ApplyProfile(seriesMid, 2);
         }
 
         private void ButtonReset_Click(object? sender, EventArgs e)
@@ -335,6 +361,8 @@ namespace GHelper
 
             LoadProfile(seriesCPU, 0, 1);
             LoadProfile(seriesGPU, 1, 1);
+            if (Program.config.getConfig("mid_fan") == 1)
+                LoadProfile(seriesMid, 2, 1);
 
             checkAuto.Checked = false;
             checkApplyPower.Checked = false;

app/GHelper.csproj

@@ -16,7 +16,7 @@
     <PlatformTarget>x64</PlatformTarget>
     <ProduceReferenceAssembly>False</ProduceReferenceAssembly>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <AssemblyVersion>0.33</AssemblyVersion>
+    <AssemblyVersion>0.36</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>

app/HardwareMonitor.cs

@@ -86,9 +86,5 @@ public static class HardwareMonitor
         catch (Exception ex)
         { 
         } 
-        finally
-        {
-            Logger.WriteLine($"GpuTemperatureProvider: {GpuTemperatureProvider?.GetType().Name}");
-        }
     }
 }

app/Program.cs

@@ -77,8 +77,15 @@ namespace GHelper
             SystemEvents.PowerModeChanged += SystemEvents_PowerModeChanged;
 
             CheckForUpdates();
+
+            if (Environment.CurrentDirectory.Trim('\\') == Application.StartupPath.Trim('\\'))
+            {
+                SettingsToggle();
+            }
+
             Application.Run();
 
+
         }
 
 

app/Settings.Designer.cs

@@ -68,11 +68,13 @@ namespace GHelper
             buttonOptimized = new RButton();
             buttonUltimate = new RButton();
             panelScreen = new Panel();
+            labelMidFan = new Label();
             labelTipScreen = new Label();
             tableScreen = new TableLayoutPanel();
             buttonScreenAuto = new RButton();
             button60Hz = new RButton();
             button120Hz = new RButton();
+            buttonMiniled = new RButton();
             pictureScreen = new PictureBox();
             labelSreen = new Label();
             panelKeyboard = new Panel();
@@ -85,7 +87,6 @@ namespace GHelper
             buttonKeyboardColor = new RButton();
             pictureKeyboard = new PictureBox();
             labelKeyboard = new Label();
-            buttonMiniled = new RButton();
             panelMatrix.SuspendLayout();
             tableLayoutMatrix.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)pictureMatrix).BeginInit();
@@ -178,8 +179,9 @@ namespace GHelper
             // buttonMatrix
             // 
             buttonMatrix.Activated = false;
-            buttonMatrix.BackColor = SystemColors.ControlLight;
+            buttonMatrix.BackColor = Color.FromArgb(230, 230, 230);
             buttonMatrix.BorderColor = Color.Transparent;
+            buttonMatrix.BorderRadius = 2;
             buttonMatrix.Dock = DockStyle.Top;
             buttonMatrix.FlatAppearance.BorderSize = 0;
             buttonMatrix.FlatStyle = FlatStyle.Flat;
@@ -200,7 +202,7 @@ namespace GHelper
             comboMatrixRunning.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point);
             comboMatrixRunning.FormattingEnabled = true;
             comboMatrixRunning.ItemHeight = 32;
-            comboMatrixRunning.Items.AddRange(new object[] { "Binary Banner", "Rog Logo", "Picture" });
+            comboMatrixRunning.Items.AddRange(new object[] { "Binary Banner", "Rog Logo", "Picture", "Clock" });
             comboMatrixRunning.Location = new Point(197, 10);
             comboMatrixRunning.Margin = new Padding(4, 10, 4, 8);
             comboMatrixRunning.Name = "comboMatrixRunning";
@@ -325,14 +327,15 @@ namespace GHelper
             // 
             buttonQuit.Activated = false;
             buttonQuit.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            buttonQuit.BackColor = SystemColors.ControlLight;
+            buttonQuit.BackColor = Color.FromArgb(230, 230, 230);
             buttonQuit.BorderColor = Color.Transparent;
+            buttonQuit.BorderRadius = 2;
             buttonQuit.FlatStyle = FlatStyle.Flat;
-            buttonQuit.Location = new Point(578, 16);
+            buttonQuit.Location = new Point(599, 16);
             buttonQuit.Margin = new Padding(8, 4, 8, 4);
             buttonQuit.Name = "buttonQuit";
             buttonQuit.Secondary = true;
-            buttonQuit.Size = new Size(208, 44);
+            buttonQuit.Size = new Size(185, 44);
             buttonQuit.TabIndex = 18;
             buttonQuit.Text = "Quit";
             buttonQuit.UseVisualStyleBackColor = false;
@@ -426,6 +429,7 @@ namespace GHelper
             buttonSilent.BackColor = SystemColors.ControlLightLight;
             buttonSilent.BackgroundImageLayout = ImageLayout.None;
             buttonSilent.BorderColor = Color.Transparent;
+            buttonSilent.BorderRadius = 5;
             buttonSilent.CausesValidation = false;
             buttonSilent.Dock = DockStyle.Fill;
             buttonSilent.FlatAppearance.BorderSize = 0;
@@ -448,6 +452,7 @@ namespace GHelper
             buttonBalanced.Activated = false;
             buttonBalanced.BackColor = SystemColors.ControlLightLight;
             buttonBalanced.BorderColor = Color.Transparent;
+            buttonBalanced.BorderRadius = 5;
             buttonBalanced.Dock = DockStyle.Fill;
             buttonBalanced.FlatAppearance.BorderSize = 0;
             buttonBalanced.FlatStyle = FlatStyle.Flat;
@@ -469,6 +474,7 @@ namespace GHelper
             buttonTurbo.Activated = false;
             buttonTurbo.BackColor = SystemColors.ControlLightLight;
             buttonTurbo.BorderColor = Color.Transparent;
+            buttonTurbo.BorderRadius = 5;
             buttonTurbo.Dock = DockStyle.Fill;
             buttonTurbo.FlatAppearance.BorderSize = 0;
             buttonTurbo.FlatStyle = FlatStyle.Flat;
@@ -488,8 +494,9 @@ namespace GHelper
             // buttonFans
             // 
             buttonFans.Activated = false;
-            buttonFans.BackColor = SystemColors.ControlLight;
+            buttonFans.BackColor = Color.FromArgb(230, 230, 230);
             buttonFans.BorderColor = Color.Transparent;
+            buttonFans.BorderRadius = 5;
             buttonFans.Dock = DockStyle.Fill;
             buttonFans.FlatAppearance.BorderSize = 0;
             buttonFans.FlatStyle = FlatStyle.Flat;
@@ -592,6 +599,7 @@ namespace GHelper
             buttonEco.Activated = false;
             buttonEco.BackColor = SystemColors.ControlLightLight;
             buttonEco.BorderColor = Color.Transparent;
+            buttonEco.BorderRadius = 5;
             buttonEco.CausesValidation = false;
             buttonEco.Dock = DockStyle.Top;
             buttonEco.FlatAppearance.BorderSize = 0;
@@ -614,6 +622,7 @@ namespace GHelper
             buttonStandard.Activated = false;
             buttonStandard.BackColor = SystemColors.ControlLightLight;
             buttonStandard.BorderColor = Color.Transparent;
+            buttonStandard.BorderRadius = 5;
             buttonStandard.Dock = DockStyle.Top;
             buttonStandard.FlatAppearance.BorderSize = 0;
             buttonStandard.FlatStyle = FlatStyle.Flat;
@@ -635,6 +644,7 @@ namespace GHelper
             buttonOptimized.Activated = false;
             buttonOptimized.BackColor = SystemColors.ControlLightLight;
             buttonOptimized.BorderColor = Color.Transparent;
+            buttonOptimized.BorderRadius = 5;
             buttonOptimized.Dock = DockStyle.Top;
             buttonOptimized.FlatAppearance.BorderSize = 0;
             buttonOptimized.FlatStyle = FlatStyle.Flat;
@@ -656,6 +666,7 @@ namespace GHelper
             buttonUltimate.Activated = false;
             buttonUltimate.BackColor = SystemColors.ControlLightLight;
             buttonUltimate.BorderColor = Color.Transparent;
+            buttonUltimate.BorderRadius = 5;
             buttonUltimate.Dock = DockStyle.Top;
             buttonUltimate.FlatAppearance.BorderSize = 0;
             buttonUltimate.FlatStyle = FlatStyle.Flat;
@@ -676,6 +687,7 @@ namespace GHelper
             // 
             panelScreen.AutoSize = true;
             panelScreen.AutoSizeMode = AutoSizeMode.GrowAndShrink;
+            panelScreen.Controls.Add(labelMidFan);
             panelScreen.Controls.Add(labelTipScreen);
             panelScreen.Controls.Add(tableScreen);
             panelScreen.Controls.Add(pictureScreen);
@@ -688,6 +700,17 @@ namespace GHelper
             panelScreen.Size = new Size(810, 181);
             panelScreen.TabIndex = 38;
             // 
+            // labelMidFan
+            // 
+            labelMidFan.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+            labelMidFan.Location = new Point(488, 13);
+            labelMidFan.Margin = new Padding(8, 0, 8, 0);
+            labelMidFan.Name = "labelMidFan";
+            labelMidFan.Size = new Size(296, 34);
+            labelMidFan.TabIndex = 25;
+            labelMidFan.Text = "         ";
+            labelMidFan.TextAlign = ContentAlignment.TopRight;
+            // 
             // labelTipScreen
             // 
             labelTipScreen.ForeColor = SystemColors.GrayText;
@@ -711,7 +734,6 @@ namespace GHelper
             tableScreen.Controls.Add(button60Hz, 1, 0);
             tableScreen.Controls.Add(button120Hz, 2, 0);
             tableScreen.Controls.Add(buttonMiniled, 3, 0);
-
             tableScreen.Location = new Point(16, 51);
             tableScreen.Margin = new Padding(8, 4, 8, 4);
             tableScreen.Name = "tableScreen";
@@ -725,6 +747,7 @@ namespace GHelper
             buttonScreenAuto.Activated = false;
             buttonScreenAuto.BackColor = SystemColors.ControlLightLight;
             buttonScreenAuto.BorderColor = Color.Transparent;
+            buttonScreenAuto.BorderRadius = 5;
             buttonScreenAuto.Dock = DockStyle.Fill;
             buttonScreenAuto.FlatAppearance.BorderSize = 0;
             buttonScreenAuto.FlatStyle = FlatStyle.Flat;
@@ -743,6 +766,7 @@ namespace GHelper
             button60Hz.Activated = false;
             button60Hz.BackColor = SystemColors.ControlLightLight;
             button60Hz.BorderColor = Color.Transparent;
+            button60Hz.BorderRadius = 5;
             button60Hz.CausesValidation = false;
             button60Hz.Dock = DockStyle.Fill;
             button60Hz.FlatAppearance.BorderSize = 0;
@@ -762,6 +786,7 @@ namespace GHelper
             button120Hz.Activated = false;
             button120Hz.BackColor = SystemColors.ControlLightLight;
             button120Hz.BorderColor = Color.Transparent;
+            button120Hz.BorderRadius = 5;
             button120Hz.Dock = DockStyle.Fill;
             button120Hz.FlatAppearance.BorderSize = 0;
             button120Hz.FlatStyle = FlatStyle.Flat;
@@ -775,6 +800,26 @@ namespace GHelper
             button120Hz.Text = "120Hz + OD";
             button120Hz.UseVisualStyleBackColor = false;
             // 
+            // buttonMiniled
+            // 
+            buttonMiniled.Activated = false;
+            buttonMiniled.BackColor = SystemColors.ControlLightLight;
+            buttonMiniled.BorderColor = Color.Transparent;
+            buttonMiniled.BorderRadius = 5;
+            buttonMiniled.CausesValidation = false;
+            buttonMiniled.Dock = DockStyle.Fill;
+            buttonMiniled.FlatAppearance.BorderSize = 0;
+            buttonMiniled.FlatStyle = FlatStyle.Flat;
+            buttonMiniled.ForeColor = SystemColors.ControlText;
+            buttonMiniled.Location = new Point(583, 4);
+            buttonMiniled.Margin = new Padding(4);
+            buttonMiniled.Name = "buttonMiniled";
+            buttonMiniled.Secondary = false;
+            buttonMiniled.Size = new Size(185, 72);
+            buttonMiniled.TabIndex = 3;
+            buttonMiniled.Text = "Miniled";
+            buttonMiniled.UseVisualStyleBackColor = false;
+            // 
             // pictureScreen
             // 
             pictureScreen.BackgroundImage = (Image)resources.GetObject("pictureScreen.BackgroundImage");
@@ -836,8 +881,9 @@ namespace GHelper
             // buttonKeyboard
             // 
             buttonKeyboard.Activated = false;
-            buttonKeyboard.BackColor = SystemColors.ControlLight;
+            buttonKeyboard.BackColor = Color.FromArgb(230, 230, 230);
             buttonKeyboard.BorderColor = Color.Transparent;
+            buttonKeyboard.BorderRadius = 2;
             buttonKeyboard.Dock = DockStyle.Top;
             buttonKeyboard.FlatAppearance.BorderSize = 0;
             buttonKeyboard.FlatStyle = FlatStyle.Flat;
@@ -905,6 +951,7 @@ namespace GHelper
             buttonKeyboardColor.Activated = false;
             buttonKeyboardColor.BackColor = SystemColors.ButtonHighlight;
             buttonKeyboardColor.BorderColor = Color.Transparent;
+            buttonKeyboardColor.BorderRadius = 2;
             buttonKeyboardColor.Dock = DockStyle.Top;
             buttonKeyboardColor.FlatStyle = FlatStyle.Flat;
             buttonKeyboardColor.ForeColor = SystemColors.ControlText;
@@ -939,25 +986,6 @@ namespace GHelper
             labelKeyboard.TabIndex = 32;
             labelKeyboard.Text = "Laptop Keyboard";
             // 
-            // buttonMiniled
-            // 
-            buttonMiniled.Activated = false;
-            buttonMiniled.BackColor = SystemColors.ControlLightLight;
-            buttonMiniled.BorderColor = Color.Transparent;
-            buttonMiniled.CausesValidation = false;
-            buttonMiniled.Dock = DockStyle.Fill;
-            buttonMiniled.FlatAppearance.BorderSize = 0;
-            buttonMiniled.FlatStyle = FlatStyle.Flat;
-            buttonMiniled.ForeColor = SystemColors.ControlText;
-            buttonMiniled.Location = new Point(197, 4);
-            buttonMiniled.Margin = new Padding(4);
-            buttonMiniled.Name = "buttonMiniled";
-            buttonMiniled.Secondary = false;
-            buttonMiniled.Size = new Size(185, 72);
-            buttonMiniled.TabIndex = 3;
-            buttonMiniled.Text = "Miniled";
-            buttonMiniled.UseVisualStyleBackColor = false;
-            // 
             // SettingsForm
             // 
             AutoScaleDimensions = new SizeF(192F, 192F);
@@ -1073,5 +1101,6 @@ namespace GHelper
         private RButton buttonKeyboard;
         private RButton buttonKeyboardColor;
         private RButton buttonFans;
+        private Label labelMidFan;
     }
 }

app/Settings.cs

@@ -21,6 +21,7 @@ namespace GHelper
         public Keyboard keyb;
 
         static AnimeMatrixDevice mat;
+        static int matrixMode = 0;
 
         public SettingsForm()
         {
@@ -265,14 +266,23 @@ namespace GHelper
         private static void MatrixTimer_Elapsed(object? sender, ElapsedEventArgs e)
         {
             if (mat is null) return;
-            mat.PresentNextFrame();
+
+            switch (Program.config.getConfig("matrix_running"))
+            {
+                case 2:
+                    mat.PresentNextFrame();
+                    break;
+                case 3:
+                    mat.PresentText(DateTime.Now.ToString("H:mm:ss"));
+                    break;
+            }
+
         }
 
         void SetMatrixPicture(string fileName)
         {
 
             if (mat is null) return;
-
             StopMatrixTimer();
 
             Image image;
@@ -315,8 +325,6 @@ namespace GHelper
                 mat.GenerateFrame(image);
                 mat.Present();
             }
-
-
         }
 
 
@@ -397,14 +405,20 @@ namespace GHelper
                 mat.SetDisplayState(true);
                 mat.SetBrightness((BrightnessMode)brightness);
 
-                if (running == 2)
+                switch (running)
                 {
-                    string fileName = Program.config.getConfigString("matrix_picture");
-                    SetMatrixPicture(fileName);
-                }
-                else
-                {
-                    mat.SetBuiltInAnimation(true, animation);
+                    case 2:
+                        string fileName = Program.config.getConfigString("matrix_picture");
+                        SetMatrixPicture(fileName);
+                        break;
+                    case 3:
+                        mat.SetBuiltInAnimation(false);
+                        StartMatrixTimer();
+                        break;
+                    default:
+                        mat.SetBuiltInAnimation(true, animation);
+                        break;
+
                 }
 
             }
@@ -532,7 +546,7 @@ namespace GHelper
             int brightness = Program.config.getConfig("matrix_brightness");
             int running = Program.config.getConfig("matrix_running");
 
-            comboMatrix.SelectedIndex = (brightness != -1) ? Math.Min(brightness, comboMatrix.Items.Count-1) : 0;
+            comboMatrix.SelectedIndex = (brightness != -1) ? Math.Min(brightness, comboMatrix.Items.Count - 1) : 0;
             comboMatrixRunning.SelectedIndex = (running != -1) ? Math.Min(running, comboMatrixRunning.Items.Count - 1) : 0;
 
             checkMatrix.Checked = (Program.config.getConfig("matrix_auto") == 1);
@@ -707,7 +721,8 @@ namespace GHelper
             {
                 buttonMiniled.Activated = (miniled == 1);
                 Program.config.setConfig("miniled", miniled);
-            } else
+            }
+            else
             {
                 buttonMiniled.Visible = false;
             }
@@ -758,6 +773,8 @@ namespace GHelper
 
         private static string FormatFan(int fan)
         {
+            if (fan < 0) return null;
+
             if (Program.config.getConfig("fan_rpm") == 1)
                 return " Fan: " + (fan * 100).ToString() + "RPM";
             else
@@ -769,6 +786,7 @@ namespace GHelper
 
             string cpuFan = FormatFan(Program.wmi.DeviceGet(ASUSWmi.CPU_Fan));
             string gpuFan = FormatFan(Program.wmi.DeviceGet(ASUSWmi.GPU_Fan));
+            string midFan = FormatFan(Program.wmi.DeviceGet(ASUSWmi.Mid_Fan));
 
             string cpuTemp = "";
             string gpuTemp = "";
@@ -791,6 +809,7 @@ namespace GHelper
             {
                 Program.settingsForm.labelCPUFan.Text = "CPU" + cpuTemp + cpuFan;
                 Program.settingsForm.labelGPUFan.Text = "GPU" + gpuTemp + gpuFan;
+                if (midFan is not null) Program.settingsForm.labelMidFan.Text = "Mid" + midFan;
                 Program.settingsForm.labelBattery.Text = battery;
             });
         }
@@ -852,6 +871,9 @@ namespace GHelper
             {
                 Program.wmi.SetFanCurve(0, Program.config.getFanConfig(0));
                 Program.wmi.SetFanCurve(1, Program.config.getFanConfig(1));
+
+                if (Program.config.getConfig("mid_fan") == 1)
+                    Program.wmi.SetFanCurve(2, Program.config.getFanConfig(2));
             }
 
             if (Program.config.getConfigPerf("auto_apply_power") == 1)
@@ -993,12 +1015,6 @@ namespace GHelper
             if (!ultimate)
             {
                 tableGPU.Controls.Remove(buttonUltimate);
-
-                /*
-                 * buttonFans.Image = null;
-                buttonFans.Height = 44;
-                */
-
                 tablePerf.ColumnCount = 0;
                 tableGPU.ColumnCount = 0;
                 tableScreen.ColumnCount = 0;

docs/README.md

@@ -53,14 +53,14 @@ PPTs are shown for G14 2022, for other models PPTs will be different as they are
 ### :video_game: GPU Modes
 
 1. Eco mode : only low power integrated GPU enabled, iGPU drives built in display
-2. Standard mode (Windows Hybrid) : iGPU and dGPU enabled, iGPU drives built in display
+2. Standard mode (MS Hybrid) : iGPU and dGPU enabled, iGPU drives built in display
 3. Ultimate mode: iGPU and dGPU enabled, but dGPU drives built in display (supported only on G14 2022 model)
 4. Optimized (formely existed as a checkbox): disables dGPU on battery (Eco) and enables when plugged (Standard)
 
 ### :question: FAQ
 
 #### How do I stop Armory Crate install popup appearing every time I press M4 / Rog key?
-Go to BIOS (F2 on boot), open Advanced Settings (F8) and disable "Armory Control Intrerface"  
+Go to BIOS (F2 on boot), open Advanced Settings and disable "Armory Control Intrerface"  
 
 #### Why Ultimate GPU mode is not available on my laptop?
 Ultimate mode is supported (by hardware) only on G14 2022 (and possibly other models from 2022+)