Improved 3rd (mid) fan detection #2067

seerge · Feb 16, 2024 · 03bff51 · 03bff51
1 parent 42a598f
commit 03bff51
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/app/AsusACPI.cs b/app/AsusACPI.cs
@@ -514,16 +514,25 @@ public byte[] GetFanCurve(AsusFan device, int mode = 0)
             default: fan_mode = 0; break;
         }
 
+        byte[] result;
+
         switch (device)
         {
             case AsusFan.GPU:
-                return DeviceGetBuffer(DevsGPUFanCurve, fan_mode);
+                result = DeviceGetBuffer(DevsGPUFanCurve, fan_mode);
+                break;
             case AsusFan.Mid:
-                return DeviceGetBuffer(DevsMidFanCurve, fan_mode);
+                result = DeviceGetBuffer(DevsMidFanCurve, fan_mode);
+                break;
             default:
-                return DeviceGetBuffer(DevsCPUFanCurve, fan_mode);
+                result = DeviceGetBuffer(DevsCPUFanCurve, fan_mode);
+                break;
         }
 
+        Logger.WriteLine($"GetFan {device} :" + BitConverter.ToString(result));
+
+        return result;
+
     }
 
     public static bool IsInvalidCurve(byte[] curve)

diff --git a/app/Fans.cs b/app/Fans.cs
@@ -953,7 +953,7 @@ public void InitFans()
             int chartCount = 2;
 
             // Middle / system fan check
-            if (!AsusACPI.IsEmptyCurve(Program.acpi.GetFanCurve(AsusFan.Mid)))
+            if (!AsusACPI.IsEmptyCurve(Program.acpi.GetFanCurve(AsusFan.Mid)) || Program.acpi.GetFan(AsusFan.Mid) >= 0)
             {
                 AppConfig.Set("mid_fan", 1);
                 chartCount++;