Skip to content

Commit 0a0a94f

Browse files
naming, delay for synchronized system info on PMD tab, new ADLX TBP sensor as default metric
1 parent 85f8a2f commit 0a0a94f

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

source/CapFrameX.ADLX/ADLXManager.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,9 @@ bool IntializeAdlx()
231231
res = g_ADLXHelp.GetSystemServices()->GetGPUs(&gpus);
232232
if (ADLX_SUCCEEDED(res))
233233
{
234-
IADLXGPUPtr oneGPU;
234+
IADLXGPUPtr gpu;
235235
// Use the first GPU in the list
236-
res = gpus->At(gpus->Begin(), &oneGPU);
236+
res = gpus->At(gpus->Begin(), &gpu);
237237
if (ADLX_SUCCEEDED(res))
238238
{
239239
return true;
@@ -282,13 +282,13 @@ bool GetAdlxTelemetry(const adlx_uint index, AdlxTelemetryData* adlxTelemetryDat
282282
IADLXGPUMetricsSupportPtr gpuMetricsSupport;
283283
IADLXGPUMetricsPtr gpuMetrics;
284284

285-
IADLXGPUPtr oneGPU;
286-
res = gpus->At(index, &oneGPU);
285+
IADLXGPUPtr gpu;
286+
res = gpus->At(index, &gpu);
287287

288288
if (ADLX_SUCCEEDED(res))
289289
{
290-
ADLX_RESULT res1 = perfMonitoringService->GetSupportedGPUMetrics(oneGPU, &gpuMetricsSupport);
291-
ADLX_RESULT res2 = perfMonitoringService->GetCurrentGPUMetrics(oneGPU, &gpuMetrics);
290+
ADLX_RESULT res1 = perfMonitoringService->GetSupportedGPUMetrics(gpu, &gpuMetricsSupport);
291+
ADLX_RESULT res2 = perfMonitoringService->GetCurrentGPUMetrics(gpu, &gpuMetrics);
292292

293293
// Display timestamp and GPU metrics
294294
if (ADLX_SUCCEEDED(res1) && ADLX_SUCCEEDED(res2))

source/CapFrameX.Data.Session/Classes/SessionSensorData2.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class SessionSensorData2 : Dictionary<string, ISessionSensorEntry>, ISess
4242
[JsonIgnore]
4343
public int[] GpuClock { get => Values.FirstOrDefault(c => c.Name.Contains("GPU Core") && c.Type == "Clock")?.Values.Select(Convert.ToInt32).ToArray() ?? Array.Empty<int>(); set => throw new NotImplementedException(); }
4444
[JsonIgnore]
45-
public int[] GpuPower { get => Values.FirstOrDefault(c => (c.Name.Contains("GPU Power") || c.Name.Contains("GPU Total") || c.Name.Contains("GPU TDP")) && c.Type == "Power")?.Values.Select(Convert.ToInt32).ToArray() ?? Array.Empty<int>(); set => throw new NotImplementedException(); }
45+
public int[] GpuPower { get => Values.FirstOrDefault(c => (c.Name.Contains("GPU Power") || c.Name.Contains("GPU Total") || c.Name.Contains("GPU TDP") || c.Name.Contains("GPU TBP")) && c.Type == "Power")?.Values.Select(Convert.ToInt32).ToArray() ?? Array.Empty<int>(); set => throw new NotImplementedException(); }
4646
[JsonIgnore]
4747
public int[] GpuTBPSim { get => Values.FirstOrDefault(c => c.Name.Contains("GPU TBP") && c.Type == "Power")?.Values.Select(Convert.ToInt32).ToArray() ?? Array.Empty<int>(); set => throw new NotImplementedException(); }
4848
[JsonIgnore]

source/CapFrameX.Sensor/SensorEntryProvider.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@ public bool GetIsDefaultActiveSensor(ISensorEntry sensor)
9191
case "GPU Power" when hardwareType == HardwareType.GpuNvidia:
9292
case "GPU Power Limit" when hardwareType == HardwareType.GpuNvidia:
9393
case "GPU Total" when hardwareType == HardwareType.GpuAti:
94-
case "GPU TDP" when hardwareType == HardwareType.GpuIntel:
94+
case "GPU TBP" when hardwareType == HardwareType.GpuAti:
95+
case "GPU TDP" when hardwareType == HardwareType.GpuIntel:
9596
case "Used Memory Game" when hardwareType == HardwareType.RAM:
9697
case "GPU Memory Dedicated" when sensorType == SensorType.Data:
9798
isDefault = true;

source/CapFrameX.ViewModel/PmdViewModel.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,7 @@ public PmdViewModel(IPmdService pmdService, IAppConfiguration appConfiguration,
339339
Task.Factory.StartNew(async () =>
340340
{
341341
await sensorService.SensorServiceCompletionSource.Task;
342+
await Task.Delay(500);
342343

343344
Application.Current.Dispatcher.Invoke(() =>
344345
{

0 commit comments

Comments
 (0)