Merge branch 'seerge:main' into main

app/ASUSWmi.cs

@@ -60,7 +60,7 @@ public class ASUSWmi
     public const int GPUModeUltimate = 2;
 
 
-    public const int MaxTotal = 150;
+    public const int MaxTotal = 180;
     public const int MinTotal = 5;
     public const int DefaultTotal = 125;
 

app/Fans.cs

@@ -108,7 +108,7 @@ void SetChart(Chart chart, int device)
             chart.ChartAreas[0].AxisY.Maximum = 100;
 
             chart.ChartAreas[0].AxisY.LabelStyle.Font = new Font("Arial", 7F);
-            
+
             chart.ChartAreas[0].AxisX.MajorGrid.LineColor = chartGrid;
             chart.ChartAreas[0].AxisY.MajorGrid.LineColor = chartGrid;
             chart.ChartAreas[0].AxisX.LineColor = chartGrid;

app/Gpu/AmdGpuTemperatureProvider.cs

@@ -73,6 +73,24 @@ public AmdGpuTemperatureProvider() {
         return temperatureSensor.Value;
     }
 
+
+    public int? GetGpuUse()
+    {
+        if (!IsValid)
+            return null;
+
+        if (Adl2.NativeMethods.ADL2_New_QueryPMLogData_Get(_adlContextHandle, _internalDiscreteAdapter.AdapterIndex, out ADLPMLogDataOutput adlpmLogDataOutput) != Adl2.ADL_SUCCESS)
+            return null;
+
+        ADLSingleSensorData gpuUsage = adlpmLogDataOutput.Sensors[(int)ADLSensorType.PMLOG_INFO_ACTIVITY_GFX];
+        if (gpuUsage.Supported == 0)
+            return null;
+
+        return gpuUsage.Value;
+
+    }
+
+
     private void ReleaseUnmanagedResources() {
         if (_adlContextHandle != IntPtr.Zero) {
             Adl2.NativeMethods.ADL2_Main_Control_Destroy(_adlContextHandle);

app/Gpu/IGpuTemperatureProvider.cs

@@ -3,4 +3,5 @@
 public interface IGpuTemperatureProvider : IDisposable {
     bool IsValid { get; }
     int? GetCurrentTemperature();
+    int? GetGpuUse();
 }

app/Gpu/NvidiaGpuTemperatureProvider.cs

@@ -1,42 +1,68 @@
 using NvAPIWrapper.GPU;
 using NvAPIWrapper.Native;
-using NvAPIWrapper.Native.Exceptions;
 using NvAPIWrapper.Native.GPU;
 using NvAPIWrapper.Native.Interfaces.GPU;
 
-namespace GHelper.Gpu; 
+namespace GHelper.Gpu;
 
-public class NvidiaGpuTemperatureProvider : IGpuTemperatureProvider {
+public class NvidiaGpuTemperatureProvider : IGpuTemperatureProvider
+{
     private readonly PhysicalGPU? _internalGpu;
 
-    public NvidiaGpuTemperatureProvider() {
+    public NvidiaGpuTemperatureProvider()
+    {
         _internalGpu = GetInternalDiscreteGpu();
     }
 
     public bool IsValid => _internalGpu != null;
 
-    public int? GetCurrentTemperature() {
+    public int? GetCurrentTemperature()
+    {
         if (!IsValid)
             return null;
 
         PhysicalGPU internalGpu = _internalGpu!;
-        IThermalSensor? gpuSensor = 
+        IThermalSensor? gpuSensor =
             GPUApi.GetThermalSettings(internalGpu.Handle).Sensors
             .FirstOrDefault(s => s.Target == ThermalSettingsTarget.GPU);
 
         return gpuSensor?.CurrentTemperature;
     }
 
-    public void Dispose() {
+    public void Dispose()
+    {
     }
-
-    private static PhysicalGPU? GetInternalDiscreteGpu() {
-        try {
+
+    private static PhysicalGPU? GetInternalDiscreteGpu()
+    {
+        try
+        {
             return PhysicalGPU
                 .GetPhysicalGPUs()
                 .FirstOrDefault(gpu => gpu.SystemType == SystemType.Laptop);
-        } catch {
+        }
+        catch
+        {
             return null;
         }
     }
+
+
+    public int? GetGpuUse()
+    {
+        if (!IsValid)
+            return null;
+
+        PhysicalGPU internalGpu = _internalGpu!;
+
+        IUtilizationDomainInfo? gpuUsage = GPUApi.GetUsages(internalGpu.Handle).GPU;
+
+        if (gpuUsage == null) 
+            return null;
+
+        return 
+            (int)gpuUsage?.Percentage;
+
+    }
+
 }

app/HardwareMonitor.cs

@@ -1,6 +1,6 @@
-using System.Diagnostics;
-using GHelper;
+using GHelper;
 using GHelper.Gpu;
+using System.Diagnostics;
 
 public static class HardwareMonitor
 {
@@ -14,6 +14,9 @@ public static class HardwareMonitor
     public static string? gpuFan;
     public static string? midFan;
 
+    //public static List<int> gpuUsage = new List<int>();
+    public static int? gpuUse;
+
     public static int GetFanMax()
     {
         int max = 58;
@@ -41,45 +44,66 @@ private static string FormatFan(int fan)
         if (Program.config.getConfig("fan_rpm") == 1)
             return " Fan: " + (fan * 100).ToString() + "RPM";
         else
-            return " Fan: " + Math.Min(Math.Round((float)fan/fanMax*100), 100).ToString() + "%"; // relatively to 6000 rpm
+            return " Fan: " + Math.Min(Math.Round((float)fan / fanMax * 100), 100).ToString() + "%"; // relatively to 6000 rpm
+    }
+
+    private static int GetGpuUse()
+    {
+        try
+        {
+            int? gpuUse = GpuTemperatureProvider?.GetGpuUse();
+            if (gpuUse is not null) return (int)gpuUse;
+        }
+        catch (Exception ex)
+        {
+            Debug.WriteLine(ex.ToString());
+        }
+
+        return 0;
     }
 
     public static void ReadSensors()
     {
         batteryDischarge = -1;
         gpuTemp = -1;
+        gpuUse = -1;
 
         cpuFan = FormatFan(Program.wmi.DeviceGet(ASUSWmi.CPU_Fan));
         gpuFan = FormatFan(Program.wmi.DeviceGet(ASUSWmi.GPU_Fan));
         midFan = FormatFan(Program.wmi.DeviceGet(ASUSWmi.Mid_Fan));
 
         cpuTemp = Program.wmi.DeviceGet(ASUSWmi.Temp_CPU);
 
-
         if (cpuTemp < 0) try
         {
             var ct = new PerformanceCounter("Thermal Zone Information", "Temperature", @"\_TZ.THRM", true);
             cpuTemp = ct.NextValue() - 273;
             ct.Dispose();
-        } catch
+        }
+        catch
         {
-            Logger.WriteLine("Failed reading CPU temp");
+            Debug.WriteLine("Failed reading CPU temp");
         }
 
-        if (gpuTemp < 0)  try
+        try
         {
-           gpuTemp = GpuTemperatureProvider?.GetCurrentTemperature();
+            gpuTemp = GpuTemperatureProvider?.GetCurrentTemperature();
 
         }
-        catch (Exception ex) {
+        catch (Exception ex)
+        {
             gpuTemp = -1;
-            Logger.WriteLine("Failed reading GPU temp");
-            Logger.WriteLine(ex.ToString());
+            Debug.WriteLine("Failed reading GPU temp");
+            Debug.WriteLine(ex.ToString());
         }
 
         if (gpuTemp is null || gpuTemp < 0)
             gpuTemp = Program.wmi.DeviceGet(ASUSWmi.Temp_GPU);
 
+        /*
+        gpuUsage.Add(GetGpuUse());
+        if (gpuUsage.Count > 3) gpuUsage.RemoveAt(0);
+        */
 
         try
         {
@@ -90,15 +114,22 @@ public static void ReadSensors()
         }
         catch
         {
-            Logger.WriteLine("Failed reading Battery discharge");
+            Debug.WriteLine("Failed reading Battery discharge");
         }
     }
 
-    public static void RecreateGpuTemperatureProviderWithDelay() {
+    public static bool IsUsedGPU(int threshold = 50)
+    {
+        return (GetGpuUse() > threshold);
+    }
+
+    public static void RecreateGpuTemperatureProviderWithDelay()
+    {
 
         // Re-enabling the discrete GPU takes a bit of time,
         // so a simple workaround is to refresh again after that happens
-        Task.Run(async () => {
+        Task.Run(async () =>
+        {
             await Task.Delay(TimeSpan.FromSeconds(5));
             RecreateGpuTemperatureProvider();
         });
@@ -107,7 +138,8 @@ public static void RecreateGpuTemperatureProviderWithDelay() {
 
     }
 
-    public static void RecreateGpuTemperatureProvider() {
+    public static void RecreateGpuTemperatureProvider()
+    {
         try
         {
             GpuTemperatureProvider?.Dispose();
@@ -134,8 +166,8 @@ public static void RecreateGpuTemperatureProvider() {
             GpuTemperatureProvider = null;
         }
         catch (Exception ex)
-        { 
+        {
             Debug.WriteLine(ex.ToString());
-        } 
+        }
     }
 }