jkocon/archived-g-helper
1
0
Fork 0
mirror of https://github.com/jkocon/g-helper.git synced 2026-02-23 13:00:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

G513 fix

Browse Source
This commit is contained in:
seerge
2023-04-13 17:21:25 +02:00
parent 7ff8fec35c
commit 15a681af3b
9 changed files with 75 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Fans.cs
View File

@@ -435,7 +435,7 @@ namespace GHelper
labelTip.Text = Math.Round(curPoint.XValue) + "C, " + ChartPercToRPM((int)curPoint.YValues[0], " " + Properties.Strings.RPM); labelTip.Text = Math.Round(curPoint.XValue) + "C, " + ChartPercToRPM((int)curPoint.YValues[0], " " + Properties.Strings.RPM);
labelTip.Top = e.Y + ((Control)sender).Top; labelTip.Top = e.Y + ((Control)sender).Top;
labelTip.Left = e.X; labelTip.Left = e.X - 50;
} }
catch catch

4
app/GHelper.csproj
View File

@@ -16,7 +16,7 @@
<PlatformTarget>x64</PlatformTarget> <PlatformTarget>x64</PlatformTarget>
<ProduceReferenceAssembly>False</ProduceReferenceAssembly> <ProduceReferenceAssembly>False</ProduceReferenceAssembly>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks> <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<AssemblyVersion>0.51</AssemblyVersion> <AssemblyVersion>0.52</AssemblyVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -62,7 +62,7 @@
<PackageReference Include="hidlibrary" Version="3.3.40" /> <PackageReference Include="hidlibrary" Version="3.3.40" />
<PackageReference Include="HidSharpCore" Version="1.2.1.1" /> <PackageReference Include="HidSharpCore" Version="1.2.1.1" />
<PackageReference Include="NvAPIWrapper.Net" Version="0.8.1.101" /> <PackageReference Include="NvAPIWrapper.Net" Version="0.8.1.101" />
<PackageReference Include="System.Management" Version="7.0.0" /> <PackageReference Include="System.Management" Version="7.0.1" />
<PackageReference Include="TaskScheduler" Version="2.10.1" /> <PackageReference Include="TaskScheduler" Version="2.10.1" />
<PackageReference Include="WinForms.DataVisualization" Version="1.8.0" /> <PackageReference Include="WinForms.DataVisualization" Version="1.8.0" />
</ItemGroup> </ItemGroup>

52
app/Keyboard.Designer.cs generated
View File

@@ -48,16 +48,19 @@ namespace GHelper
checkBoot = new CheckBox(); checkBoot = new CheckBox();
checkAwake = new CheckBox(); checkAwake = new CheckBox();
groupOther = new GroupBox(); groupOther = new GroupBox();
checkNoOverdrive = new CheckBox();
checkKeyboardAuto = new CheckBox(); checkKeyboardAuto = new CheckBox();
checkTopmost = new CheckBox(); checkTopmost = new CheckBox();
checkNoOverdrive = new CheckBox(); pictureHelp = new PictureBox();
groupBox1.SuspendLayout(); groupBox1.SuspendLayout();
groupLight.SuspendLayout(); groupLight.SuspendLayout();
groupOther.SuspendLayout(); groupOther.SuspendLayout();
((System.ComponentModel.ISupportInitialize)pictureHelp).BeginInit();
SuspendLayout(); SuspendLayout();
// //
// groupBox1 // groupBox1
// //
groupBox1.Controls.Add(pictureHelp);
groupBox1.Controls.Add(textFNF4); groupBox1.Controls.Add(textFNF4);
groupBox1.Controls.Add(comboFNF4); groupBox1.Controls.Add(comboFNF4);
groupBox1.Controls.Add(labelFNF4); groupBox1.Controls.Add(labelFNF4);
@@ -70,7 +73,7 @@ namespace GHelper
groupBox1.Dock = DockStyle.Top; groupBox1.Dock = DockStyle.Top;
groupBox1.Location = new Point(10, 10); groupBox1.Location = new Point(10, 10);
groupBox1.Name = "groupBox1"; groupBox1.Name = "groupBox1";
groupBox1.Size = new Size(756, 242); groupBox1.Size = new Size(810, 242);
groupBox1.TabIndex = 0; groupBox1.TabIndex = 0;
groupBox1.TabStop = false; groupBox1.TabStop = false;
groupBox1.Text = Properties.Strings.KeyBindings; groupBox1.Text = Properties.Strings.KeyBindings;
@@ -163,7 +166,7 @@ namespace GHelper
groupLight.Dock = DockStyle.Top; groupLight.Dock = DockStyle.Top;
groupLight.Location = new Point(10, 252); groupLight.Location = new Point(10, 252);
groupLight.Name = "groupLight"; groupLight.Name = "groupLight";
groupLight.Size = new Size(756, 320); groupLight.Size = new Size(810, 320);
groupLight.TabIndex = 1; groupLight.TabIndex = 1;
groupLight.TabStop = false; groupLight.TabStop = false;
groupLight.Text = Properties.Strings.KeyboardBacklight; groupLight.Text = Properties.Strings.KeyboardBacklight;
@@ -172,9 +175,9 @@ namespace GHelper
// //
labelSpeed.AutoSize = true; labelSpeed.AutoSize = true;
labelSpeed.Location = new Point(25, 237); labelSpeed.Location = new Point(25, 237);
labelSpeed.MaximumSize = new Size(200, 0);
labelSpeed.Name = "labelSpeed"; labelSpeed.Name = "labelSpeed";
labelSpeed.Size = new Size(198, 32); labelSpeed.Size = new Size(198, 32);
labelSpeed.MaximumSize = new Size(200, 0);
labelSpeed.TabIndex = 40; labelSpeed.TabIndex = 40;
labelSpeed.Text = Properties.Strings.AnimationSpeed; labelSpeed.Text = Properties.Strings.AnimationSpeed;
// //
@@ -240,21 +243,31 @@ namespace GHelper
groupOther.Controls.Add(checkKeyboardAuto); groupOther.Controls.Add(checkKeyboardAuto);
groupOther.Controls.Add(checkTopmost); groupOther.Controls.Add(checkTopmost);
groupOther.Dock = DockStyle.Top; groupOther.Dock = DockStyle.Top;
groupOther.Location = new Point(10, 556); groupOther.Location = new Point(10, 572);
groupOther.Name = "groupOther"; groupOther.Name = "groupOther";
groupOther.Size = new Size(756, 225); groupOther.Size = new Size(810, 225);
groupOther.TabIndex = 2; groupOther.TabIndex = 2;
groupOther.TabStop = false; groupOther.TabStop = false;
groupOther.Text = Properties.Strings.Other; groupOther.Text = Properties.Strings.Other;
// //
// checkNoOverdrive
//
checkNoOverdrive.AutoSize = true;
checkNoOverdrive.Location = new Point(25, 156);
checkNoOverdrive.Name = "checkNoOverdrive";
checkNoOverdrive.Size = new Size(307, 36);
checkNoOverdrive.TabIndex = 3;
checkNoOverdrive.Text = Properties.Strings.DisableOverdrive;
checkNoOverdrive.UseVisualStyleBackColor = true;
//
// checkKeyboardAuto // checkKeyboardAuto
// //
checkKeyboardAuto.AutoEllipsis = true;
checkKeyboardAuto.AutoSize = true; checkKeyboardAuto.AutoSize = true;
checkKeyboardAuto.Location = new Point(25, 51); checkKeyboardAuto.Location = new Point(25, 51);
checkKeyboardAuto.Name = "checkKeyboardAuto";
checkKeyboardAuto.Size = new Size(780, 36);
checkKeyboardAuto.MaximumSize = new Size(780, 0); checkKeyboardAuto.MaximumSize = new Size(780, 0);
checkKeyboardAuto.AutoEllipsis = true; checkKeyboardAuto.Name = "checkKeyboardAuto";
checkKeyboardAuto.Size = new Size(712, 36);
checkKeyboardAuto.TabIndex = 2; checkKeyboardAuto.TabIndex = 2;
checkKeyboardAuto.Text = Properties.Strings.KeyboardAuto; checkKeyboardAuto.Text = Properties.Strings.KeyboardAuto;
checkKeyboardAuto.UseVisualStyleBackColor = true; checkKeyboardAuto.UseVisualStyleBackColor = true;
@@ -269,15 +282,16 @@ namespace GHelper
checkTopmost.Text = Properties.Strings.WindowTop; checkTopmost.Text = Properties.Strings.WindowTop;
checkTopmost.UseVisualStyleBackColor = true; checkTopmost.UseVisualStyleBackColor = true;
// //
// checkNoOverdrive // pictureHelp
// //
checkNoOverdrive.AutoSize = true; pictureHelp.BackgroundImageLayout = ImageLayout.Zoom;
checkNoOverdrive.Location = new Point(25, 156); pictureHelp.Cursor = Cursors.Hand;
checkNoOverdrive.Name = "checkNoOverdrive"; pictureHelp.Image = Properties.Resources.icons8_help_32;
checkNoOverdrive.Size = new Size(307, 36); pictureHelp.Location = new Point(744, 57);
checkNoOverdrive.TabIndex = 3; pictureHelp.Name = "pictureHelp";
checkNoOverdrive.Text = Properties.Strings.DisableOverdrive; pictureHelp.Size = new Size(32, 32);
checkNoOverdrive.UseVisualStyleBackColor = true; pictureHelp.TabIndex = 9;
pictureHelp.TabStop = false;
// //
// Keyboard // Keyboard
// //
@@ -291,7 +305,7 @@ namespace GHelper
MaximizeBox = false; MaximizeBox = false;
MdiChildrenMinimizedAnchorBottom = false; MdiChildrenMinimizedAnchorBottom = false;
MinimizeBox = false; MinimizeBox = false;
Name = Properties.Strings.Keyboard; Name = "Keyboard";
Padding = new Padding(10); Padding = new Padding(10);
ShowIcon = false; ShowIcon = false;
ShowInTaskbar = false; ShowInTaskbar = false;
@@ -302,6 +316,7 @@ namespace GHelper
groupLight.PerformLayout(); groupLight.PerformLayout();
groupOther.ResumeLayout(false); groupOther.ResumeLayout(false);
groupOther.PerformLayout(); groupOther.PerformLayout();
((System.ComponentModel.ISupportInitialize)pictureHelp).EndInit();
ResumeLayout(false); ResumeLayout(false);
} }
@@ -328,5 +343,6 @@ namespace GHelper
private CheckBox checkTopmost; private CheckBox checkTopmost;
private CheckBox checkKeyboardAuto; private CheckBox checkKeyboardAuto;
private CheckBox checkNoOverdrive; private CheckBox checkNoOverdrive;
private PictureBox pictureHelp;
} }
} }

8
app/Keyboard.cs
View File

@@ -1,4 +1,5 @@
using CustomControls; using CustomControls;
using System.Diagnostics;
namespace GHelper namespace GHelper
{ {
@@ -87,6 +88,13 @@ namespace GHelper
checkNoOverdrive.Checked = (Program.config.getConfig("no_overdrive") == 1); checkNoOverdrive.Checked = (Program.config.getConfig("no_overdrive") == 1);
checkNoOverdrive.CheckedChanged += CheckNoOverdrive_CheckedChanged; checkNoOverdrive.CheckedChanged += CheckNoOverdrive_CheckedChanged;
pictureHelp.Click += PictureHelp_Click;
}
private void PictureHelp_Click(object? sender, EventArgs e)
{
Process.Start(new ProcessStartInfo("https://github.com/seerge/g-helper#custom-hotkey-actions") { UseShellExecute = true });
} }
private void CheckNoOverdrive_CheckedChanged(object? sender, EventArgs e) private void CheckNoOverdrive_CheckedChanged(object? sender, EventArgs e)

2
app/Program.cs
View File

@@ -35,7 +35,7 @@ namespace GHelper
Debug.WriteLine(CultureInfo.CurrentUICulture); Debug.WriteLine(CultureInfo.CurrentUICulture);
//Thread.CurrentThread.CurrentUICulture = CultureInfo.CreateSpecificCulture("zh-hans"); //Thread.CurrentThread.CurrentUICulture = CultureInfo.CreateSpecificCulture("zh");
if (Process.GetProcesses().Count(p => p.ProcessName == "GHelper") > 1) if (Process.GetProcesses().Count(p => p.ProcessName == "GHelper") > 1)
{ {

19
app/Properties/Resources.Designer.cs generated
View File

@@ -160,6 +160,16 @@ namespace GHelper.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap icons8_help_32 {
get {
object obj = ResourceManager.GetObject("icons8-help-32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>
@@ -350,15 +360,6 @@ namespace GHelper.Properties {
} }
} }
/// <summary>
/// Looks up a localized string similar to Test.
/// </summary>
internal static string String1 {
get {
return ResourceManager.GetString("String1", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
/// </summary> /// </summary>

17
app/Properties/Resources.resx
View File

@@ -133,15 +133,15 @@
<data name="icons8-fiat-500-48" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8-fiat-500-48" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8-fiat-500-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\icons8-fiat-500-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="icons8-video-card-48" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8-video-card-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8-project-management-48 (1)" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8-project-management-48 (1)" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8-project-management-48 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\icons8-project-management-48 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="icons8-bicycle-48 (1)" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8-bicycle-48 (1)" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8-bicycle-48 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\icons8-bicycle-48 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="icons8-game-controller-48" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8-game-controller-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8-fan-head-96" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8-fan-head-96" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8-fan-head-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\icons8-fan-head-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
@@ -172,8 +172,8 @@
<data name="icons8-laptop-48" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8-laptop-48" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8-laptop-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\icons8-laptop-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="icons8-rocket-48" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8-video-card-48" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8-rocket-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\icons8-video-card-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="icons8-organic-food-961" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8-organic-food-961" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8-organic-food-961.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\icons8-organic-food-961.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -199,13 +199,16 @@
<data name="ultimate" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="ultimate" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ultimate.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\ultimate.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="icons8-rocket-48" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8-rocket-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8-speed-48" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8-speed-48" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8-speed-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\icons8-speed-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="everything-is-fine-itsfine" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="everything-is-fine-itsfine" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\everything-is-fine-itsfine.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\everything-is-fine-itsfine.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="icons8-game-controller-48" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="icons8-help-32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8-game-controller-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\icons8-help-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
</root> </root>

BIN
app/Resources/icons8-help-32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 540 B

11
app/Settings.cs
View File

@@ -873,6 +873,13 @@ namespace GHelper
public void SetPower() public void SetPower()
{ {
// fix for misbehaving bios PPTs on G513
if (Program.config.ContainsModel("G513") && Program.config.getConfigPerf("auto_apply") != 1)
{
AutoFans(true);
}
int limit_total = Program.config.getConfigPerf("limit_total"); int limit_total = Program.config.getConfigPerf("limit_total");
int limit_cpu = Program.config.getConfigPerf("limit_cpu"); int limit_cpu = Program.config.getConfigPerf("limit_cpu");
@@ -900,11 +907,11 @@ namespace GHelper
} }
public void AutoFans() public void AutoFans(bool force = false)
{ {
customFans = false; customFans = false;
if (Program.config.getConfigPerf("auto_apply") == 1) if (Program.config.getConfigPerf("auto_apply") == 1 || force)
{ {
int cpuResult = Program.wmi.SetFanCurve(0, Program.config.getFanConfig(0)); int cpuResult = Program.wmi.SetFanCurve(0, Program.config.getFanConfig(0));
int gpuResult = Program.wmi.SetFanCurve(1, Program.config.getFanConfig(1)); int gpuResult = Program.wmi.SetFanCurve(1, Program.config.getFanConfig(1));