From 0bac025214b45b74f9577c564da151aeb109fe55 Mon Sep 17 00:00:00 2001 From: Jeff D <61430184+jeffdamp-wave@users.noreply.github.com> Date: Sat, 13 Jan 2024 07:40:41 -0800 Subject: [PATCH] =?UTF-8?q?Add=20limited=20support=20for=20=E2=80=9CASUS?= =?UTF-8?q?=20ROG=20STRIX=20X670E-E=20GAMING=20WIFI=E2=80=9D=20(#1235)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jeff Damphier --- .../Hardware/Motherboard/Identification.cs | 2 ++ .../Motherboard/Lpc/EC/EmbeddedController.cs | 5 +++++ .../Hardware/Motherboard/Model.cs | 1 + .../Hardware/Motherboard/SuperIOHardware.cs | 15 ++++++++------- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs index d340497..abdd3ae 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs @@ -405,6 +405,8 @@ internal class Identification return Model.ROG_MAXIMUS_Z690_HERO; case var _ when name.Equals("ROG MAXIMUS Z690 EXTREME GLACIAL", StringComparison.OrdinalIgnoreCase): return Model.ROG_MAXIMUS_Z690_EXTREME_GLACIAL; + case var _ when name.Equals("ROG STRIX X670E-E GAMING WIFI", StringComparison.OrdinalIgnoreCase): + return Model.ROG_STRIX_X670E_E_GAMING_WIFI; case var _ when name.Equals("ROG STRIX X670E-F GAMING WIFI", StringComparison.OrdinalIgnoreCase): return Model.ROG_STRIX_X670E_F_GAMING_WIFI; case var _ when name.Equals("B660GTN", StringComparison.OrdinalIgnoreCase): diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/EC/EmbeddedController.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/EC/EmbeddedController.cs index 41f2dc8..37d58e3 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/EC/EmbeddedController.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/EC/EmbeddedController.cs @@ -85,6 +85,11 @@ public abstract class EmbeddedController : Hardware ECSensor.TempWaterIn, ECSensor.TempWaterOut, ECSensor.FanCPUOpt), + new(Model.ROG_STRIX_X670E_E_GAMING_WIFI, + BoardFamily.Amd600, + ECSensor.TempWaterIn, + ECSensor.TempWaterOut, + ECSensor.FanCPUOpt), new(Model.ROG_STRIX_X670E_F_GAMING_WIFI, BoardFamily.Amd600, ECSensor.TempWaterIn, diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs index b5f1b0d..f4b2fb3 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs @@ -47,6 +47,7 @@ public enum Model ROG_CROSSHAIR_X670E_EXTREME, ROG_CROSSHAIR_X670E_HERO, ROG_CROSSHAIR_X670E_GENE, + ROG_STRIX_X670E_E_GAMING_WIFI, ROG_STRIX_X670E_F_GAMING_WIFI, ROG_STRIX_X570_E_GAMING, ROG_STRIX_X570_F_GAMING, diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs index 0f945b7..e2fc9d0 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs @@ -3318,6 +3318,7 @@ internal sealed class SuperIOHardware : Hardware break; + case Model.ROG_STRIX_X670E_E_GAMING_WIFI: // NCT6799D case Model.ROG_STRIX_X670E_F_GAMING_WIFI: // NCT6799D v.Add(new Voltage("Vcore", 0, 2, 2)); // This is wrong v.Add(new Voltage("+5V", 1, 4, 1)); @@ -3335,13 +3336,13 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("Voltage #14", 13, true)); v.Add(new Voltage("Voltage #15", 14, true)); t.Add(new Temperature("CPU Core", 0)); - t.Add(new Temperature("Temperature #1", 1)); - t.Add(new Temperature("Temperature #2", 2)); - t.Add(new Temperature("Temperature #3", 3)); - t.Add(new Temperature("Temperature #4", 4)); - t.Add(new Temperature("Temperature #5", 5)); - t.Add(new Temperature("Temperature #6", 6)); - t.Add(new Temperature("T Sensor", 24)); + t.Add(new Temperature("VRM", 1)); // Aligned with BIOS value ROG_STRIX_X670E_E_GAMING_WIFI + t.Add(new Temperature("Motherboard", 2)); // Aligned with Armoury Crate ROG_STRIX_X670E_E_GAMING_WIFI + t.Add(new Temperature("Temperature #3", 3)); // No matching temp value + t.Add(new Temperature("Temperature #4", 4)); // No matching temp value + t.Add(new Temperature("Temperature #5", 5)); // No matching temp value + t.Add(new Temperature("Temperature #6", 6)); // No matching temp value + t.Add(new Temperature("T Sensor", 24)); // Aligned with Armoury Crate ROG_STRIX_X670E_E_GAMING_WIFI for (int i = 0; i < superIO.Fans.Length; i++) f.Add(new Fan("Fan #" + (i + 1), i));