Fix for possible animatrix custom picture support on older (2021) models

ASUSWmi.cs

@@ -42,6 +42,15 @@ public class ASUSWmi
     public const int GPUModeUltimate = 2;
 
 
+    public const int MaxTotal = 150;
+    public const int MinTotal = 15;
+    public const int DefaultTotal = 125;
+
+    public const int MaxCPU = 90;
+    public const int MinCPU = 15;
+    public const int DefaultCPU = 80;
+
+
     [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
     private static extern IntPtr CreateFile(
         string lpFileName,
@@ -200,7 +209,6 @@ public class ASUSWmi
 
     }
 
-
     public void SubscribeToEvents(Action<object, EventArrivedEventArgs> EventHandler)
     {
         ManagementEventWatcher watcher = new ManagementEventWatcher();

AnimeMatrix/AnimeMatrixDevice.cs

@@ -3,6 +3,7 @@
 using Starlight.Communication;
 using System.Diagnostics;
 using System.Text;
+using System.Management;
 
 namespace Starlight.AnimeMatrix
 {
@@ -75,11 +76,32 @@ namespace Starlight.AnimeMatrix
         private byte[] _displayBuffer = new byte[UpdatePageLength * 3];
         private List<byte[]> frames = new List<byte[]>();
 
+        private int pages = 3;
+
         private int frameIndex = 0;
 
         public AnimeMatrixDevice()
             : base(0x0B05, 0x193B, 640)
         {
+            string model = GetModel();
+            Debug.WriteLine(model);
+            if (model is not null && model.Contains("401"))
+            {
+                pages = 2;
+            }
+        }
+
+
+        public string GetModel()
+        {
+            using (var searcher = new ManagementObjectSearcher(@"Select * from Win32_ComputerSystem"))
+            {
+                foreach (var process in searcher.Get())
+                    return process["Model"].ToString();
+            }
+
+            return null;
+
         }
 
         public byte[] GetBuffer()
@@ -183,6 +205,7 @@ namespace Starlight.AnimeMatrix
 
         public void Present()
         {
+
             Set(Packet<AnimeMatrixPacket>(0xC0, 0x02)
                 .AppendData(BitConverter.GetBytes((ushort)(UpdatePageLength * 0 + 1)))
                 .AppendData(BitConverter.GetBytes((ushort)UpdatePageLength))
@@ -195,12 +218,13 @@ namespace Starlight.AnimeMatrix
                 .AppendData(_displayBuffer[(UpdatePageLength * 1)..(UpdatePageLength * 2)])
             );
 
-            Set(Packet<AnimeMatrixPacket>(0xC0, 0x02)
+            if (pages > 2)
-                .AppendData(BitConverter.GetBytes((ushort)(UpdatePageLength * 2 + 1)))
+                Set(Packet<AnimeMatrixPacket>(0xC0, 0x02)
-                .AppendData(BitConverter.GetBytes((ushort)(LedCount - UpdatePageLength * 2)))
+                    .AppendData(BitConverter.GetBytes((ushort)(UpdatePageLength * 2 + 1)))
-                .AppendData(
+                    .AppendData(BitConverter.GetBytes((ushort)(LedCount - UpdatePageLength * 2)))
-                    _displayBuffer[(UpdatePageLength * 2)..(UpdatePageLength * 2 + (LedCount - UpdatePageLength * 2))])
+                    .AppendData(
-            );
+                        _displayBuffer[(UpdatePageLength * 2)..(UpdatePageLength * 2 + (LedCount - UpdatePageLength * 2))])
+                );
 
             Set(Packet<AnimeMatrixPacket>(0xC0, 0x03));
         }

AppConfig.cs

@@ -44,8 +44,9 @@ public class AppConfig
         File.WriteAllText(configFile, jsonString);
     }
 
-    public int getConfig(string name)
+    public int getConfig(string name, bool performance = false)
     {
+
         if (config.ContainsKey(name))
             return int.Parse(config[name].ToString());
         else return -1;
@@ -141,4 +142,17 @@ public class AppConfig
         return curve;
     }
 
+    public int getConfigPerf(string name)
+    {
+        int mode = getConfig("performance_mode");
+        return getConfig(name + "_" + mode);
+    }
+
+    public void setConfigPerf(string name, int value)
+    {
+        int mode = getConfig("performance_mode");
+        setConfig(name + "_" + mode, value);
+    }
+
+
 }

Fans.Designer.cs

@@ -28,13 +28,18 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea3 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
+            System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea5 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
-            System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea4 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
+            System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea6 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
-            chartCPU = new System.Windows.Forms.DataVisualization.Charting.Chart();
+            panelFans = new Panel();
-            buttonApply = new Button();
+            checkAuto = new CheckBox();
-            buttonReset = new Button();
             chartGPU = new System.Windows.Forms.DataVisualization.Charting.Chart();
-            groupBox1 = new GroupBox();
+            buttonReset = new Button();
+            buttonApply = new Button();
+            chartCPU = new System.Windows.Forms.DataVisualization.Charting.Chart();
+            panelPower = new Panel();
+            labelPowerLimits = new Label();
+            checkApplyPower = new CheckBox();
+            buttonApplyPower = new Button();
             panelCPU = new Panel();
             labelCPU = new Label();
             label2 = new Label();
@@ -46,11 +51,10 @@
             labelApplied = new Label();
             pictureFine = new PictureBox();
             labelInfo = new Label();
-            buttonApplyPower = new Button();
+            panelFans.SuspendLayout();
-            checkAuto = new CheckBox();
-            ((System.ComponentModel.ISupportInitialize)chartCPU).BeginInit();
             ((System.ComponentModel.ISupportInitialize)chartGPU).BeginInit();
-            groupBox1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)chartCPU).BeginInit();
+            panelPower.SuspendLayout();
             panelCPU.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)trackCPU).BeginInit();
             panelTotal.SuspendLayout();
@@ -58,73 +62,138 @@
             ((System.ComponentModel.ISupportInitialize)pictureFine).BeginInit();
             SuspendLayout();
             // 
-            // chartCPU
+            // panelFans
             // 
-            chartArea3.Name = "ChartArea1";
+            panelFans.Controls.Add(checkAuto);
-            chartCPU.ChartAreas.Add(chartArea3);
+            panelFans.Controls.Add(chartGPU);
-            chartCPU.Location = new Point(390, 28);
+            panelFans.Controls.Add(buttonReset);
-            chartCPU.Margin = new Padding(4, 2, 4, 2);
+            panelFans.Controls.Add(buttonApply);
-            chartCPU.Name = "chartCPU";
+            panelFans.Controls.Add(chartCPU);
-            chartCPU.Size = new Size(832, 436);
+            panelFans.Dock = DockStyle.Left;
-            chartCPU.TabIndex = 0;
+            panelFans.Location = new Point(363, 0);
-            chartCPU.Text = "chartCPU";
+            panelFans.Margin = new Padding(10);
+            panelFans.MinimumSize = new Size(868, 1089);
+            panelFans.Name = "panelFans";
+            panelFans.Padding = new Padding(10);
+            panelFans.Size = new Size(872, 1089);
+            panelFans.TabIndex = 12;
             // 
-            // buttonApply
+            // checkAuto
             // 
-            buttonApply.Location = new Point(946, 952);
+            checkAuto.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonApply.Margin = new Padding(4, 2, 4, 2);
+            checkAuto.AutoSize = true;
-            buttonApply.Name = "buttonApply";
+            checkAuto.Location = new Point(584, 981);
-            buttonApply.Size = new Size(274, 44);
+            checkAuto.Margin = new Padding(4, 2, 4, 2);
-            buttonApply.TabIndex = 1;
+            checkAuto.Name = "checkAuto";
-            buttonApply.Text = "Apply Fan Curve";
+            checkAuto.Size = new Size(165, 36);
-            buttonApply.UseVisualStyleBackColor = true;
+            checkAuto.TabIndex = 17;
-            // 
+            checkAuto.Text = "Auto Apply";
-            // buttonReset
+            checkAuto.UseVisualStyleBackColor = true;
-            // 
-            buttonReset.Location = new Point(390, 952);
-            buttonReset.Margin = new Padding(4, 2, 4, 2);
-            buttonReset.Name = "buttonReset";
-            buttonReset.Size = new Size(274, 44);
-            buttonReset.TabIndex = 2;
-            buttonReset.Text = "Factory Defaults";
-            buttonReset.UseVisualStyleBackColor = true;
             // 
             // chartGPU
             // 
-            chartArea4.Name = "ChartArea1";
+            chartGPU.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            chartGPU.ChartAreas.Add(chartArea4);
+            chartArea5.Name = "ChartArea1";
-            chartGPU.Location = new Point(390, 480);
+            chartGPU.ChartAreas.Add(chartArea5);
+            chartGPU.Location = new Point(22, 502);
             chartGPU.Margin = new Padding(4, 2, 4, 2);
             chartGPU.Name = "chartGPU";
-            chartGPU.Size = new Size(832, 450);
+            chartGPU.Size = new Size(810, 460);
-            chartGPU.TabIndex = 3;
+            chartGPU.TabIndex = 16;
             chartGPU.Text = "chart1";
             // 
-            // groupBox1
+            // buttonReset
             // 
-            groupBox1.Controls.Add(panelCPU);
+            buttonReset.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            groupBox1.Controls.Add(panelTotal);
+            buttonReset.Location = new Point(22, 1025);
-            groupBox1.Controls.Add(labelApplied);
+            buttonReset.Margin = new Padding(4, 2, 4, 2);
-            groupBox1.Controls.Add(pictureFine);
+            buttonReset.Name = "buttonReset";
-            groupBox1.Controls.Add(labelInfo);
+            buttonReset.Size = new Size(231, 44);
-            groupBox1.Location = new Point(12, 12);
+            buttonReset.TabIndex = 15;
-            groupBox1.Margin = new Padding(4, 2, 4, 2);
+            buttonReset.Text = "Factory Defaults";
-            groupBox1.Name = "groupBox1";
+            buttonReset.UseVisualStyleBackColor = true;
-            groupBox1.Padding = new Padding(6, 4, 6, 4);
+            // 
-            groupBox1.Size = new Size(356, 918);
+            // buttonApply
-            groupBox1.TabIndex = 4;
+            // 
-            groupBox1.TabStop = false;
+            buttonApply.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            groupBox1.Text = "Power Limits (PPT)";
+            buttonApply.Location = new Point(584, 1025);
+            buttonApply.Margin = new Padding(4, 2, 4, 2);
+            buttonApply.Name = "buttonApply";
+            buttonApply.Size = new Size(248, 44);
+            buttonApply.TabIndex = 14;
+            buttonApply.Text = "Apply Fan Curve";
+            buttonApply.UseVisualStyleBackColor = true;
+            // 
+            // chartCPU
+            // 
+            chartCPU.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            chartArea6.Name = "ChartArea1";
+            chartCPU.ChartAreas.Add(chartArea6);
+            chartCPU.Location = new Point(22, 21);
+            chartCPU.Margin = new Padding(10);
+            chartCPU.Name = "chartCPU";
+            chartCPU.Size = new Size(810, 460);
+            chartCPU.TabIndex = 13;
+            chartCPU.Text = "chartCPU";
+            // 
+            // panelPower
+            // 
+            panelPower.Controls.Add(labelPowerLimits);
+            panelPower.Controls.Add(checkApplyPower);
+            panelPower.Controls.Add(buttonApplyPower);
+            panelPower.Controls.Add(panelCPU);
+            panelPower.Controls.Add(panelTotal);
+            panelPower.Controls.Add(labelApplied);
+            panelPower.Controls.Add(pictureFine);
+            panelPower.Controls.Add(labelInfo);
+            panelPower.Dock = DockStyle.Left;
+            panelPower.Location = new Point(0, 0);
+            panelPower.Name = "panelPower";
+            panelPower.Size = new Size(363, 1089);
+            panelPower.TabIndex = 13;
+            // 
+            // labelPowerLimits
+            // 
+            labelPowerLimits.AutoSize = true;
+            labelPowerLimits.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point);
+            labelPowerLimits.Location = new Point(23, 15);
+            labelPowerLimits.Name = "labelPowerLimits";
+            labelPowerLimits.Size = new Size(229, 32);
+            labelPowerLimits.TabIndex = 26;
+            labelPowerLimits.Text = "Power Limits (PPT)";
+            // 
+            // checkApplyPower
+            // 
+            checkApplyPower.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            checkApplyPower.AutoSize = true;
+            checkApplyPower.Location = new Point(17, 981);
+            checkApplyPower.Margin = new Padding(4, 2, 4, 2);
+            checkApplyPower.Name = "checkApplyPower";
+            checkApplyPower.Size = new Size(165, 36);
+            checkApplyPower.TabIndex = 25;
+            checkApplyPower.Text = "Auto Apply";
+            checkApplyPower.UseVisualStyleBackColor = true;
+            // 
+            // buttonApplyPower
+            // 
+            buttonApplyPower.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
+            buttonApplyPower.Location = new Point(17, 1025);
+            buttonApplyPower.Margin = new Padding(4, 2, 4, 2);
+            buttonApplyPower.Name = "buttonApplyPower";
+            buttonApplyPower.Size = new Size(321, 44);
+            buttonApplyPower.TabIndex = 24;
+            buttonApplyPower.Text = "Apply Power Limits";
+            buttonApplyPower.UseVisualStyleBackColor = true;
             // 
             // panelCPU
             // 
             panelCPU.Controls.Add(labelCPU);
             panelCPU.Controls.Add(label2);
             panelCPU.Controls.Add(trackCPU);
-            panelCPU.Location = new Point(186, 72);
+            panelCPU.Location = new Point(184, 89);
             panelCPU.Name = "panelCPU";
             panelCPU.Size = new Size(160, 510);
-            panelCPU.TabIndex = 15;
+            panelCPU.TabIndex = 23;
             // 
             // labelCPU
             // 
@@ -167,10 +236,10 @@
             panelTotal.Controls.Add(labelTotal);
             panelTotal.Controls.Add(label1);
             panelTotal.Controls.Add(trackTotal);
-            panelTotal.Location = new Point(8, 72);
+            panelTotal.Location = new Point(17, 89);
             panelTotal.Name = "panelTotal";
             panelTotal.Size = new Size(160, 511);
-            panelTotal.TabIndex = 14;
+            panelTotal.TabIndex = 22;
             // 
             // labelTotal
             // 
@@ -213,11 +282,11 @@
             // 
             labelApplied.AutoSize = true;
             labelApplied.ForeColor = Color.Tomato;
-            labelApplied.Location = new Point(13, 36);
+            labelApplied.Location = new Point(23, 51);
             labelApplied.Margin = new Padding(4, 0, 4, 0);
             labelApplied.Name = "labelApplied";
             labelApplied.Size = new Size(143, 32);
-            labelApplied.TabIndex = 13;
+            labelApplied.TabIndex = 21;
             labelApplied.Text = "Not Applied";
             // 
             // pictureFine
@@ -225,73 +294,49 @@
             pictureFine.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
             pictureFine.BackgroundImageLayout = ImageLayout.Zoom;
             pictureFine.Image = Properties.Resources.everything_is_fine_itsfine;
-            pictureFine.Location = new Point(10, 682);
+            pictureFine.Location = new Point(17, 694);
             pictureFine.Margin = new Padding(4, 2, 4, 2);
             pictureFine.Name = "pictureFine";
-            pictureFine.Size = new Size(336, 226);
+            pictureFine.Size = new Size(327, 254);
             pictureFine.SizeMode = PictureBoxSizeMode.Zoom;
-            pictureFine.TabIndex = 12;
+            pictureFine.TabIndex = 20;
             pictureFine.TabStop = false;
             pictureFine.Visible = false;
             // 
             // labelInfo
             // 
-            labelInfo.AutoSize = true;
+            labelInfo.Location = new Point(17, 603);
-            labelInfo.Dock = DockStyle.Bottom;
-            labelInfo.Location = new Point(6, 882);
             labelInfo.Margin = new Padding(4, 0, 4, 0);
             labelInfo.Name = "labelInfo";
-            labelInfo.Size = new Size(65, 32);
+            labelInfo.Size = new Size(327, 371);
-            labelInfo.TabIndex = 11;
+            labelInfo.TabIndex = 19;
             labelInfo.Text = "label";
             // 
-            // buttonApplyPower
-            // 
-            buttonApplyPower.Location = new Point(16, 952);
-            buttonApplyPower.Margin = new Padding(4, 2, 4, 2);
-            buttonApplyPower.Name = "buttonApplyPower";
-            buttonApplyPower.Size = new Size(352, 44);
-            buttonApplyPower.TabIndex = 11;
-            buttonApplyPower.Text = "Apply Power Limits";
-            buttonApplyPower.UseVisualStyleBackColor = true;
-            // 
-            // checkAuto
-            // 
-            checkAuto.AutoSize = true;
-            checkAuto.Location = new Point(772, 958);
-            checkAuto.Margin = new Padding(4, 2, 4, 2);
-            checkAuto.Name = "checkAuto";
-            checkAuto.Size = new Size(165, 36);
-            checkAuto.TabIndex = 12;
-            checkAuto.Text = "Auto Apply";
-            checkAuto.UseVisualStyleBackColor = true;
-            // 
             // Fans
             // 
             AutoScaleDimensions = new SizeF(192F, 192F);
             AutoScaleMode = AutoScaleMode.Dpi;
             AutoSize = true;
-            ClientSize = new Size(1242, 1020);
+            AutoSizeMode = AutoSizeMode.GrowAndShrink;
-            Controls.Add(checkAuto);
+            ClientSize = new Size(1220, 1089);
-            Controls.Add(buttonApplyPower);
+            Controls.Add(panelFans);
-            Controls.Add(groupBox1);
+            Controls.Add(panelPower);
-            Controls.Add(chartGPU);
-            Controls.Add(buttonReset);
-            Controls.Add(buttonApply);
-            Controls.Add(chartCPU);
             Margin = new Padding(4, 2, 4, 2);
             MaximizeBox = false;
             MdiChildrenMinimizedAnchorBottom = false;
             MinimizeBox = false;
+            MinimumSize = new Size(0, 1160);
             Name = "Fans";
             ShowIcon = false;
             ShowInTaskbar = false;
             StartPosition = FormStartPosition.CenterScreen;
             Text = "Fans and Power";
-            ((System.ComponentModel.ISupportInitialize)chartCPU).EndInit();
+            panelFans.ResumeLayout(false);
+            panelFans.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)chartGPU).EndInit();
-            groupBox1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)chartCPU).EndInit();
-            groupBox1.PerformLayout();
+            panelPower.ResumeLayout(false);
+            panelPower.PerformLayout();
             panelCPU.ResumeLayout(false);
             panelCPU.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)trackCPU).EndInit();
@@ -300,28 +345,29 @@
             ((System.ComponentModel.ISupportInitialize)trackTotal).EndInit();
             ((System.ComponentModel.ISupportInitialize)pictureFine).EndInit();
             ResumeLayout(false);
-            PerformLayout();
         }
 
         #endregion
-
+        private Panel panelFans;
-        private System.Windows.Forms.DataVisualization.Charting.Chart chartCPU;
-        private Button buttonApply;
-        private Button buttonReset;
-        private System.Windows.Forms.DataVisualization.Charting.Chart chartGPU;
-        private GroupBox groupBox1;
-        private Button buttonApplyPower;
-        private Label labelInfo;
-        private PictureBox pictureFine;
-        private Label labelApplied;
         private CheckBox checkAuto;
-        private Panel panelTotal;
+        private System.Windows.Forms.DataVisualization.Charting.Chart chartGPU;
-        private Label labelTotal;
+        private Button buttonReset;
-        private Label label1;
+        private Button buttonApply;
-        private TrackBar trackTotal;
+        private System.Windows.Forms.DataVisualization.Charting.Chart chartCPU;
+        private Panel panelPower;
+        private CheckBox checkApplyPower;
+        private Button buttonApplyPower;
         private Panel panelCPU;
         private Label labelCPU;
         private Label label2;
         private TrackBar trackCPU;
+        private Panel panelTotal;
+        private Label labelTotal;
+        private Label label1;
+        private TrackBar trackTotal;
+        private Label labelApplied;
+        private PictureBox pictureFine;
+        private Label labelInfo;
+        private Label labelPowerLimits;
     }
 }

Fans.cs

@@ -11,14 +11,6 @@ namespace GHelper
         Series seriesCPU;
         Series seriesGPU;
 
-        const int MaxTotal = 150;
-        const int MinTotal = 15;
-        const int DefaultTotal = 125;
-
-        const int MaxCPU = 90;
-        const int MinCPU = 15;
-        const int DefaultCPU = 80;
-
         void SetChart(Chart chart, int device)
         {
 
@@ -91,11 +83,11 @@ namespace GHelper
             buttonReset.Click += ButtonReset_Click;
             buttonApply.Click += ButtonApply_Click;
 
-            trackTotal.Maximum = MaxTotal;
+            trackTotal.Maximum = ASUSWmi.MaxTotal;
-            trackTotal.Minimum = MinTotal;
+            trackTotal.Minimum = ASUSWmi.MinTotal;
 
-            trackCPU.Maximum = MaxCPU;
+            trackCPU.Maximum = ASUSWmi.MaxCPU;
-            trackCPU.Minimum = MinCPU;
+            trackCPU.Minimum = ASUSWmi.MinCPU;
 
             trackCPU.Scroll += TrackCPU_Scroll;
             trackTotal.Scroll += TrackTotal_Scroll;
@@ -103,25 +95,30 @@ namespace GHelper
             buttonApplyPower.Click += ButtonApplyPower_Click;
 
             checkAuto.Click += CheckAuto_Click;
+            checkApplyPower.Click += CheckApplyPower_Click;
 
             //labelInfo.MaximumSize = new Size(280, 0);
-            labelInfo.Text = "Power Limits (PPT) is\nexperimental feature.\n\nValues will be applied\nonly after you click 'Apply'\nand reset after performance\nmode changes.\n\nUse carefully and\non your own risk!";
+            labelInfo.Text = "Power Limits (PPT) is\nexperimental feature.\n\nUse carefully and\non your own risk!";
 
-            LoadFans();
+            InitFans();
-            VisualisePower(true);
+            InitPower();
 
             Shown += Fans_Shown;
 
         }
 
+        private void CheckApplyPower_Click(object? sender, EventArgs e)
+        {
+            if (sender is null) return;
+            CheckBox chk = (CheckBox)sender;
+            Program.config.setConfigPerf("auto_apply_power", chk.Checked ? 1 : 0);
+        }
+
         private void CheckAuto_Click(object? sender, EventArgs e)
         {
-            if (sender is null)
+            if (sender is null) return;
-                return;
-
             CheckBox chk = (CheckBox)sender;
-
+            Program.config.setConfigPerf("auto_apply", chk.Checked ? 1 : 0);
-            Program.config.setConfig("auto_apply_" + Program.config.getConfig("performance_mode"), chk.Checked ? 1 : 0);
         }
 
         private void Fans_FormClosing(object? sender, FormClosingEventArgs e)
@@ -135,78 +132,82 @@ namespace GHelper
 
         private void ButtonApplyPower_Click(object? sender, EventArgs e)
         {
-            int limit_total = trackTotal.Value;
+            Program.settingsForm.SetPower();
-            int limit_cpu = trackCPU.Value;
+            ApplyLabel(true);
-
-            Program.config.setConfig("limit_total", limit_total);
-            Program.config.setConfig("limit_cpu", limit_cpu);
-
-            Program.wmi.DeviceSet(ASUSWmi.PPT_TotalA0, limit_total);
-            Program.wmi.DeviceSet(ASUSWmi.PPT_TotalA1, limit_total);
-
-            Program.wmi.DeviceSet(ASUSWmi.PPT_CPUB0, limit_cpu);
-
-            labelApplied.ForeColor = Color.Blue;
-            labelApplied.Text = "Applied";
-
         }
 
-        public void VisualisePower(bool init = false)
+        public void InitPower(bool changed = false)
         {
 
-            panelTotal.Visible = (Program.wmi.DeviceGet(ASUSWmi.PPT_TotalA0) >= 0);
+            panelPower.Visible = (Program.wmi.DeviceGet(ASUSWmi.PPT_TotalA0) >= 0);
             panelCPU.Visible = (Program.wmi.DeviceGet(ASUSWmi.PPT_CPUB0) >= 0);
 
             int limit_total;
             int limit_cpu;
+            bool apply = Program.config.getConfigPerf("auto_apply_power") == 1;
 
-            if (init)
+            if (changed)
-            {
-                limit_total = Program.config.getConfig("limit_total");
-                limit_cpu = Program.config.getConfig("limit_cpu");
-            }
-            else
             {
                 limit_total = trackTotal.Value;
                 limit_cpu = trackCPU.Value;
+                ApplyLabel(false);
+            }
+            else
+            {
+                limit_total = Program.config.getConfigPerf("limit_total");
+                limit_cpu = Program.config.getConfigPerf("limit_cpu");
+                ApplyLabel(apply);
             }
 
-            if (limit_total < 0) limit_total = DefaultTotal;
+            if (limit_total < 0) limit_total = ASUSWmi.DefaultTotal;
-            if (limit_total > MaxTotal) limit_total = MaxTotal;
+            if (limit_total > ASUSWmi.MaxTotal) limit_total = ASUSWmi.MaxTotal;
-            if (limit_total < MinTotal) limit_total = MinTotal;
+            if (limit_total < ASUSWmi.MinTotal) limit_total = ASUSWmi.MinTotal;
-
-            if (limit_cpu < 0) limit_cpu = DefaultCPU;
-            if (limit_cpu > MaxCPU) limit_cpu = MaxCPU;
-            if (limit_cpu < MinCPU) limit_cpu = MinCPU;
 
+            if (limit_cpu < 0) limit_cpu = ASUSWmi.DefaultCPU;
+            if (limit_cpu > ASUSWmi.MaxCPU) limit_cpu = ASUSWmi.MaxCPU;
+            if (limit_cpu < ASUSWmi.MinCPU) limit_cpu = ASUSWmi.MinCPU;
             if (limit_cpu > limit_total) limit_cpu = limit_total;
 
             trackTotal.Value = limit_total;
             trackCPU.Value = limit_cpu;
+            checkApplyPower.Checked = apply;
 
             labelTotal.Text = trackTotal.Value.ToString() + "W";
             labelCPU.Text = trackCPU.Value.ToString() + "W";
-
             pictureFine.Visible = (limit_cpu > 85 || limit_total > 145);
+
+            Program.config.setConfigPerf("limit_total", limit_total);
+            Program.config.setConfigPerf("limit_cpu", limit_cpu);
         }
 
+
         private void TrackTotal_Scroll(object? sender, EventArgs e)
         {
-            VisualisePower();
+            InitPower(true);
         }
 
         private void TrackCPU_Scroll(object? sender, EventArgs e)
         {
-            VisualisePower();
+            InitPower(true);
         }
 
-        public void ResetApplyLabel()
+
+        public void ApplyLabel(bool applied = false)
         {
-            labelApplied.ForeColor = Color.Red;
+            if (applied)
-            labelApplied.Text = "Not Applied";
+            {
+                labelApplied.ForeColor = Color.Blue;
+                labelApplied.Text = "Applied";
+            }
+            else
+            {
+                labelApplied.ForeColor = Color.Red;
+                labelApplied.Text = "Not Applied";
+
+            }
         }
 
-        public void LoadFans()
+        public void InitFans()
         {
 
             SetChart(chartCPU, 0);
@@ -215,7 +216,7 @@ namespace GHelper
             LoadProfile(seriesCPU, 0);
             LoadProfile(seriesGPU, 1);
 
-            int auto_apply = Program.config.getConfig("auto_apply_" + Program.config.getConfig("performance_mode"));
+            int auto_apply = Program.config.getConfigPerf("auto_apply");
 
             checkAuto.Checked = (auto_apply == 1);
 
@@ -277,15 +278,19 @@ namespace GHelper
 
         private void ButtonReset_Click(object? sender, EventArgs e)
         {
+
             LoadProfile(seriesCPU, 0, 1);
             LoadProfile(seriesGPU, 1, 1);
 
             checkAuto.Checked = false;
-            Program.config.setConfig("auto_apply_" + Program.config.getConfig("performance_mode"), 0);
+            checkApplyPower.Checked = false;
+
+            Program.config.setConfigPerf("auto_apply", 0);
+            Program.config.setConfigPerf("auto_apply_power", 0);
 
             Program.wmi.DeviceSet(ASUSWmi.PerformanceMode, Program.config.getConfig("performance_mode"));
 
-            ResetApplyLabel();
+            ApplyLabel(false);
         }
 
         private void ChartCPU_MouseUp(object? sender, MouseEventArgs e)

GHelper.csproj

@@ -15,7 +15,7 @@
     <AssemblyName>GHelper</AssemblyName>
     <PlatformTarget>x64</PlatformTarget>
     <ProduceReferenceAssembly>False</ProduceReferenceAssembly>
-    <AssemblyVersion>0.17</AssemblyVersion>
+    <AssemblyVersion>0.18</AssemblyVersion>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
   </PropertyGroup>
 

NativeMethods.cs

@@ -1,6 +1,7 @@
 using System.Diagnostics;
 using System.Management;
 using System.Runtime.InteropServices;
+using System.Windows.Forms;
 
 public class NativeMethods
 {
@@ -253,29 +254,37 @@ public class NativeMethods
             deviceNum = 0;
         }
 
-        counter = 0;
+
-        for (uint id = 0; EnumDisplayDevicesA(null, id, ref d, 0); id++)
+        try
         {
-            if ((d.StateFlags & DisplayDeviceStateFlags.AttachedToDesktop) != 0)
+            counter = 0;
+            for (uint id = 0; EnumDisplayDevicesA(null, id, ref d, 0); id++)
             {
-                if (counter == deviceNum)
+                if ((d.StateFlags & DisplayDeviceStateFlags.AttachedToDesktop) != 0)
                 {
-                    laptopScreen = d.DeviceName;
                     //Debug.WriteLine(d.DeviceID);
                     //Debug.WriteLine(d.DeviceName);
+                    if (counter == deviceNum)
+                    {
+                        laptopScreen = d.DeviceName;
+                    }
+                    counter++;
                 }
-                counter++;
+
             }
-
+        } catch
-        }
-
-        /*
-        if (laptopScreen is null)
         {
-            foreach (var screen in screens)
+            Debug.WriteLine("Failed to enumerate displays");
-                Debug.WriteLine(screen.DeviceName);
+        }
+
+        // Mismatch between active screens and enumerated screens, fallback to old method
+        if (counter != activeScreens.Count)
+        {
+            laptopScreen = null;
+            foreach (var screen in Screen.AllScreens)
+                if (screen.DeviceName == laptopScreenName)
+                    laptopScreen = screen.DeviceName;
         }
-        */
 
         return laptopScreen;
     }

Program.cs

@@ -96,13 +96,16 @@ namespace GHelper
         private static void SetAutoModes()
         {
             PowerLineStatus isPlugged = SystemInformation.PowerStatus.PowerLineStatus;
-            settingsForm.AutoGPUMode(isPlugged);
-            settingsForm.AutoScreen(isPlugged);
-            settingsForm.AutoPerformance(isPlugged);
 
-            settingsForm.SetMatrix(isPlugged);
+            Debug.WriteLine(isPlugged.ToString());
 
             settingsForm.SetBatteryChargeLimit(config.getConfig("charge_limit"));
+            settingsForm.AutoPerformance(isPlugged);
+            settingsForm.AutoScreen(isPlugged);
+
+            settingsForm.AutoGPUMode(isPlugged);
+            settingsForm.SetMatrix(isPlugged);
+
         }
 
         private static void SystemEvents_PowerModeChanged(object sender, PowerModeChangedEventArgs e)

Settings.cs

@@ -97,6 +97,8 @@ namespace GHelper
 
         }
 
+
+
         private void CheckMatrix_CheckedChanged(object? sender, EventArgs e)
         {
             if (sender is null) return;
@@ -174,9 +176,9 @@ namespace GHelper
 
         private void ButtonMatrix_Click(object? sender, EventArgs e)
         {
-            string fileName = "";
+            string fileName = null;
 
-            Thread t = new Thread((ThreadStart)(() =>
+            Thread t = new Thread(() =>
             {
                 OpenFileDialog of = new OpenFileDialog();
                 of.Filter = "Image Files (*.bmp;*.jpg;*.jpeg,*.png,*.gif)|*.BMP;*.JPG;*.JPEG;*.PNG;*.GIF";
@@ -185,18 +187,22 @@ namespace GHelper
                     fileName = of.FileName;
                 }
                 return;
-            }));
+            });
 
             t.SetApartmentState(ApartmentState.STA);
             t.Start();
             t.Join();
 
-            Program.config.setConfig("matrix_picture", fileName);
+            if (fileName is not null)
-            SetMatrixPicture(fileName);
-            BeginInvoke(delegate
             {
-                comboMatrixRunning.SelectedIndex = 2;
+                Program.config.setConfig("matrix_picture", fileName);
-            });
+                SetMatrixPicture(fileName);
+                BeginInvoke(delegate
+                {
+                    comboMatrixRunning.SelectedIndex = 2;
+                });
+            }
+
 
         }
 
@@ -305,7 +311,7 @@ namespace GHelper
             if (fans == null || fans.Text == "")
             {
                 fans = new Fans();
-                Debug.WriteLine("Starting fans");
+                //Debug.WriteLine("Starting fans");
             }
 
             if (fans.Visible)
@@ -682,6 +688,26 @@ namespace GHelper
             }
         }
 
+        public void SetPower()
+        {
+            int limit_total = Program.config.getConfigPerf("limit_total");
+            int limit_cpu = Program.config.getConfigPerf("limit_cpu");
+
+            if (limit_total > ASUSWmi.MaxTotal) return;
+            if (limit_total < ASUSWmi.MinTotal) return;
+
+            if (limit_cpu > ASUSWmi.MaxCPU) return;
+            if (limit_cpu < ASUSWmi.MinCPU) return;
+
+            Program.wmi.DeviceSet(ASUSWmi.PPT_TotalA0, limit_total);
+            Program.wmi.DeviceSet(ASUSWmi.PPT_TotalA1, limit_total);
+            Program.wmi.DeviceSet(ASUSWmi.PPT_CPUB0, limit_cpu);
+            
+            Debug.WriteLine(limit_total.ToString() + ", " + limit_cpu.ToString());
+
+
+        }
+
         public void SetPerformanceMode(int PerformanceMode = ASUSWmi.PerformanceBalanced, bool notify = false)
         {
 
@@ -712,16 +738,21 @@ namespace GHelper
 
             Program.wmi.DeviceSet(ASUSWmi.PerformanceMode, PerformanceMode);
 
-            if (Program.config.getConfig("auto_apply_" + PerformanceMode) == 1)
+            if (Program.config.getConfigPerf("auto_apply") == 1)
             {
                 Program.wmi.SetFanCurve(0, Program.config.getFanConfig(0));
                 Program.wmi.SetFanCurve(1, Program.config.getFanConfig(1));
             }
 
+            if (Program.config.getConfigPerf("auto_apply_power") == 1)
+            {
+                SetPower();
+            }
+
             if (fans != null && fans.Text != "")
             {
-                fans.LoadFans();
+                fans.InitFans();
-                fans.ResetApplyLabel();
+                fans.InitPower();
             }
 
             if (notify && (oldMode != PerformanceMode))
@@ -967,7 +998,7 @@ namespace GHelper
             }
         }
 
-        public void SetBatteryChargeLimit(int limit = 100)
+        public void SetBatteryChargeLimit(int limit)
         {
 
             if (limit < 40 || limit > 100) return;