From 4b166d214035de49c758686dff7cb61de61780d6 Mon Sep 17 00:00:00 2001 From: Rem0o Date: Wed, 8 Mar 2023 16:20:24 -0500 Subject: [PATCH] Update SuperIOHardware.cs (#999) The embedded switch on the model has no default and would break out of the manufacturer switch if the model wasn't Z790_Taichi. --- .../Hardware/Motherboard/SuperIOHardware.cs | 37 ++++++++----------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs index 82aaf7f..015400d 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs @@ -358,29 +358,24 @@ internal sealed class SuperIOHardware : Hardware case Chip.NCT6687D: switch (manufacturer) { - case Manufacturer.ASRock: - switch (model) - { - case Model.Z790_Taichi: - t.Add(new Temperature("CPU", 0)); - t.Add(new Temperature("Motherboard", 1)); - t.Add(new Temperature("MOS", 2)); + case Manufacturer.ASRock when model == Model.Z790_Taichi: + t.Add(new Temperature("CPU", 0)); + t.Add(new Temperature("Motherboard", 1)); + t.Add(new Temperature("MOS", 2)); - f.Add(new Fan("CPU Fan #1", 0)); - f.Add(new Fan("Chassis Fan #4", 1)); - f.Add(new Fan("CPU Fan #2", 2)); - f.Add(new Fan("Chassis Fan #2", 3)); - f.Add(new Fan("Chassis Fan #1", 4)); - f.Add(new Fan("MOS Fan #1", 5)); + f.Add(new Fan("CPU Fan #1", 0)); + f.Add(new Fan("Chassis Fan #4", 1)); + f.Add(new Fan("CPU Fan #2", 2)); + f.Add(new Fan("Chassis Fan #2", 3)); + f.Add(new Fan("Chassis Fan #1", 4)); + f.Add(new Fan("MOS Fan #1", 5)); - c.Add(new Ctrl("CPU Fan #1", 0)); - c.Add(new Ctrl("Chassis Fan #4", 1)); - c.Add(new Ctrl("CPU Fan #2", 2)); - c.Add(new Ctrl("Chassis Fan #2", 3)); - c.Add(new Ctrl("Chassis Fan #1", 4)); - c.Add(new Ctrl("MOS Fan #1", 5)); - break; - } + c.Add(new Ctrl("CPU Fan #1", 0)); + c.Add(new Ctrl("Chassis Fan #4", 1)); + c.Add(new Ctrl("CPU Fan #2", 2)); + c.Add(new Ctrl("Chassis Fan #2", 3)); + c.Add(new Ctrl("Chassis Fan #1", 4)); + c.Add(new Ctrl("MOS Fan #1", 5)); break; default: v.Add(new Voltage("+12V", 0));