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

Minor tweaks

Browse Source
This commit is contained in:
Serge
2024-03-11 18:05:50 +01:00
parent 2448a4b1df
commit fff466a30e
1 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/HardwareControl.cs
View File

@@ -14,6 +14,8 @@ public static class HardwareControl
public static IGpuControl? GpuControl; public static IGpuControl? GpuControl;
public static float? cpuTemp = -1; public static float? cpuTemp = -1;
public static float? gpuTemp = -1;
public static decimal? batteryRate = 0; public static decimal? batteryRate = 0;
public static decimal batteryHealth = -1; public static decimal batteryHealth = -1;
public static decimal batteryCapacity = -1; public static decimal batteryCapacity = -1;
@@ -23,7 +25,6 @@ public static class HardwareControl
public static decimal? chargeCapacity; public static decimal? chargeCapacity;
public static int? gpuTemp = null;
public static string? cpuFan; public static string? cpuFan;
public static string? gpuFan; public static string? gpuFan;
@@ -179,26 +180,15 @@ public static class HardwareControl
} }
catch (Exception ex) catch (Exception ex)
{ {
Debug.WriteLine("Failed reading CPU temp :" + ex.Message); //Debug.WriteLine("Failed reading CPU temp :" + ex.Message);
} }
return cpuTemp; return cpuTemp;
} }
public static float? GetGPUTemp()
public static void ReadSensors()
{ {
batteryRate = 0;
gpuTemp = -1;
gpuUse = -1;
cpuFan = FanSensorControl.FormatFan(AsusFan.CPU, Program.acpi.GetFan(AsusFan.CPU));
gpuFan = FanSensorControl.FormatFan(AsusFan.GPU, Program.acpi.GetFan(AsusFan.GPU));
midFan = FanSensorControl.FormatFan(AsusFan.Mid, Program.acpi.GetFan(AsusFan.Mid));
cpuTemp = GetCPUTemp();
try try
{ {
gpuTemp = GpuControl?.GetCurrentTemperature(); gpuTemp = GpuControl?.GetCurrentTemperature();
@@ -207,11 +197,29 @@ public static class HardwareControl
catch (Exception ex) catch (Exception ex)
{ {
gpuTemp = -1; gpuTemp = -1;
Debug.WriteLine("Failed reading GPU temp :" + ex.Message); //Debug.WriteLine("Failed reading GPU temp :" + ex.Message);
} }
if (gpuTemp is null || gpuTemp < 0) if (gpuTemp is null || gpuTemp < 0)
{
gpuTemp = Program.acpi.DeviceGet(AsusACPI.Temp_GPU); gpuTemp = Program.acpi.DeviceGet(AsusACPI.Temp_GPU);
}
return gpuTemp;
}
public static void ReadSensors()
{
batteryRate = 0;
gpuUse = -1;
cpuFan = FanSensorControl.FormatFan(AsusFan.CPU, Program.acpi.GetFan(AsusFan.CPU));
gpuFan = FanSensorControl.FormatFan(AsusFan.GPU, Program.acpi.GetFan(AsusFan.GPU));
midFan = FanSensorControl.FormatFan(AsusFan.Mid, Program.acpi.GetFan(AsusFan.Mid));
cpuTemp = GetCPUTemp();
gpuTemp = GetGPUTemp();
ReadFullChargeCapacity(); ReadFullChargeCapacity();
GetBatteryStatus(); GetBatteryStatus();