Report all ADL status (#474)

* Report all ADL status

* Formatting
This commit is contained in:
PhyxionNL
2021-06-19 10:12:44 +02:00
committed by GitHub
parent 742c71c629
commit e276614418
+18 -30
View File
@@ -491,12 +491,14 @@ namespace LibreHardwareMonitor.Hardware.Gpu
r.AppendLine("Overdrive Caps");
r.AppendLine();
try
{
int supported = 0;
int enabled = 0;
int version = 0;
AtiAdlxx.ADLStatus status = AtiAdlxx.ADL_Overdrive_Caps(_adapterIndex, ref supported, ref enabled, ref version);
r.Append(" Status: ");
r.AppendLine(status.ToString());
r.Append(" Supported: ");
@@ -518,6 +520,7 @@ namespace LibreHardwareMonitor.Hardware.Gpu
try
{
AtiAdlxx.ADLStatus status = AtiAdlxx.ADL_Overdrive5_ODParameters_Get(_adapterIndex, out AtiAdlxx.ADLODParameters p);
r.Append(" Status: ");
r.AppendLine(status.ToString());
r.AppendFormat(" NumberOfPerformanceLevels: {0}{1}", p.NumberOfPerformanceLevels, Environment.NewLine);
@@ -617,14 +620,8 @@ namespace LibreHardwareMonitor.Hardware.Gpu
string pt = ((AtiAdlxx.ADLODNCurrentPowerType)i).ToString();
AtiAdlxx.ADLStatus status = AtiAdlxx.ADL2_Overdrive6_CurrentPower_Get(_context, _adapterIndex, (AtiAdlxx.ADLODNCurrentPowerType)i, ref power);
if (status == AtiAdlxx.ADLStatus.ADL_OK)
{
r.AppendFormat(" Power[{0}].Value: {1}{2}", pt, power * (1.0f / 0xFF), Environment.NewLine);
}
else
{
r.AppendFormat(" Power[{0}].Status: {1}{2}", pt, status.ToString(), Environment.NewLine);
}
r.AppendFormat(" Power[{0}].Status: {1}{2}", pt, status.ToString(), Environment.NewLine);
r.AppendFormat(" Power[{0}].Value: {1}{2}", pt, power * (1.0f / 0xFF), Environment.NewLine);
}
}
catch (EntryPointNotFoundException)
@@ -650,14 +647,9 @@ namespace LibreHardwareMonitor.Hardware.Gpu
int temperature = 0;
string tt = ((AtiAdlxx.ADLODNTemperatureType)i).ToString();
AtiAdlxx.ADLStatus status = AtiAdlxx.ADL2_OverdriveN_Temperature_Get(_context, _adapterIndex, (AtiAdlxx.ADLODNTemperatureType)i, ref temperature);
if (status == AtiAdlxx.ADLStatus.ADL_OK)
{
r.AppendFormat(" Temperature[{0}].Value: {1}{2}", tt, 0.001f * temperature, Environment.NewLine);
}
else
{
r.AppendFormat(" Temperature[{0}].Status: {1}{2}", tt, status.ToString(), Environment.NewLine);
}
r.AppendFormat(" Temperature[{0}].Status: {1}{2}", tt, status.ToString(), Environment.NewLine);
r.AppendFormat(" Temperature[{0}].Value: {1}{2}", tt, 0.001f * temperature, Environment.NewLine);
}
}
catch (EntryPointNotFoundException)
@@ -679,6 +671,7 @@ namespace LibreHardwareMonitor.Hardware.Gpu
try
{
var status = AtiAdlxx.ADL2_OverdriveN_PerformanceStatus_Get(_context, _adapterIndex, out var ps);
r.Append(" Status: ");
r.AppendLine(status.ToString());
r.AppendFormat(" CoreClock: {0}{1}", ps.CoreClock, Environment.NewLine);
@@ -720,21 +713,16 @@ namespace LibreHardwareMonitor.Hardware.Gpu
{
var data = new AtiAdlxx.ADLPMLogDataOutput();
AtiAdlxx.ADLStatus status = AtiAdlxx.ADL2_New_QueryPMLogData_Get(_context, _adapterIndex, ref data);
if (status == AtiAdlxx.ADLStatus.ADL_OK)
r.Append(" Status: ");
r.AppendLine(status.ToString());
for (int i = 0; i < data.sensors.Length; i++)
{
for (int i = 0; i < data.sensors.Length; i++)
{
if (data.sensors[i].supported != 0)
{
string st = ((AtiAdlxx.ADLSensorType)i).ToString();
r.AppendFormat(" Sensor[{0}].Value: {1}{2}", st, data.sensors[i].value, Environment.NewLine);
}
}
}
else
{
r.Append(" Status: ");
r.AppendLine(status.ToString());
string st = ((AtiAdlxx.ADLSensorType)i).ToString();
r.AppendFormat(" Sensor[{0}].Supported: {1}{2}", st, data.sensors[i].supported, Environment.NewLine);
r.AppendFormat(" Sensor[{0}].Value: {1}{2}", st, data.sensors[i].value, Environment.NewLine);
}
}
catch (EntryPointNotFoundException)