From 0a0a94fe2d452f3efebb1fb895782eff6314946b Mon Sep 17 00:00:00 2001 From: DevTechProfile Date: Sun, 18 Dec 2022 14:10:03 +0100 Subject: [PATCH] naming, delay for synchronized system info on PMD tab, new ADLX TBP sensor as default metric --- source/CapFrameX.ADLX/ADLXManager.cpp | 12 ++++++------ .../Classes/SessionSensorData2.cs | 2 +- source/CapFrameX.Sensor/SensorEntryProvider.cs | 3 ++- source/CapFrameX.ViewModel/PmdViewModel.cs | 1 + 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/source/CapFrameX.ADLX/ADLXManager.cpp b/source/CapFrameX.ADLX/ADLXManager.cpp index 3ac8bb58..f471983f 100644 --- a/source/CapFrameX.ADLX/ADLXManager.cpp +++ b/source/CapFrameX.ADLX/ADLXManager.cpp @@ -231,9 +231,9 @@ bool IntializeAdlx() res = g_ADLXHelp.GetSystemServices()->GetGPUs(&gpus); if (ADLX_SUCCEEDED(res)) { - IADLXGPUPtr oneGPU; + IADLXGPUPtr gpu; // Use the first GPU in the list - res = gpus->At(gpus->Begin(), &oneGPU); + res = gpus->At(gpus->Begin(), &gpu); if (ADLX_SUCCEEDED(res)) { return true; @@ -282,13 +282,13 @@ bool GetAdlxTelemetry(const adlx_uint index, AdlxTelemetryData* adlxTelemetryDat IADLXGPUMetricsSupportPtr gpuMetricsSupport; IADLXGPUMetricsPtr gpuMetrics; - IADLXGPUPtr oneGPU; - res = gpus->At(index, &oneGPU); + IADLXGPUPtr gpu; + res = gpus->At(index, &gpu); if (ADLX_SUCCEEDED(res)) { - ADLX_RESULT res1 = perfMonitoringService->GetSupportedGPUMetrics(oneGPU, &gpuMetricsSupport); - ADLX_RESULT res2 = perfMonitoringService->GetCurrentGPUMetrics(oneGPU, &gpuMetrics); + ADLX_RESULT res1 = perfMonitoringService->GetSupportedGPUMetrics(gpu, &gpuMetricsSupport); + ADLX_RESULT res2 = perfMonitoringService->GetCurrentGPUMetrics(gpu, &gpuMetrics); // Display timestamp and GPU metrics if (ADLX_SUCCEEDED(res1) && ADLX_SUCCEEDED(res2)) diff --git a/source/CapFrameX.Data.Session/Classes/SessionSensorData2.cs b/source/CapFrameX.Data.Session/Classes/SessionSensorData2.cs index a2540ad1..56e5be1f 100644 --- a/source/CapFrameX.Data.Session/Classes/SessionSensorData2.cs +++ b/source/CapFrameX.Data.Session/Classes/SessionSensorData2.cs @@ -42,7 +42,7 @@ public class SessionSensorData2 : Dictionary, ISess [JsonIgnore] public int[] GpuClock { get => Values.FirstOrDefault(c => c.Name.Contains("GPU Core") && c.Type == "Clock")?.Values.Select(Convert.ToInt32).ToArray() ?? Array.Empty(); set => throw new NotImplementedException(); } [JsonIgnore] - 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(); set => throw new NotImplementedException(); } + 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(); set => throw new NotImplementedException(); } [JsonIgnore] public int[] GpuTBPSim { get => Values.FirstOrDefault(c => c.Name.Contains("GPU TBP") && c.Type == "Power")?.Values.Select(Convert.ToInt32).ToArray() ?? Array.Empty(); set => throw new NotImplementedException(); } [JsonIgnore] diff --git a/source/CapFrameX.Sensor/SensorEntryProvider.cs b/source/CapFrameX.Sensor/SensorEntryProvider.cs index 30850d0e..2a0c7938 100644 --- a/source/CapFrameX.Sensor/SensorEntryProvider.cs +++ b/source/CapFrameX.Sensor/SensorEntryProvider.cs @@ -91,7 +91,8 @@ public bool GetIsDefaultActiveSensor(ISensorEntry sensor) case "GPU Power" when hardwareType == HardwareType.GpuNvidia: case "GPU Power Limit" when hardwareType == HardwareType.GpuNvidia: case "GPU Total" when hardwareType == HardwareType.GpuAti: - case "GPU TDP" when hardwareType == HardwareType.GpuIntel: + case "GPU TBP" when hardwareType == HardwareType.GpuAti: + case "GPU TDP" when hardwareType == HardwareType.GpuIntel: case "Used Memory Game" when hardwareType == HardwareType.RAM: case "GPU Memory Dedicated" when sensorType == SensorType.Data: isDefault = true; diff --git a/source/CapFrameX.ViewModel/PmdViewModel.cs b/source/CapFrameX.ViewModel/PmdViewModel.cs index 344c4f2f..1bb955c0 100644 --- a/source/CapFrameX.ViewModel/PmdViewModel.cs +++ b/source/CapFrameX.ViewModel/PmdViewModel.cs @@ -339,6 +339,7 @@ public PmdViewModel(IPmdService pmdService, IAppConfiguration appConfiguration, Task.Factory.StartNew(async () => { await sensorService.SensorServiceCompletionSource.Task; + await Task.Delay(500); Application.Current.Dispatcher.Invoke(() => {