Default temp limit

This commit is contained in:
Serge
2023-07-04 16:47:44 +02:00
parent db595d54f6
commit dc40b317f8
8 changed files with 26 additions and 27 deletions

View File

@@ -1,6 +1,6 @@
// Source thanks to https://github.com/vddCore/Starlight with some adjustments from me // Source thanks to https://github.com/vddCore/Starlight with some adjustments from me
using Starlight.Communication; using GHelper.AnimeMatrix.Communication;
using System.Drawing.Drawing2D; using System.Drawing.Drawing2D;
using System.Drawing.Text; using System.Drawing.Text;
using System.Globalization; using System.Globalization;

View File

@@ -1,9 +1,8 @@
// Source thanks to https://github.com/vddCore/Starlight :) // Source thanks to https://github.com/vddCore/Starlight :)
using Starlight.Communication.Platform; using GHelper.AnimeMatrix.Communication.Platform;
using System.Configuration;
namespace Starlight.Communication namespace GHelper.AnimeMatrix.Communication
{ {
public abstract class Device : IDisposable public abstract class Device : IDisposable
{ {

View File

@@ -1,6 +1,6 @@
// Source thanks to https://github.com/vddCore/Starlight :) // Source thanks to https://github.com/vddCore/Starlight :)
namespace Starlight.Communication namespace GHelper.AnimeMatrix.Communication
{ {
public abstract class Packet public abstract class Packet
{ {

View File

@@ -1,4 +1,4 @@
namespace Starlight.Communication.Platform namespace GHelper.AnimeMatrix.Communication.Platform
{ {
internal abstract class UsbProvider : IDisposable internal abstract class UsbProvider : IDisposable
{ {
@@ -13,7 +13,7 @@ namespace Starlight.Communication.Platform
public abstract void Set(byte[] data); public abstract void Set(byte[] data);
public abstract byte[] Get(byte[] data); public abstract byte[] Get(byte[] data);
public abstract void Dispose(); public abstract void Dispose();
} }
} }

View File

@@ -1,14 +1,14 @@
using System.ComponentModel; using System.ComponentModel;
using HidSharp; using HidSharp;
namespace Starlight.Communication.Platform namespace GHelper.AnimeMatrix.Communication.Platform
{ {
internal class WindowsUsbProvider : UsbProvider internal class WindowsUsbProvider : UsbProvider
{ {
protected HidDevice HidDevice { get; } protected HidDevice HidDevice { get; }
protected HidStream HidStream { get; } protected HidStream HidStream { get; }
public WindowsUsbProvider(ushort vendorId, ushort productId, int maxFeatureReportLength) public WindowsUsbProvider(ushort vendorId, ushort productId, int maxFeatureReportLength)
: base(vendorId, productId) : base(vendorId, productId)
{ {
try try
@@ -43,7 +43,7 @@ namespace Starlight.Communication.Platform
{ {
var outData = new byte[data.Length]; var outData = new byte[data.Length];
Array.Copy(data, outData, data.Length); Array.Copy(data, outData, data.Length);
WrapException(() => WrapException(() =>
{ {
HidStream.GetFeature(outData); HidStream.GetFeature(outData);
@@ -57,7 +57,7 @@ namespace Starlight.Communication.Platform
{ {
HidStream.Dispose(); HidStream.Dispose();
} }
private void WrapException(Action action) private void WrapException(Action action)
{ {
try try

View File

@@ -267,32 +267,33 @@ namespace GHelper
int igpuUV = Math.Max(trackUViGPU.Minimum, Math.Min(trackUViGPU.Maximum, AppConfig.GetMode("igpu_uv", 0))); int igpuUV = Math.Max(trackUViGPU.Minimum, Math.Min(trackUViGPU.Maximum, AppConfig.GetMode("igpu_uv", 0)));
int temp = AppConfig.GetMode("cpu_temp"); int temp = AppConfig.GetMode("cpu_temp");
if (temp < trackTemp.Minimum || temp > trackTemp.Maximum) temp = 96; if (temp < RyzenControl.MinTemp || temp > RyzenControl.MaxTemp) temp = RyzenControl.MaxTemp;
checkApplyUV.Enabled = checkApplyUV.Checked = AppConfig.IsMode("auto_uv"); checkApplyUV.Enabled = checkApplyUV.Checked = AppConfig.IsMode("auto_uv");
trackUV.Value = cpuUV; trackUV.Value = cpuUV;
labelUV.Text = trackUV.Value.ToString();
trackUViGPU.Value = igpuUV; trackUViGPU.Value = igpuUV;
labelUViGPU.Text = trackUViGPU.Value.ToString();
trackTemp.Value = temp; trackTemp.Value = temp;
labelTemp.Text = trackTemp.Value.ToString() + "°C";
VisualiseAdvanced();
buttonAdvanced.Visible = RyzenControl.IsAMD(); buttonAdvanced.Visible = RyzenControl.IsAMD();
} }
private void VisualiseAdvanced()
{
labelUV.Text = trackUV.Value.ToString();
labelUViGPU.Text = trackUViGPU.Value.ToString();
labelTemp.Text = (trackTemp.Value < RyzenControl.MaxTemp) ? trackTemp.Value.ToString() + "°C" : "Default";
}
private void AdvancedScroll() private void AdvancedScroll()
{ {
AppConfig.SetMode("auto_uv", 0); AppConfig.SetMode("auto_uv", 0);
checkApplyUV.Enabled = checkApplyUV.Checked = false; checkApplyUV.Enabled = checkApplyUV.Checked = false;
labelUV.Text = trackUV.Value.ToString(); VisualiseAdvanced();
labelUViGPU.Text = trackUViGPU.Value.ToString();
labelTemp.Text = trackTemp.Value.ToString() + "°C";
AppConfig.SetMode("cpu_temp", trackTemp.Value); AppConfig.SetMode("cpu_temp", trackTemp.Value);
AppConfig.SetMode("cpu_uv", trackUV.Value); AppConfig.SetMode("cpu_uv", trackUV.Value);
@@ -839,10 +840,9 @@ namespace GHelper
AppConfig.SetMode("auto_apply", 0); AppConfig.SetMode("auto_apply", 0);
AppConfig.SetMode("auto_apply_power", 0); AppConfig.SetMode("auto_apply_power", 0);
trackUV.Value = RyzenControl.MaxCPUUV;
trackUV.Value = 0; trackUViGPU.Value = RyzenControl.MaxIGPUUV;
trackUViGPU.Value = 0; trackTemp.Value = RyzenControl.MaxTemp;
trackTemp.Value = 96;
AdvancedScroll(); AdvancedScroll();
AppConfig.SetMode("cpu_temp", -1); AppConfig.SetMode("cpu_temp", -1);

View File

@@ -16,7 +16,7 @@
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
<ProduceReferenceAssembly>False</ProduceReferenceAssembly> <ProduceReferenceAssembly>False</ProduceReferenceAssembly>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks> <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<AssemblyVersion>0.94</AssemblyVersion> <AssemblyVersion>0.95</AssemblyVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

View File

@@ -342,10 +342,10 @@ namespace GHelper.Mode
public void SetCPUTemp(int? cpuTemp, bool log = true) public void SetCPUTemp(int? cpuTemp, bool log = true)
{ {
if (cpuTemp >= RyzenControl.MinTemp && cpuTemp <= RyzenControl.MaxTemp) if (cpuTemp >= RyzenControl.MinTemp && cpuTemp < RyzenControl.MaxTemp)
{ {
var resultCPU = SendCommand.set_tctl_temp((uint)cpuTemp); var resultCPU = SendCommand.set_tctl_temp((uint)cpuTemp);
if (log) Logger.WriteLine($"CPU Temp: {cpuTemp} {resultCPU}"); Logger.WriteLine($"CPU Temp: {cpuTemp} {resultCPU}");
var restultAPU = SendCommand.set_apu_skin_temp_limit((uint)cpuTemp); var restultAPU = SendCommand.set_apu_skin_temp_limit((uint)cpuTemp);
if (log) Logger.WriteLine($"APU Temp: {cpuTemp} {restultAPU}"); if (log) Logger.WriteLine($"APU Temp: {cpuTemp} {restultAPU}");