PickleRick/AsusFanControlEnhanced
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #8 from Darren80/Dev

Browse Source 
Dev
This commit is contained in:
Darren Ohonba - Evans
2024-05-26 13:02:49 +01:00
committed by GitHub
parent ec949ef662 2f102c51d8
commit b87c68cf7c
5 changed files with 194 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
AsusFanControlGUI/App.config
View File

@@ -40,6 +40,12 @@
<setting name="updateSpeed" serializeAs="String">
<value>2000</value>
</setting>
<setting name="wasError" serializeAs="String">
<value>False</value>
</setting>
<setting name="errorMsg" serializeAs="String">
<value />
</setting>
</AsusFanControlGUI.Properties.Settings>
</userSettings>
</configuration>

101
AsusFanControlGUI/Form1.Designer.cs generated
View File

@@ -44,11 +44,12 @@
this.toolStripMenuItemTurnOffControlOnExit = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItemForbidUnsafeSettings = new System.Windows.Forms.ToolStripMenuItem();
this.allowFanCurveSettingViaTextToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.resetToDefaultsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.startupSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.startMinimisedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.startWithWindowsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.restartApplicationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.resetToDefaultsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItemCheckForUpdates = new System.Windows.Forms.ToolStripMenuItem();
this.label5 = new System.Windows.Forms.Label();
this.pictureBoxFanCurve = new System.Windows.Forms.PictureBox();
@@ -88,20 +89,22 @@
// trackBarFanSpeed
//
this.trackBarFanSpeed.Enabled = false;
this.trackBarFanSpeed.Location = new System.Drawing.Point(17, 94);
this.trackBarFanSpeed.Location = new System.Drawing.Point(17, 96);
this.trackBarFanSpeed.Margin = new System.Windows.Forms.Padding(4);
this.trackBarFanSpeed.Maximum = 100;
this.trackBarFanSpeed.Name = "trackBarFanSpeed";
this.trackBarFanSpeed.Size = new System.Drawing.Size(400, 56);
this.trackBarFanSpeed.Size = new System.Drawing.Size(519, 56);
this.trackBarFanSpeed.TabIndex = 0;
this.trackBarFanSpeed.Value = 100;
this.trackBarFanSpeed.ValueChanged += new System.EventHandler(this.trackBarFanSpeed_ValueChanged);
this.trackBarFanSpeed.KeyUp += new System.Windows.Forms.KeyEventHandler(this.trackBarFanSpeed_KeyUp);
this.trackBarFanSpeed.MouseMove += new System.Windows.Forms.MouseEventHandler(this.trackBarFanSpeed_MouseMove);
this.trackBarFanSpeed.MouseUp += new System.Windows.Forms.MouseEventHandler(this.trackBarFanSpeed_MouseUp);
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(13, 566);
this.label1.Location = new System.Drawing.Point(13, 629);
this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(88, 16);
@@ -111,7 +114,7 @@
// labelValue
//
this.labelValue.AutoSize = true;
this.labelValue.Location = new System.Drawing.Point(118, 566);
this.labelValue.Location = new System.Drawing.Point(118, 629);
this.labelValue.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.labelValue.Name = "labelValue";
this.labelValue.Size = new System.Drawing.Size(11, 16);
@@ -121,7 +124,7 @@
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(50, 598);
this.label2.Location = new System.Drawing.Point(50, 661);
this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(85, 16);
@@ -130,7 +133,7 @@
//
// button1
//
this.button1.Location = new System.Drawing.Point(13, 592);
this.button1.Location = new System.Drawing.Point(13, 655);
this.button1.Margin = new System.Windows.Forms.Padding(4);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(29, 28);
@@ -142,7 +145,7 @@
// labelRPM
//
this.labelRPM.AutoSize = true;
this.labelRPM.Location = new System.Drawing.Point(153, 598);
this.labelRPM.Location = new System.Drawing.Point(153, 661);
this.labelRPM.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.labelRPM.Name = "labelRPM";
this.labelRPM.Size = new System.Drawing.Size(11, 16);
@@ -152,7 +155,7 @@
// labelCPUTemp
//
this.labelCPUTemp.AutoSize = true;
this.labelCPUTemp.Location = new System.Drawing.Point(185, 634);
this.labelCPUTemp.Location = new System.Drawing.Point(185, 697);
this.labelCPUTemp.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.labelCPUTemp.Name = "labelCPUTemp";
this.labelCPUTemp.Size = new System.Drawing.Size(11, 16);
@@ -161,7 +164,7 @@
//
// button2
//
this.button2.Location = new System.Drawing.Point(13, 628);
this.button2.Location = new System.Drawing.Point(13, 691);
this.button2.Margin = new System.Windows.Forms.Padding(4);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(29, 28);
@@ -173,7 +176,7 @@
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(50, 634);
this.label4.Location = new System.Drawing.Point(50, 697);
this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(116, 16);
@@ -189,7 +192,7 @@
this.toolStripMenuItemCheckForUpdates});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(595, 28);
this.menuStrip1.Size = new System.Drawing.Size(670, 28);
this.menuStrip1.TabIndex = 10;
this.menuStrip1.Text = "menuStrip1";
//
@@ -198,8 +201,7 @@
this.toolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripMenuItemTurnOffControlOnExit,
this.toolStripMenuItemForbidUnsafeSettings,
this.allowFanCurveSettingViaTextToolStripMenuItem,
this.resetToDefaultsToolStripMenuItem});
this.allowFanCurveSettingViaTextToolStripMenuItem});
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(89, 24);
this.toolStripMenuItem1.Text = "Advanced";
@@ -228,20 +230,16 @@
this.allowFanCurveSettingViaTextToolStripMenuItem.Text = "Allow FanCurve Seting via Text";
this.allowFanCurveSettingViaTextToolStripMenuItem.Click += new System.EventHandler(this.allowFanCurveSettingViaTextToolStripMenuItem_Click);
//
// resetToDefaultsToolStripMenuItem
//
this.resetToDefaultsToolStripMenuItem.Name = "resetToDefaultsToolStripMenuItem";
this.resetToDefaultsToolStripMenuItem.Size = new System.Drawing.Size(293, 26);
this.resetToDefaultsToolStripMenuItem.Text = "Reset to defaults";
this.resetToDefaultsToolStripMenuItem.Click += new System.EventHandler(this.resetToDefaultsToolStripMenuItem_Click);
//
// optionsToolStripMenuItem
//
this.optionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.startupSettingsToolStripMenuItem});
this.startupSettingsToolStripMenuItem,
this.restartApplicationToolStripMenuItem,
this.resetToDefaultsToolStripMenuItem});
this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem";
this.optionsToolStripMenuItem.Size = new System.Drawing.Size(75, 24);
this.optionsToolStripMenuItem.Text = "Options";
this.optionsToolStripMenuItem.Click += new System.EventHandler(this.optionsToolStripMenuItem_Click);
//
// startupSettingsToolStripMenuItem
//
@@ -249,8 +247,8 @@
this.startMinimisedToolStripMenuItem,
this.startWithWindowsToolStripMenuItem});
this.startupSettingsToolStripMenuItem.Name = "startupSettingsToolStripMenuItem";
this.startupSettingsToolStripMenuItem.Size = new System.Drawing.Size(197, 26);
this.startupSettingsToolStripMenuItem.Text = "Startup Settings";
this.startupSettingsToolStripMenuItem.Size = new System.Drawing.Size(217, 26);
this.startupSettingsToolStripMenuItem.Text = "Startup settings";
//
// startMinimisedToolStripMenuItem
//
@@ -268,6 +266,20 @@
this.startWithWindowsToolStripMenuItem.Text = "Start with Windows";
this.startWithWindowsToolStripMenuItem.Click += new System.EventHandler(this.startWithWindowsToolStripMenuItem1_Click_1);
//
// restartApplicationToolStripMenuItem
//
this.restartApplicationToolStripMenuItem.Name = "restartApplicationToolStripMenuItem";
this.restartApplicationToolStripMenuItem.Size = new System.Drawing.Size(217, 26);
this.restartApplicationToolStripMenuItem.Text = "Restart application";
this.restartApplicationToolStripMenuItem.Click += new System.EventHandler(this.restartApplicationToolStripMenuItem_Click);
//
// resetToDefaultsToolStripMenuItem
//
this.resetToDefaultsToolStripMenuItem.Name = "resetToDefaultsToolStripMenuItem";
this.resetToDefaultsToolStripMenuItem.Size = new System.Drawing.Size(217, 26);
this.resetToDefaultsToolStripMenuItem.Text = "Reset to defaults";
this.resetToDefaultsToolStripMenuItem.Click += new System.EventHandler(this.resetToDefaultsToolStripMenuItem_Click);
//
// toolStripMenuItemCheckForUpdates
//
this.toolStripMenuItemCheckForUpdates.Name = "toolStripMenuItemCheckForUpdates";
@@ -278,7 +290,7 @@
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(349, 67);
this.label5.Location = new System.Drawing.Point(475, 67);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(61, 16);
this.label5.TabIndex = 13;
@@ -288,7 +300,7 @@
//
this.pictureBoxFanCurve.Location = new System.Drawing.Point(13, 225);
this.pictureBoxFanCurve.Name = "pictureBoxFanCurve";
this.pictureBoxFanCurve.Size = new System.Drawing.Size(573, 258);
this.pictureBoxFanCurve.Size = new System.Drawing.Size(645, 312);
this.pictureBoxFanCurve.TabIndex = 0;
this.pictureBoxFanCurve.TabStop = false;
this.pictureBoxFanCurve.Paint += new System.Windows.Forms.PaintEventHandler(this.pictureBoxFanCurve_Paint);
@@ -307,7 +319,7 @@
this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Location = new System.Drawing.Point(12, 37);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(574, 182);
this.groupBox1.Size = new System.Drawing.Size(644, 182);
this.groupBox1.TabIndex = 14;
this.groupBox1.TabStop = false;
//
@@ -315,7 +327,7 @@
//
this.radioButton1.AutoSize = true;
this.radioButton1.Checked = true;
this.radioButton1.Location = new System.Drawing.Point(20, 31);
this.radioButton1.Location = new System.Drawing.Point(17, 27);
this.radioButton1.Name = "radioButton1";
this.radioButton1.Size = new System.Drawing.Size(72, 20);
this.radioButton1.TabIndex = 16;
@@ -327,7 +339,7 @@
// fanControl
//
this.fanControl.AutoSize = true;
this.fanControl.Location = new System.Drawing.Point(20, 67);
this.fanControl.Location = new System.Drawing.Point(17, 67);
this.fanControl.Name = "fanControl";
this.fanControl.Size = new System.Drawing.Size(137, 20);
this.fanControl.TabIndex = 15;
@@ -338,7 +350,7 @@
// fanCurve
//
this.fanCurve.AutoSize = true;
this.fanCurve.Location = new System.Drawing.Point(20, 148);
this.fanCurve.Location = new System.Drawing.Point(17, 150);
this.fanCurve.Name = "fanCurve";
this.fanCurve.Size = new System.Drawing.Size(130, 20);
this.fanCurve.TabIndex = 14;
@@ -348,7 +360,7 @@
//
// button3
//
this.button3.Location = new System.Drawing.Point(553, 489);
this.button3.Location = new System.Drawing.Point(623, 552);
this.button3.Name = "button3";
this.button3.Size = new System.Drawing.Size(33, 27);
this.button3.TabIndex = 22;
@@ -359,7 +371,7 @@
//
// button4
//
this.button4.Location = new System.Drawing.Point(13, 489);
this.button4.Location = new System.Drawing.Point(13, 552);
this.button4.Name = "button4";
this.button4.Size = new System.Drawing.Size(35, 27);
this.button4.TabIndex = 23;
@@ -434,9 +446,9 @@
this.groupBox2.Controls.Add(this.label7);
this.groupBox2.Controls.Add(this.numericUpDown1);
this.groupBox2.Controls.Add(this.label6);
this.groupBox2.Location = new System.Drawing.Point(364, 569);
this.groupBox2.Location = new System.Drawing.Point(442, 629);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(214, 87);
this.groupBox2.Size = new System.Drawing.Size(214, 95);
this.groupBox2.TabIndex = 19;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Advanced";
@@ -498,9 +510,9 @@
//
// label3
//
this.label3.Location = new System.Drawing.Point(12, 688);
this.label3.Location = new System.Drawing.Point(12, 755);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(574, 16);
this.label3.Size = new System.Drawing.Size(645, 16);
this.label3.TabIndex = 20;
this.label3.Text = ".";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -508,10 +520,10 @@
// textBox1
//
this.textBox1.Font = new System.Drawing.Font("Consolas", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.textBox1.Location = new System.Drawing.Point(53, 489);
this.textBox1.Location = new System.Drawing.Point(53, 552);
this.textBox1.Name = "textBox1";
this.textBox1.ReadOnly = true;
this.textBox1.Size = new System.Drawing.Size(494, 27);
this.textBox1.Size = new System.Drawing.Size(564, 27);
this.textBox1.TabIndex = 21;
this.textBox1.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox1_KeyPress);
this.textBox1.MouseHover += new System.EventHandler(this.textBox1_MouseHover);
@@ -519,24 +531,24 @@
// label10
//
this.label10.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.label10.Location = new System.Drawing.Point(12, 677);
this.label10.Location = new System.Drawing.Point(12, 740);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(574, 2);
this.label10.Size = new System.Drawing.Size(645, 2);
this.label10.TabIndex = 24;
//
// label11
//
this.label11.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.label11.Location = new System.Drawing.Point(15, 542);
this.label11.Location = new System.Drawing.Point(15, 605);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(574, 2);
this.label11.Size = new System.Drawing.Size(645, 2);
this.label11.TabIndex = 25;
//
// Form1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(595, 716);
this.ClientSize = new System.Drawing.Size(670, 786);
this.Controls.Add(this.label11);
this.Controls.Add(this.label10);
this.Controls.Add(this.button4);
@@ -618,7 +630,6 @@
private System.Windows.Forms.TextBox textBox1;
private System.Windows.Forms.Button button3;
private System.Windows.Forms.Button button4;
private System.Windows.Forms.ToolStripMenuItem resetToDefaultsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem allowFanCurveSettingViaTextToolStripMenuItem;
private System.Windows.Forms.Label label10;
private System.Windows.Forms.ToolStripMenuItem optionsToolStripMenuItem;
@@ -626,6 +637,8 @@
private System.Windows.Forms.ToolStripMenuItem startMinimisedToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem startWithWindowsToolStripMenuItem;
private System.Windows.Forms.Label label11;
private System.Windows.Forms.ToolStripMenuItem restartApplicationToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem resetToDefaultsToolStripMenuItem;
}
}

120
AsusFanControlGUI/Form1.cs
View File

@@ -25,6 +25,7 @@ namespace AsusFanControlGUI
private readonly Random rnd = new Random();
readonly AsusControl asusControl = new AsusControl();
int currentFanSpeed = 0;
ulong currentTemp = 0;
public Form1()
{
@@ -41,6 +42,8 @@ namespace AsusFanControlGUI
{
if (IsHandleCreated)
{
startErrorHandler();
toolStripMenuItemTurnOffControlOnExit.Checked = Properties.Settings.Default.turnOffControlOnExit;
toolStripMenuItemForbidUnsafeSettings.Checked = Properties.Settings.Default.forbidUnsafeSettings;
startMinimisedToolStripMenuItem.Checked = Properties.Settings.Default.startMinimised;
@@ -77,6 +80,30 @@ namespace AsusFanControlGUI
}
}
private async void startErrorHandler()
{
int minTemp = 1;
int maxTemp = 200;
Console.WriteLine("Running");
if ((fanCurve.Checked || fanControl.Checked) && (currentTemp < (ulong)minTemp || currentTemp > (ulong)maxTemp))
{
// Give it a second chance
await Task.Delay(1000);
ulong temp = await Task.Run(() => asusControl.Thermal_Read_Cpu_Temperature());
if (temp >= (ulong)minTemp && temp < (ulong)maxTemp)
{
return;
}
Properties.Settings.Default.wasError = true;
Properties.Settings.Default.errorMsg = $"CPU temprature were outside of good range at {currentTemp}°C, either something has not loaded properly or CPU sensors are faulty.";
Properties.Settings.Default.Save();
Console.WriteLine("Restarting");
Application.Restart();
Environment.Exit(0);
}
}
private async void Timer_Tick()
{
if (WindowState == FormWindowState.Minimized)
@@ -98,6 +125,8 @@ namespace AsusFanControlGUI
// Get the results from the completed tasks
labelRPM.Text = fanSpeedsTask.Result;
labelCPUTemp.Text = cpuTempTask.Result;
currentTemp = (ulong)Decimal.Parse(cpuTempTask.Result);
startErrorHandler();
await Task.Delay(250);
Timer_Tick();
@@ -237,8 +266,10 @@ namespace AsusFanControlGUI
private async void button2_Click(object sender, EventArgs e)
{
ulong currentTemp = await Task.Run(() => asusControl.Thermal_Read_Cpu_Temperature());
labelCPUTemp.Text = $"{currentTemp}";
ulong temp = await Task.Run(() => asusControl.Thermal_Read_Cpu_Temperature());
currentTemp = temp;
labelCPUTemp.Text = $"{temp}";
startErrorHandler();
}
// My Code:
@@ -349,6 +380,9 @@ namespace AsusFanControlGUI
fanCurvePoints[newID] = newPoint;
pictureBoxFanCurve.Invalidate(); // Redraw the graph
//
runFanCurve(true, true);
}
private int selectedPointId = 0;
@@ -459,6 +493,7 @@ namespace AsusFanControlGUI
selectedPointId = 0;
toolTip1.SetToolTip(pictureBoxFanCurve, "Fan Curve Graph");
SaveFanCurvePoints();
runFanCurve(true, true);
// fanCurvePoints.ToList().ForEach(point => Console.Write($"ID: {point.Key}, X: {point.Value.X}, Y: {point.Value.Y}"));
// Console.WriteLine();
@@ -517,7 +552,7 @@ namespace AsusFanControlGUI
return lowerPoint.Value.Y + (upperPoint.Value.Y - lowerPoint.Value.Y) * ratio;
}
private async void runFanCurve()
private async void runFanCurve(bool bypassHysteresisCheck=false, bool runOnce=false)
{
if (!fanCurve.Checked)
{
@@ -527,14 +562,16 @@ namespace AsusFanControlGUI
//Console.WriteLine("Fan Curve, " + (int)numericUpDown2.Value);
// Read the current temperature
ulong currentTemp = await Task.Run(() => asusControl.Thermal_Read_Cpu_Temperature()); // Implement the ReadTemperature method to get the current temperature
ulong temp = await Task.Run(() => asusControl.Thermal_Read_Cpu_Temperature()); // Implement the ReadTemperature method to get the current temperature
currentTemp = temp;
startErrorHandler();
//Console.WriteLine("Temp, " + currentTemp);
double fanSpeed = CalculateFanSpeed(currentTemp);
double fanSpeed = CalculateFanSpeed(temp);
// Apply hysteresis to prevent rapid fan speed changes
int hysteresis = (int)numericUpDown1.Value; // Adjust the hysteresis value as needed
if ((int)currentTemp > lastTemperature + hysteresis || (int)currentTemp < lastTemperature - hysteresis || fanSpeed < 10)
if ((int)temp > lastTemperature + hysteresis || (int)temp < lastTemperature - hysteresis || fanSpeed < 10 || bypassHysteresisCheck)
{
// Update the fan speed
fanSpeed = Math.Max(0, Math.Min(100, fanSpeed));
@@ -543,17 +580,18 @@ namespace AsusFanControlGUI
Console.WriteLine($"Set fan speed to {(int)fanSpeed}% {rnd.Next(1000)}, last fan speed = {lastTemperature}");
if (fanSpeed != 0)
{
label3.Text = $"Set fan speed to {(int)fanSpeed}%, current temp: {currentTemp}°C";// (Stamp: {rnd.Next(1000)})";
notifyIcon1.Text = $"AsusFanControlEnhanced - Current Temp: {(int)currentTemp}°C - Fan Speed: {(int)fanSpeed}%";
label3.Text = $"Set fan speed to {(int)fanSpeed}%, current temp: {temp}°C";// (Stamp: {rnd.Next(1000)})";
notifyIcon1.Text = $"AsusFanControlEnhanced - Current Temp: {(int)temp}°C - Fan Speed: {(int)fanSpeed}%";
}
lastTemperature = (int)currentTemp;
lastTemperature = (int)temp;
}
await Task.Delay((int)numericUpDown2.Value);
runFanCurve();
if (!runOnce)
{
await Task.Delay((int)numericUpDown2.Value);
runFanCurve();
}
}
// Keep track of the last fan speed to apply hysteresis
@@ -580,6 +618,7 @@ namespace AsusFanControlGUI
Show();
WindowState = FormWindowState.Normal;
notifyIcon1.Visible = false;
mayShowError();
}
private void closeToolStripMenuItem_Click(object sender, EventArgs e)
@@ -594,6 +633,7 @@ namespace AsusFanControlGUI
Show();
WindowState = FormWindowState.Normal;
notifyIcon1.Visible = false;
mayShowError();
}
}
@@ -665,13 +705,6 @@ namespace AsusFanControlGUI
trackBarSetFanSpeed();
}
private void resetToDefaultsToolStripMenuItem_Click(object sender, EventArgs e)
{
Properties.Settings.Default.Reset();
Application.Restart();
Environment.Exit(0);
}
private void textBox1_KeyPress(object sender, KeyPressEventArgs e)
{
if (e.KeyChar != (char)Keys.Enter)
@@ -747,6 +780,21 @@ namespace AsusFanControlGUI
if (startMinimized)
{
MinimizeToTray();
return;
}
mayShowError();
}
private void mayShowError()
{
Console.WriteLine($"asdad: {Properties.Settings.Default.wasError}");
if (Properties.Settings.Default.wasError == true)
{
MessageBox.Show($"An error caused the application to restart:\n\nError: {Properties.Settings.Default.errorMsg}");
Properties.Settings.Default.wasError = false;
Properties.Settings.Default.errorMsg = "";
Properties.Settings.Default.Save();
}
}
@@ -773,6 +821,38 @@ namespace AsusFanControlGUI
Properties.Settings.Default.Save();
}
private void resetToDefaultsToolStripMenuItem_Click(object sender, EventArgs e)
{
Properties.Settings.Default.Reset();
Application.Restart();
Environment.Exit(0);
}
private void restartApplicationToolStripMenuItem_Click(object sender, EventArgs e)
{
Application.Restart();
Environment.Exit(0);
}
private void optionsToolStripMenuItem_Click(object sender, EventArgs e)
{
}
private void trackBarFanSpeed_ValueChanged(object sender, EventArgs e)
{
}
private void trackBarFanSpeed_MouseMove(object sender, MouseEventArgs e)
{
if (e.Button == MouseButtons.Left)
{
// Show the tooltip
toolTip1.Show(trackBarFanSpeed.Value.ToString(), trackBarFanSpeed, 0, -20, 2000);
}
}
//notifyIcon1.BalloonTipText = string.Join(" ", asusControl.GetFanSpeeds()) + $" Temp: {asusControl.Thermal_Read_Cpu_Temperature()}"; }
}
}

24
AsusFanControlGUI/Properties/Settings.Designer.cs generated
View File

@@ -142,5 +142,29 @@ namespace AsusFanControlGUI.Properties {
this["updateSpeed"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool wasError {
get {
return ((bool)(this["wasError"]));
}
set {
this["wasError"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string errorMsg {
get {
return ((string)(this["errorMsg"]));
}
set {
this["errorMsg"] = value;
}
}
}
}

6
AsusFanControlGUI/Properties/Settings.settings
View File

@@ -32,5 +32,11 @@
<Setting Name="updateSpeed" Type="System.Int32" Scope="User">
<Value Profile="(Default)">2000</Value>
</Setting>
<Setting Name="wasError" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="errorMsg" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
</Settings>
</SettingsFile>