From 8e8f3c080f2674702fe54bcdd614af0b41cfd403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=B6ller?= Date: Tue, 7 Sep 2010 17:52:43 +0000 Subject: [PATCH] Added a mainboard specific configuration for the ECS A890GXM-A. --- Hardware/Mainboard/Manufacturer.cs | 1 + Hardware/Mainboard/Model.cs | 4 ++ Hardware/Mainboard/SMBIOS.cs | 4 ++ Hardware/Mainboard/SuperIOHardware.cs | 66 +++++++++++++++++++++------ Properties/AssemblyVersion.cs | 4 +- 5 files changed, 63 insertions(+), 16 deletions(-) diff --git a/Hardware/Mainboard/Manufacturer.cs b/Hardware/Mainboard/Manufacturer.cs index c82d26f..cf91e01 100644 --- a/Hardware/Mainboard/Manufacturer.cs +++ b/Hardware/Mainboard/Manufacturer.cs @@ -42,6 +42,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard { ASUS, Dell, DFI, + ECS, EPoX, EVGA, FIC, diff --git a/Hardware/Mainboard/Model.cs b/Hardware/Mainboard/Model.cs index 9a69cfa..d390f2c 100644 --- a/Hardware/Mainboard/Model.cs +++ b/Hardware/Mainboard/Model.cs @@ -54,6 +54,10 @@ namespace OpenHardwareMonitor.Hardware.Mainboard { LP_BI_P45_T2RS_Elite, LP_DK_P55_T3eH9, + // ECS + + A890GXM_A, + // EVGA X58_SLI_Classified, diff --git a/Hardware/Mainboard/SMBIOS.cs b/Hardware/Mainboard/SMBIOS.cs index 2ba77a4..10b76bc 100644 --- a/Hardware/Mainboard/SMBIOS.cs +++ b/Hardware/Mainboard/SMBIOS.cs @@ -267,6 +267,8 @@ namespace OpenHardwareMonitor.Hardware.Mainboard { case "DFI": case "DFI Inc.": manufacturer = Manufacturer.DFI; break; + case "ECS": + manufacturer = Manufacturer.ECS; break; case "EPoX COMPUTER CO., LTD": manufacturer = Manufacturer.EPoX; break; case "EVGA": @@ -315,6 +317,8 @@ namespace OpenHardwareMonitor.Hardware.Mainboard { model = Model.LP_BI_P45_T2RS_Elite; break; case "LP DK P55-T3eH9": model = Model.LP_DK_P55_T3eH9; break; + case "A890GXM-A": + model = Model.A890GXM_A; break; case "X58 SLI Classified": model = Model.X58_SLI_Classified; break; case "965P-S3": diff --git a/Hardware/Mainboard/SuperIOHardware.cs b/Hardware/Mainboard/SuperIOHardware.cs index a42717e..b3a8d72 100644 --- a/Hardware/Mainboard/SuperIOHardware.cs +++ b/Hardware/Mainboard/SuperIOHardware.cs @@ -67,7 +67,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard { case Chip.IT8712F: case Chip.IT8716F: case Chip.IT8718F: - case Chip.IT8720F: + case Chip.IT8720F: case Chip.IT8726F: switch (manufacturer) { case Manufacturer.ASUS: @@ -323,19 +323,57 @@ namespace OpenHardwareMonitor.Hardware.Mainboard { break; case Chip.IT8721F: - v.Add(new Voltage("Voltage #1", 0, true)); - v.Add(new Voltage("Voltage #2", 1, true)); - v.Add(new Voltage("Voltage #3", 2, true)); - v.Add(new Voltage("Analog +3.3V", 3, 10, 10, 0, true)); - 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("Standby +3.3V", 7, 10, 10, 0, true)); - v.Add(new Voltage("VBat", 8, 10, 10, 0)); - for (int i = 0; i < superIO.Temperatures.Length; i++) - t.Add(new Temperature("Temperature #" + (i + 1), i)); - for (int i = 0; i < superIO.Fans.Length; i++) - f.Add(new Fan("Fan #" + (i + 1), i)); + switch (manufacturer) { + case Manufacturer.ECS: + switch (model) { + case Model.A890GXM_A: // IT8721F + v.Add(new Voltage("CPU VCore", 0)); + v.Add(new Voltage("VDIMM", 1)); + v.Add(new Voltage("NB Voltage", 2)); + v.Add(new Voltage("Analog +3.3V", 3, 10, 10, 0)); + // v.Add(new Voltage("VDIMM", 6, true)); + v.Add(new Voltage("Standby +3.3V", 7, 10, 10, 0)); + v.Add(new Voltage("VBat", 8, 10, 10, 0)); + t.Add(new Temperature("CPU", 0)); + t.Add(new Temperature("System", 1)); + t.Add(new Temperature("Northbridge", 2)); + f.Add(new Fan("CPU Fan", 0)); + f.Add(new Fan("System Fan", 1)); + f.Add(new Fan("Power Fan", 2)); + break; + default: + v.Add(new Voltage("Voltage #1", 0, true)); + v.Add(new Voltage("Voltage #2", 1, true)); + v.Add(new Voltage("Voltage #3", 2, true)); + v.Add(new Voltage("Analog +3.3V", 3, 10, 10, 0, true)); + 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("Standby +3.3V", 7, 10, 10, 0, true)); + v.Add(new Voltage("VBat", 8, 10, 10, 0)); + for (int i = 0; i < superIO.Temperatures.Length; i++) + t.Add(new Temperature("Temperature #" + (i + 1), i)); + for (int i = 0; i < superIO.Fans.Length; i++) + f.Add(new Fan("Fan #" + (i + 1), i)); + break; + } + break; + default: + v.Add(new Voltage("Voltage #1", 0, true)); + v.Add(new Voltage("Voltage #2", 1, true)); + v.Add(new Voltage("Voltage #3", 2, true)); + v.Add(new Voltage("Analog +3.3V", 3, 10, 10, 0, true)); + 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("Standby +3.3V", 7, 10, 10, 0, true)); + v.Add(new Voltage("VBat", 8, 10, 10, 0)); + for (int i = 0; i < superIO.Temperatures.Length; i++) + t.Add(new Temperature("Temperature #" + (i + 1), i)); + for (int i = 0; i < superIO.Fans.Length; i++) + f.Add(new Fan("Fan #" + (i + 1), i)); + break; + } break; case Chip.F71858: diff --git a/Properties/AssemblyVersion.cs b/Properties/AssemblyVersion.cs index 7501eb9..643d830 100644 --- a/Properties/AssemblyVersion.cs +++ b/Properties/AssemblyVersion.cs @@ -38,5 +38,5 @@ using System; using System.Reflection; -[assembly: AssemblyVersion("0.1.37.10")] -[assembly: AssemblyFileVersion("0.1.37.10")] +[assembly: AssemblyVersion("0.1.37.11")] +[assembly: AssemblyFileVersion("0.1.37.11")]