From 04be3e39430adbdea0111a02d1b66b8705428b91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=B6ller?= Date: Sun, 8 Jul 2012 19:26:00 +0000 Subject: [PATCH] Added a mainboard specific configuration for the Asus P8Z77-V (Issue 347) and added an additional temperature for the Gigabyte GA-MA78LM-S2H (Issue 358). --- Hardware/Mainboard/Model.cs | 3 +- Hardware/Mainboard/SMBIOS.cs | 4 +- Hardware/Mainboard/SuperIOHardware.cs | 106 +++++++++++++++++++------- Properties/AssemblyVersion.cs | 4 +- 4 files changed, 85 insertions(+), 32 deletions(-) diff --git a/Hardware/Mainboard/Model.cs b/Hardware/Mainboard/Model.cs index f10b7d5..cd59faf 100644 --- a/Hardware/Mainboard/Model.cs +++ b/Hardware/Mainboard/Model.cs @@ -22,11 +22,12 @@ namespace OpenHardwareMonitor.Hardware.Mainboard { M4A79XTD_EVO, P5W_DH_Deluxe, P6T, - P6X58D_E, + P6X58D_E, P8P67, P8P67_EVO, P8P67_PRO, P8P67_M_PRO, + P8Z77_V, P9X79, Rampage_Extreme, Rampage_II_GENE, diff --git a/Hardware/Mainboard/SMBIOS.cs b/Hardware/Mainboard/SMBIOS.cs index db3471b..1b7b44c 100644 --- a/Hardware/Mainboard/SMBIOS.cs +++ b/Hardware/Mainboard/SMBIOS.cs @@ -396,6 +396,8 @@ namespace OpenHardwareMonitor.Hardware.Mainboard { return Model.P8P67_PRO; case "P8P67-M PRO": return Model.P8P67_M_PRO; + case "P8Z77-V": + return Model.P8Z77_V; case "P9X79": return Model.P9X79; case "Rampage Extreme": @@ -481,7 +483,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard { case "Z68X-UD7-B3": return Model.Z68X_UD7_B3; case "FH67": - return Model.FH67; + return Model.FH67; case "Base Board Product Name": case "To be filled by O.E.M.": return Model.Unknown; diff --git a/Hardware/Mainboard/SuperIOHardware.cs b/Hardware/Mainboard/SuperIOHardware.cs index 664f733..f863f50 100644 --- a/Hardware/Mainboard/SuperIOHardware.cs +++ b/Hardware/Mainboard/SuperIOHardware.cs @@ -353,8 +353,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard { f.Add(new Fan("System Fan", 1)); break; case Model.GA_MA770T_UD3: // IT8720F - case Model.GA_MA770T_UD3P: // IT8720F - case Model.GA_MA78LM_S2H: // IT8718F + case Model.GA_MA770T_UD3P: // IT8720F case Model.GA_MA790X_UD3P: // IT8720F v.Add(new Voltage("CPU VCore", 0)); v.Add(new Voltage("DRAM", 1)); @@ -369,6 +368,21 @@ namespace OpenHardwareMonitor.Hardware.Mainboard { f.Add(new Fan("System Fan #2", 2)); f.Add(new Fan("Power Fan", 3)); break; + case Model.GA_MA78LM_S2H: // IT8718F + v.Add(new Voltage("CPU VCore", 0)); + v.Add(new Voltage("DRAM", 1)); + v.Add(new Voltage("+3.3V", 2)); + v.Add(new Voltage("+5V", 3, 6.8f, 10)); + v.Add(new Voltage("+12V", 4, 24.3f, 8.2f)); + v.Add(new Voltage("VBat", 8)); + t.Add(new Temperature("System", 0)); + t.Add(new Temperature("CPU", 1)); + t.Add(new Temperature("VRM", 2)); + f.Add(new Fan("CPU Fan", 0)); + f.Add(new Fan("System Fan #1", 1)); + f.Add(new Fan("System Fan #2", 2)); + f.Add(new Fan("Power Fan", 3)); + break; case Model.GA_MA785GM_US2H: // IT8718F case Model.GA_MA785GMT_UD2H: // IT8718F v.Add(new Voltage("CPU VCore", 0)); @@ -1005,32 +1019,68 @@ namespace OpenHardwareMonitor.Hardware.Mainboard { } break; case Chip.NCT6779D: - v.Add(new Voltage("CPU VCore", 0)); - v.Add(new Voltage("Voltage #2", 1, true)); - v.Add(new Voltage("AVCC", 2, 34, 34)); - v.Add(new Voltage("3VCC", 3, 34, 34)); - v.Add(new Voltage("Voltage #5", 4, true)); - v.Add(new Voltage("Voltage #6", 5, true)); - v.Add(new Voltage("Voltage #7", 6, true)); - v.Add(new Voltage("3VSB", 7, 34, 34)); - v.Add(new Voltage("VBAT", 8, 34, 34)); - v.Add(new Voltage("VTT", 9)); - v.Add(new Voltage("Voltage #11", 10, true)); - v.Add(new Voltage("Voltage #12", 11, true)); - v.Add(new Voltage("Voltage #13", 12, true)); - 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)); - for (int i = 0; i < superIO.Fans.Length; i++) - f.Add(new Fan("Fan #" + (i + 1), i)); - for (int i = 0; i < superIO.Controls.Length; i++) - c.Add(new Ctrl("Fan Control #" + (i + 1), i)); + switch (manufacturer) { + case Manufacturer.ASUS: + switch (model) { + case Model.P8Z77_V: + v.Add(new Voltage("CPU VCore", 0)); + v.Add(new Voltage("Voltage #2", 1, true)); + v.Add(new Voltage("AVCC", 2, 34, 34)); + v.Add(new Voltage("3VCC", 3, 34, 34)); + v.Add(new Voltage("Voltage #5", 4, true)); + v.Add(new Voltage("Voltage #6", 5, true)); + v.Add(new Voltage("Voltage #7", 6, true)); + v.Add(new Voltage("3VSB", 7, 34, 34)); + v.Add(new Voltage("VBAT", 8, 34, 34)); + v.Add(new Voltage("VTT", 9)); + v.Add(new Voltage("Voltage #11", 10, true)); + v.Add(new Voltage("Voltage #12", 11, true)); + v.Add(new Voltage("Voltage #13", 12, true)); + 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("Auxiliary", 1)); + t.Add(new Temperature("Motherboard", 2)); + f.Add(new Fan("Chassis Fan #1", 0)); + f.Add(new Fan("CPU Fan", 1)); + f.Add(new Fan("Chassis Fan #2", 2)); + f.Add(new Fan("Chassis Fan #3", 3)); + c.Add(new Ctrl("Chassis Fan #1", 0)); + c.Add(new Ctrl("CPU Fan", 1)); + c.Add(new Ctrl("Chassis Fan #2", 2)); + c.Add(new Ctrl("Chassis Fan #3", 3)); + break; + } + break; + default: + v.Add(new Voltage("CPU VCore", 0)); + v.Add(new Voltage("Voltage #2", 1, true)); + v.Add(new Voltage("AVCC", 2, 34, 34)); + v.Add(new Voltage("3VCC", 3, 34, 34)); + v.Add(new Voltage("Voltage #5", 4, true)); + v.Add(new Voltage("Voltage #6", 5, true)); + v.Add(new Voltage("Voltage #7", 6, true)); + v.Add(new Voltage("3VSB", 7, 34, 34)); + v.Add(new Voltage("VBAT", 8, 34, 34)); + v.Add(new Voltage("VTT", 9)); + v.Add(new Voltage("Voltage #11", 10, true)); + v.Add(new Voltage("Voltage #12", 11, true)); + v.Add(new Voltage("Voltage #13", 12, true)); + 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)); + for (int i = 0; i < superIO.Fans.Length; i++) + f.Add(new Fan("Fan #" + (i + 1), i)); + for (int i = 0; i < superIO.Controls.Length; i++) + c.Add(new Ctrl("Fan Control #" + (i + 1), i)); + break; + } break; default: for (int i = 0; i < superIO.Voltages.Length; i++) diff --git a/Properties/AssemblyVersion.cs b/Properties/AssemblyVersion.cs index ecafe2a..cbdfbd3 100644 --- a/Properties/AssemblyVersion.cs +++ b/Properties/AssemblyVersion.cs @@ -10,5 +10,5 @@ using System.Reflection; -[assembly: AssemblyVersion("0.4.0.13")] -[assembly: AssemblyInformationalVersion("0.4.0.13 Alpha")] \ No newline at end of file +[assembly: AssemblyVersion("0.4.0.14")] +[assembly: AssemblyInformationalVersion("0.4.0.14 Alpha")] \ No newline at end of file