Merge branch 'main' into gamma

This commit is contained in:
Serge
2024-02-16 23:16:17 +01:00
2 changed files with 13 additions and 4 deletions

View File

@@ -514,16 +514,25 @@ public class AsusACPI
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)

View File

@@ -953,7 +953,7 @@ namespace GHelper
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++;