diff --git a/Fans.Designer.cs b/Fans.Designer.cs
index 2793a5a2..ea8bf5f1 100644
--- a/Fans.Designer.cs
+++ b/Fans.Designer.cs
@@ -28,9 +28,10 @@
///
private void InitializeComponent()
{
- System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea5 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
- System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea6 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
+ System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea3 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
+ System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea4 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
panelFans = new Panel();
+ labelFans = new Label();
checkAuto = new CheckBox();
chartGPU = new System.Windows.Forms.DataVisualization.Charting.Chart();
buttonReset = new Button();
@@ -51,6 +52,7 @@
labelApplied = new Label();
pictureFine = new PictureBox();
labelInfo = new Label();
+ checkBoost = new CheckBox();
panelFans.SuspendLayout();
((System.ComponentModel.ISupportInitialize)chartGPU).BeginInit();
((System.ComponentModel.ISupportInitialize)chartCPU).BeginInit();
@@ -64,6 +66,8 @@
//
// panelFans
//
+ panelFans.Controls.Add(checkBoost);
+ panelFans.Controls.Add(labelFans);
panelFans.Controls.Add(checkAuto);
panelFans.Controls.Add(chartGPU);
panelFans.Controls.Add(buttonReset);
@@ -78,11 +82,21 @@
panelFans.Size = new Size(872, 1089);
panelFans.TabIndex = 12;
//
+ // labelFans
+ //
+ labelFans.AutoSize = true;
+ labelFans.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point);
+ labelFans.Location = new Point(24, 15);
+ labelFans.Name = "labelFans";
+ labelFans.Size = new Size(138, 32);
+ labelFans.TabIndex = 28;
+ labelFans.Text = "Fan Curves";
+ //
// checkAuto
//
checkAuto.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
checkAuto.AutoSize = true;
- checkAuto.Location = new Point(584, 981);
+ checkAuto.Location = new Point(411, 1030);
checkAuto.Margin = new Padding(4, 2, 4, 2);
checkAuto.Name = "checkAuto";
checkAuto.Size = new Size(165, 36);
@@ -93,9 +107,9 @@
// chartGPU
//
chartGPU.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
- chartArea5.Name = "ChartArea1";
- chartGPU.ChartAreas.Add(chartArea5);
- chartGPU.Location = new Point(22, 502);
+ chartArea3.Name = "ChartArea1";
+ chartGPU.ChartAreas.Add(chartArea3);
+ chartGPU.Location = new Point(22, 547);
chartGPU.Margin = new Padding(4, 2, 4, 2);
chartGPU.Name = "chartGPU";
chartGPU.Size = new Size(810, 460);
@@ -127,9 +141,9 @@
// chartCPU
//
chartCPU.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
- chartArea6.Name = "ChartArea1";
- chartCPU.ChartAreas.Add(chartArea6);
- chartCPU.Location = new Point(22, 21);
+ chartArea4.Name = "ChartArea1";
+ chartCPU.ChartAreas.Add(chartArea4);
+ chartCPU.Location = new Point(22, 66);
chartCPU.Margin = new Padding(10);
chartCPU.Name = "chartCPU";
chartCPU.Size = new Size(810, 460);
@@ -166,7 +180,7 @@
//
checkApplyPower.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
checkApplyPower.AutoSize = true;
- checkApplyPower.Location = new Point(17, 981);
+ checkApplyPower.Location = new Point(21, 982);
checkApplyPower.Margin = new Padding(4, 2, 4, 2);
checkApplyPower.Name = "checkApplyPower";
checkApplyPower.Size = new Size(165, 36);
@@ -294,7 +308,7 @@
pictureFine.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
pictureFine.BackgroundImageLayout = ImageLayout.Zoom;
pictureFine.Image = Properties.Resources.everything_is_fine_itsfine;
- pictureFine.Location = new Point(17, 694);
+ pictureFine.Location = new Point(17, 671);
pictureFine.Margin = new Padding(4, 2, 4, 2);
pictureFine.Name = "pictureFine";
pictureFine.Size = new Size(327, 254);
@@ -308,10 +322,22 @@
labelInfo.Location = new Point(17, 603);
labelInfo.Margin = new Padding(4, 0, 4, 0);
labelInfo.Name = "labelInfo";
- labelInfo.Size = new Size(327, 371);
+ labelInfo.Size = new Size(327, 330);
labelInfo.TabIndex = 19;
labelInfo.Text = "label";
//
+ // checkBoost
+ //
+ checkBoost.AutoSize = true;
+ checkBoost.ForeColor = SystemColors.ControlText;
+ checkBoost.Location = new Point(512, 15);
+ checkBoost.Margin = new Padding(4, 2, 4, 2);
+ checkBoost.Name = "checkBoost";
+ checkBoost.Size = new Size(320, 36);
+ checkBoost.TabIndex = 35;
+ checkBoost.Text = "CPU Turbo Boost enabled";
+ checkBoost.UseVisualStyleBackColor = true;
+ //
// Fans
//
AutoScaleDimensions = new SizeF(192F, 192F);
@@ -369,5 +395,7 @@
private PictureBox pictureFine;
private Label labelInfo;
private Label labelPowerLimits;
+ private Label labelFans;
+ private CheckBox checkBoost;
}
}
\ No newline at end of file
diff --git a/Fans.cs b/Fans.cs
index 7178cbe7..fd5ebb5b 100644
--- a/Fans.cs
+++ b/Fans.cs
@@ -22,7 +22,7 @@ namespace GHelper
title = "CPU Fan Profile";
if (Program.settingsForm.perfName.Length > 0)
- title += ": " + Program.settingsForm.perfName;
+ labelFans.Text = "Fan Profiles: " + Program.settingsForm.perfName;
if (chart.Titles.Count > 0)
chart.Titles[0].Text = title;
@@ -102,11 +102,33 @@ namespace GHelper
InitFans();
InitPower();
+ InitBoost();
+
+ checkBoost.Click += CheckBoost_Click;
Shown += Fans_Shown;
}
+
+ public void InitBoost()
+ {
+ int boost = NativeMethods.GetCPUBoost();
+ checkBoost.Checked = (boost > 0);
+ }
+
+ private void CheckBoost_Click(object? sender, EventArgs e)
+ {
+ if (sender is null)
+ return;
+
+ CheckBox chk = (CheckBox)sender;
+ if (chk.Checked)
+ NativeMethods.SetCPUBoost(2);
+ else
+ NativeMethods.SetCPUBoost(0);
+ }
+
private void CheckApplyPower_Click(object? sender, EventArgs e)
{
if (sender is null) return;
diff --git a/GHelper.csproj b/GHelper.csproj
index e04b79ea..75968040 100644
--- a/GHelper.csproj
+++ b/GHelper.csproj
@@ -15,7 +15,7 @@
GHelper
x64
False
- 0.18.2
+ 0.20
True
diff --git a/Program.cs b/Program.cs
index fcd9ec26..c3c8b045 100644
--- a/Program.cs
+++ b/Program.cs
@@ -75,7 +75,6 @@ namespace GHelper
wmi.SubscribeToEvents(WatcherEventArrived);
settingsForm.InitGPUMode();
- settingsForm.InitBoost();
settingsForm.InitAura();
settingsForm.InitMatrix();
diff --git a/Settings.Designer.cs b/Settings.Designer.cs
index 2a4c84a3..41b1b8cf 100644
--- a/Settings.Designer.cs
+++ b/Settings.Designer.cs
@@ -48,7 +48,6 @@
checkStartup = new CheckBox();
panelPerformance = new Panel();
buttonFans = new Button();
- checkBoost = new CheckBox();
picturePerf = new PictureBox();
labelPerf = new Label();
labelCPUFan = new Label();
@@ -323,7 +322,6 @@
// panelPerformance
//
panelPerformance.Controls.Add(buttonFans);
- panelPerformance.Controls.Add(checkBoost);
panelPerformance.Controls.Add(picturePerf);
panelPerformance.Controls.Add(labelPerf);
panelPerformance.Controls.Add(labelCPUFan);
@@ -348,18 +346,6 @@
buttonFans.Text = "Fans and Power";
buttonFans.UseVisualStyleBackColor = false;
//
- // checkBoost
- //
- checkBoost.AutoSize = true;
- checkBoost.ForeColor = SystemColors.GrayText;
- checkBoost.Location = new Point(27, 154);
- checkBoost.Margin = new Padding(4, 2, 4, 2);
- checkBoost.Name = "checkBoost";
- checkBoost.Size = new Size(320, 36);
- checkBoost.TabIndex = 33;
- checkBoost.Text = "CPU Turbo Boost enabled";
- checkBoost.UseVisualStyleBackColor = true;
- //
// picturePerf
//
picturePerf.BackgroundImage = (Image)resources.GetObject("picturePerf.BackgroundImage");
@@ -872,7 +858,6 @@
private CheckBox checkStartup;
private Panel panelPerformance;
private Button buttonFans;
- private CheckBox checkBoost;
private PictureBox picturePerf;
private Label labelPerf;
private Label labelCPUFan;
diff --git a/Settings.cs b/Settings.cs
index e92abe57..f566ebb6 100644
--- a/Settings.cs
+++ b/Settings.cs
@@ -61,7 +61,6 @@ namespace GHelper
buttonQuit.Click += ButtonQuit_Click;
- checkBoost.Click += CheckBoost_Click;
checkScreen.CheckedChanged += checkScreen_CheckedChanged;
@@ -483,19 +482,6 @@ namespace GHelper
SetAuraMode(cmb.SelectedIndex);
}
-
- private void CheckBoost_Click(object? sender, EventArgs e)
- {
- if (sender is null)
- return;
-
- CheckBox chk = (CheckBox)sender;
- if (chk.Checked)
- NativeMethods.SetCPUBoost(2);
- else
- NativeMethods.SetCPUBoost(0);
- }
-
private void Button120Hz_Click(object? sender, EventArgs e)
{
SetScreen(1000, 1);
@@ -538,13 +524,6 @@ namespace GHelper
InitScreen();
}
-
- public void InitBoost()
- {
- int boost = NativeMethods.GetCPUBoost();
- checkBoost.Checked = (boost > 0);
- }
-
public void InitScreen()
{
@@ -717,7 +696,7 @@ namespace GHelper
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());