Heatmap

app/AsusUSB.cs

@@ -1,28 +1,10 @@
-using HidLibrary;
+using GHelper.Helpers;
-using System.Diagnostics;
+using HidLibrary;
 using System.Text;
 
 namespace GHelper
 {
 
-    public class ColorUtilities
-    {
-        // Method to get the weighted average between two colors
-        public static Color GetWeightedAverage(Color color1, Color color2, double weight)
-        {
-
-            int red = (int)Math.Round(color1.R * (1 - weight) + color2.R * weight);
-            int green = (int)Math.Round(color1.G * (1 - weight) + color2.G * weight);
-            int blue = (int)Math.Round(color1.B * (1 - weight) + color2.B * weight);
-
-            red = Math.Min(255, Math.Max(0, red));
-            green = Math.Min(255, Math.Max(0, green));
-            blue = Math.Min(255, Math.Max(0, blue));
-
-            return Color.FromArgb(red, green, blue);
-        }
-    }
-
     [Flags]
     public enum AuraDev19b6 : uint
     {
@@ -103,15 +85,15 @@ namespace GHelper
 
         private static void Timer_Elapsed(object? sender, System.Timers.ElapsedEventArgs e)
         {
-            int cpuTemp = Program.acpi.DeviceGet(AsusACPI.Temp_CPU);
+            float cpuTemp = (float)HardwareControl.GetCPUTemp();
-            int freeze = 20, cold = 45, warm = 65, hot = 90;
+            int freeze = 20, cold = 40, warm = 65, hot = 90;
             Color color;
 
             //Debug.WriteLine(cpuTemp);
 
-            if (cpuTemp < cold) color = color = ColorUtilities.GetWeightedAverage(Color.Blue, Color.Green, ((double)cpuTemp - freeze) / (cold - freeze));
+            if (cpuTemp < cold) color = ColorUtilities.GetWeightedAverage(Color.Blue, Color.Green, ((float)cpuTemp - freeze) / (cold - freeze));
-            else if (cpuTemp < warm) color = ColorUtilities.GetWeightedAverage(Color.Green, Color.Yellow, ((double)cpuTemp - cold) / (warm - cold));
+            else if (cpuTemp < warm) color = ColorUtilities.GetWeightedAverage(Color.Green, Color.Yellow, ((float)cpuTemp - cold) / (warm - cold));
-            else if (cpuTemp < hot) color = ColorUtilities.GetWeightedAverage(Color.Yellow, Color.Red, ((double)cpuTemp - warm) / (hot - warm));
+            else if (cpuTemp < hot) color = ColorUtilities.GetWeightedAverage(Color.Yellow, Color.Red, ((float)cpuTemp - warm) / (hot - warm));
             else color = Color.Red;
 
             ApplyColor(color);

app/HardwareControl.cs

@@ -24,6 +24,8 @@ public static class HardwareControl
 
     public static int? gpuUse;
 
+    static long lastUpdate;
+
     public static int GetFanMax()
     {
         int max = 58;
@@ -170,15 +172,10 @@ public static class HardwareControl
         return health;
     }
 
-    public static void ReadSensors()
+    public static float? GetCPUTemp() {
-    {
-        batteryRate = 0;
-        gpuTemp = -1;
-        gpuUse = -1;
 
-        cpuFan = FormatFan(Program.acpi.DeviceGet(AsusACPI.CPU_Fan));
+        if (Math.Abs(DateTimeOffset.Now.ToUnixTimeMilliseconds() - lastUpdate) < 1000) return cpuTemp;
-        gpuFan = FormatFan(Program.acpi.DeviceGet(AsusACPI.GPU_Fan));
+        lastUpdate = DateTimeOffset.Now.ToUnixTimeMilliseconds();
-        midFan = FormatFan(Program.acpi.DeviceGet(AsusACPI.Mid_Fan));
 
         cpuTemp = Program.acpi.DeviceGet(AsusACPI.Temp_CPU);
 
@@ -194,6 +191,22 @@ public static class HardwareControl
                 Debug.WriteLine("Failed reading CPU temp :" + ex.Message);
             }
 
+        return cpuTemp;
+    }
+
+
+    public static void ReadSensors()
+    {
+        batteryRate = 0;
+        gpuTemp = -1;
+        gpuUse = -1;
+
+        cpuFan = FormatFan(Program.acpi.DeviceGet(AsusACPI.CPU_Fan));
+        gpuFan = FormatFan(Program.acpi.DeviceGet(AsusACPI.GPU_Fan));
+        midFan = FormatFan(Program.acpi.DeviceGet(AsusACPI.Mid_Fan));
+
+        cpuTemp = GetCPUTemp();
+
         try
         {
             gpuTemp = GpuControl?.GetCurrentTemperature();

app/Helpers/ColorUtilities.cs

@@ -0,0 +1,21 @@
+namespace GHelper.Helpers
+{
+    public class ColorUtilities
+    {
+        // Method to get the weighted average between two colors
+        public static Color GetWeightedAverage(Color color1, Color color2, float weight)
+        {
+
+            int red = (int)Math.Round(color1.R * (1 - weight) + color2.R * weight);
+            int green = (int)Math.Round(color1.G * (1 - weight) + color2.G * weight);
+            int blue = (int)Math.Round(color1.B * (1 - weight) + color2.B * weight);
+
+            red = Math.Min(255, Math.Max(0, red));
+            green = Math.Min(255, Math.Max(0, green));
+            blue = Math.Min(255, Math.Max(0, blue));
+
+            return Color.FromArgb(red, green, blue);
+        }
+    }
+
+}

app/Settings.Designer.cs

@@ -47,7 +47,6 @@ namespace GHelper
             labelBatteryTitle = new Label();
             panelFooter = new Panel();
             tableButtons = new TableLayoutPanel();
-            buttonKeyboard = new RButton();
             buttonUpdates = new RButton();
             buttonQuit = new RButton();
             checkStartup = new CheckBox();
@@ -87,6 +86,7 @@ namespace GHelper
             labelSreen = new Label();
             panelKeyboard = new Panel();
             tableLayoutKeyboard = new TableLayoutPanel();
+            buttonKeyboard = new RButton();
             panelColor = new Panel();
             pictureColor2 = new PictureBox();
             pictureColor = new PictureBox();
@@ -136,7 +136,7 @@ namespace GHelper
             panelMatrix.Controls.Add(panelMatrixTitle);
             panelMatrix.Controls.Add(checkMatrix);
             panelMatrix.Dock = DockStyle.Top;
-            panelMatrix.Location = new Point(11, 898);
+            panelMatrix.Location = new Point(11, 758);
             panelMatrix.Margin = new Padding(0);
             panelMatrix.Name = "panelMatrix";
             panelMatrix.Padding = new Padding(20, 20, 20, 11);
@@ -203,11 +203,11 @@ namespace GHelper
             buttonMatrix.Dock = DockStyle.Top;
             buttonMatrix.FlatAppearance.BorderSize = 0;
             buttonMatrix.FlatStyle = FlatStyle.Flat;
-            buttonMatrix.Location = new Point(518, 8);
+            buttonMatrix.Location = new Point(518, 6);
-            buttonMatrix.Margin = new Padding(4, 8, 4, 8);
+            buttonMatrix.Margin = new Padding(4, 6, 4, 6);
             buttonMatrix.Name = "buttonMatrix";
             buttonMatrix.Secondary = true;
-            buttonMatrix.Size = new Size(249, 44);
+            buttonMatrix.Size = new Size(249, 48);
             buttonMatrix.TabIndex = 18;
             buttonMatrix.Text = Properties.Strings.PictureGif;
             buttonMatrix.UseVisualStyleBackColor = false;
@@ -348,14 +348,13 @@ namespace GHelper
             // tableButtons
             // 
             tableButtons.AutoSize = true;
-            tableButtons.ColumnCount = 4;
+            tableButtons.ColumnCount = 3;
             tableButtons.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F));
             tableButtons.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F));
-            tableButtons.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 8.33083248F));
+            tableButtons.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F));
-            tableButtons.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25.0024986F));
+            tableButtons.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 20F));
-            tableButtons.Controls.Add(buttonKeyboard, 0, 0);
+            tableButtons.Controls.Add(buttonUpdates, 0, 0);
-            tableButtons.Controls.Add(buttonUpdates, 1, 0);
+            tableButtons.Controls.Add(buttonQuit, 2, 0);
-            tableButtons.Controls.Add(buttonQuit, 3, 0);
             tableButtons.Dock = DockStyle.Top;
             tableButtons.Location = new Point(20, 20);
             tableButtons.Name = "tableButtons";
@@ -364,28 +363,6 @@ namespace GHelper
             tableButtons.Size = new Size(771, 58);
             tableButtons.TabIndex = 25;
             // 
-            // buttonKeyboard
-            // 
-            buttonKeyboard.AccessibleName = "Extra Settings";
-            buttonKeyboard.Activated = false;
-            buttonKeyboard.BackColor = SystemColors.ControlLight;
-            buttonKeyboard.BorderColor = Color.Transparent;
-            buttonKeyboard.BorderRadius = 2;
-            buttonKeyboard.Dock = DockStyle.Top;
-            buttonKeyboard.FlatAppearance.BorderSize = 0;
-            buttonKeyboard.FlatStyle = FlatStyle.Flat;
-            buttonKeyboard.Image = Properties.Resources.icons8_settings_32;
-            buttonKeyboard.ImageAlign = ContentAlignment.MiddleRight;
-            buttonKeyboard.Location = new Point(4, 4);
-            buttonKeyboard.Margin = new Padding(4);
-            buttonKeyboard.Name = "buttonKeyboard";
-            buttonKeyboard.Secondary = true;
-            buttonKeyboard.Size = new Size(248, 50);
-            buttonKeyboard.TabIndex = 24;
-            buttonKeyboard.Text = Properties.Strings.Extra;
-            buttonKeyboard.TextImageRelation = TextImageRelation.ImageBeforeText;
-            buttonKeyboard.UseVisualStyleBackColor = false;
-            // 
             // buttonUpdates
             // 
             buttonUpdates.AccessibleName = "BIOS and Driver Updates";
@@ -397,12 +374,12 @@ namespace GHelper
             buttonUpdates.FlatStyle = FlatStyle.Flat;
             buttonUpdates.Image = Properties.Resources.icons8_software_32_white;
             buttonUpdates.ImageAlign = ContentAlignment.MiddleRight;
-            buttonUpdates.Location = new Point(260, 4);
+            buttonUpdates.Location = new Point(4, 4);
             buttonUpdates.Margin = new Padding(4);
             buttonUpdates.Name = "buttonUpdates";
             buttonUpdates.Secondary = true;
             buttonUpdates.Size = new Size(248, 50);
-            buttonUpdates.TabIndex = 22;
+            buttonUpdates.TabIndex = 24;
             buttonUpdates.Text = "Updates";
             buttonUpdates.TextImageRelation = TextImageRelation.ImageBeforeText;
             buttonUpdates.UseVisualStyleBackColor = false;
@@ -416,13 +393,16 @@ namespace GHelper
             buttonQuit.BorderRadius = 2;
             buttonQuit.Dock = DockStyle.Top;
             buttonQuit.FlatStyle = FlatStyle.Flat;
-            buttonQuit.Location = new Point(580, 4);
+            buttonQuit.Image = Properties.Resources.icons8_quit_32;
+            buttonQuit.Location = new Point(516, 4);
             buttonQuit.Margin = new Padding(4);
             buttonQuit.Name = "buttonQuit";
             buttonQuit.Secondary = true;
-            buttonQuit.Size = new Size(187, 50);
+            buttonQuit.Size = new Size(251, 50);
             buttonQuit.TabIndex = 23;
             buttonQuit.Text = "Quit";
+            buttonQuit.TextAlign = ContentAlignment.MiddleRight;
+            buttonQuit.TextImageRelation = TextImageRelation.ImageBeforeText;
             buttonQuit.UseVisualStyleBackColor = false;
             // 
             // checkStartup
@@ -1025,7 +1005,7 @@ namespace GHelper
             panelKeyboard.Controls.Add(tableLayoutKeyboard);
             panelKeyboard.Controls.Add(panelKeyboardTitle);
             panelKeyboard.Dock = DockStyle.Top;
-            panelKeyboard.Location = new Point(11, 758);
+            panelKeyboard.Location = new Point(11, 929);
             panelKeyboard.Margin = new Padding(0);
             panelKeyboard.Name = "panelKeyboard";
             panelKeyboard.Padding = new Padding(20);
@@ -1040,6 +1020,7 @@ namespace GHelper
             tableLayoutKeyboard.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33F));
             tableLayoutKeyboard.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33F));
             tableLayoutKeyboard.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33F));
+            tableLayoutKeyboard.Controls.Add(buttonKeyboard, 0, 0);
             tableLayoutKeyboard.Controls.Add(panelColor, 0, 0);
             tableLayoutKeyboard.Controls.Add(comboKeyboard, 0, 0);
             tableLayoutKeyboard.Dock = DockStyle.Top;
@@ -1051,6 +1032,28 @@ namespace GHelper
             tableLayoutKeyboard.Size = new Size(771, 60);
             tableLayoutKeyboard.TabIndex = 39;
             // 
+            // buttonKeyboard
+            // 
+            buttonKeyboard.AccessibleName = "Extra Settings";
+            buttonKeyboard.Activated = false;
+            buttonKeyboard.BackColor = SystemColors.ControlLight;
+            buttonKeyboard.BorderColor = Color.Transparent;
+            buttonKeyboard.BorderRadius = 2;
+            buttonKeyboard.Dock = DockStyle.Top;
+            buttonKeyboard.FlatAppearance.BorderSize = 0;
+            buttonKeyboard.FlatStyle = FlatStyle.Flat;
+            buttonKeyboard.Image = Properties.Resources.icons8_settings_32;
+            buttonKeyboard.ImageAlign = ContentAlignment.MiddleRight;
+            buttonKeyboard.Location = new Point(518, 6);
+            buttonKeyboard.Margin = new Padding(4, 6, 4, 6);
+            buttonKeyboard.Name = "buttonKeyboard";
+            buttonKeyboard.Secondary = true;
+            buttonKeyboard.Size = new Size(249, 48);
+            buttonKeyboard.TabIndex = 37;
+            buttonKeyboard.Text = Properties.Strings.Extra;
+            buttonKeyboard.TextImageRelation = TextImageRelation.ImageBeforeText;
+            buttonKeyboard.UseVisualStyleBackColor = false;
+            // 
             // panelColor
             // 
             panelColor.AutoSize = true;
@@ -1058,10 +1061,10 @@ namespace GHelper
             panelColor.Controls.Add(pictureColor);
             panelColor.Controls.Add(buttonKeyboardColor);
             panelColor.Dock = DockStyle.Fill;
-            panelColor.Location = new Point(261, 8);
+            panelColor.Location = new Point(261, 6);
-            panelColor.Margin = new Padding(4, 8, 4, 8);
+            panelColor.Margin = new Padding(4, 6, 4, 6);
             panelColor.Name = "panelColor";
-            panelColor.Size = new Size(249, 44);
+            panelColor.Size = new Size(249, 48);
             panelColor.TabIndex = 36;
             // 
             // pictureColor2
@@ -1095,10 +1098,10 @@ namespace GHelper
             buttonKeyboardColor.FlatStyle = FlatStyle.Flat;
             buttonKeyboardColor.ForeColor = SystemColors.ControlText;
             buttonKeyboardColor.Location = new Point(0, 0);
-            buttonKeyboardColor.Margin = new Padding(4, 8, 4, 8);
+            buttonKeyboardColor.Margin = new Padding(4);
             buttonKeyboardColor.Name = "buttonKeyboardColor";
             buttonKeyboardColor.Secondary = false;
-            buttonKeyboardColor.Size = new Size(249, 44);
+            buttonKeyboardColor.Size = new Size(249, 48);
             buttonKeyboardColor.TabIndex = 14;
             buttonKeyboardColor.Text = Properties.Strings.Color;
             buttonKeyboardColor.UseVisualStyleBackColor = false;
@@ -1188,8 +1191,8 @@ namespace GHelper
             Controls.Add(panelFooter);
             Controls.Add(panelVersion);
             Controls.Add(panelBattery);
-            Controls.Add(panelMatrix);
             Controls.Add(panelKeyboard);
+            Controls.Add(panelMatrix);
             Controls.Add(panelScreen);
             Controls.Add(panelGPU);
             Controls.Add(panelPerformance);
@@ -1289,7 +1292,6 @@ namespace GHelper
         private RButton buttonKeyboardColor;
         private RButton buttonFans;
         private Slider sliderBattery;
-        private RButton buttonUpdates;
         private Panel panelGPUTitle;
         private PictureBox pictureGPU;
         private Label labelGPU;
@@ -1315,7 +1317,8 @@ namespace GHelper
         private Panel panelVersion;
         private Label labelVersion;
         private RButton buttonStopGPU;
-        private RButton buttonKeyboard;
         private TableLayoutPanel tableButtons;
+        private RButton buttonUpdates;
+        private RButton buttonKeyboard;
     }
 }