Merge pull request #8 from 1271/master

gpu sensors patch #7
AlexGyver · Dec 20, 2017 · df63e5f · df63e5f
2 parents fa9d6cc + 6a2451e
commit df63e5f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/HardwareMonitorPlus/OpenHardwareMonitor.exe b/HardwareMonitorPlus/OpenHardwareMonitor.exe
diff --git a/HardwareMonitorPlus/OpenHardwareMonitorLib.dll b/HardwareMonitorPlus/OpenHardwareMonitorLib.dll
diff --git a/openhardwaremonitor_source/GUI/MainForm.cs b/openhardwaremonitor_source/GUI/MainForm.cs
@@ -665,20 +665,28 @@ public void timer_Tick(object sender, EventArgs e) {
 
         var gpuMaxTemp = Math.Max(
             (int)MaxTemp(computer, HardwareType.GpuNvidia),
-            (int)MaxTemp(computer, HardwareType.Mainboard)
+            (int)MaxTemp(computer, HardwareType.GpuAti)
+        );
+        var gpuMaxUsage = Math.Max(
+          (int)UsageInPercent(computer, HardwareType.GpuAti, "GPU Core"),
+          (int)UsageInPercent(computer, HardwareType.GpuNvidia, "GPU Core")
+        );
+        var gpuMaxMemory = Math.Max(
+          (int)UsageInPercent(computer, HardwareType.GpuAti, "GPU Memory"),
+          (int)UsageInPercent(computer, HardwareType.GpuNvidia, "GPU Memory")
         );
 
-        List<float> data = new List<float>
+        List <float> data = new List<float>
         {
             (int)MaxTemp(computer, HardwareType.CPU),
             gpuMaxTemp,
             (int)MaxTemp(computer, HardwareType.Mainboard),
             (int)MaxTemp(computer, HardwareType.HDD),
             (int)UsageInPercent(computer, HardwareType.CPU, "CPU Total"),
-            (int)(UsageInPercent(computer, HardwareType.GpuAti, "GPU Core") + UsageInPercent(computer, HardwareType.GpuNvidia, "GPU Core")), // тут int                    
+            (int)gpuMaxUsage,
             (int)UsageInPercent(computer, HardwareType.RAM, "Memory"),
-            (int)UsageInPercent(computer, HardwareType.GpuAti, "GPU Memory") + UsageInPercent(computer, HardwareType.GpuNvidia, "GPU Memory"), // тут float                                    
-                
+            (int)gpuMaxMemory,
+
             // Right group.
             settings.GetValue("nMaxFan", 100),
             settings.GetValue("nMinFan", 20),