1.1 --- a/Hardware/Mainboard/Manufacturer.cs Sun Jul 11 15:52:50 2010 +0000
1.2 +++ b/Hardware/Mainboard/Manufacturer.cs Sun Jul 11 21:26:49 2010 +0000
1.3 @@ -38,6 +38,7 @@
1.4 namespace OpenHardwareMonitor.Hardware.Mainboard {
1.5
1.6 public enum Manufacturer {
1.7 + ASRock,
1.8 ASUS,
1.9 Dell,
1.10 DFI,
2.1 --- a/Hardware/Mainboard/Model.cs Sun Jul 11 15:52:50 2010 +0000
2.2 +++ b/Hardware/Mainboard/Model.cs Sun Jul 11 21:26:49 2010 +0000
2.3 @@ -38,6 +38,9 @@
2.4 namespace OpenHardwareMonitor.Hardware.Mainboard {
2.5
2.6 public enum Model {
2.7 + // ASRock
2.8 + _880GMH_USB3,
2.9 +
2.10 // ASUS
2.11 Crosshair_III_Formula,
2.12 M2N_SLI_DELUXE,
3.1 --- a/Hardware/Mainboard/SMBIOS.cs Sun Jul 11 15:52:50 2010 +0000
3.2 +++ b/Hardware/Mainboard/SMBIOS.cs Sun Jul 11 21:26:49 2010 +0000
3.3 @@ -253,6 +253,8 @@
3.4 this.manufacturerName = manufacturerName;
3.5
3.6 switch (manufacturerName) {
3.7 + case "ASRock":
3.8 + manufacturer = Manufacturer.ASRock; break;
3.9 case "ASUSTeK Computer INC.":
3.10 manufacturer = Manufacturer.ASUS; break;
3.11 case "Dell Inc.":
3.12 @@ -288,6 +290,8 @@
3.13 this.productName = productName;
3.14
3.15 switch (productName) {
3.16 + case "880GMH/USB3":
3.17 + model = Model._880GMH_USB3; break;
3.18 case "Crosshair III Formula":
3.19 model = Model.Crosshair_III_Formula; break;
3.20 case "M2N-SLI DELUXE":
4.1 --- a/Hardware/Mainboard/SuperIOHardware.cs Sun Jul 11 15:52:50 2010 +0000
4.2 +++ b/Hardware/Mainboard/SuperIOHardware.cs Sun Jul 11 21:26:49 2010 +0000
4.3 @@ -411,17 +411,53 @@
4.4 t.Add(new Temperature("CPU", 0));
4.5 t.Add(new Temperature("Auxiliary", 1));
4.6 t.Add(new Temperature("System", 2));
4.7 - f.Add(new Fan("System", 0));
4.8 - f.Add(new Fan("CPU", 1));
4.9 - f.Add(new Fan("Auxiliary", 2));
4.10 - f.Add(new Fan("CPU #2", 3));
4.11 - f.Add(new Fan("Auxiliary #2", 4));
4.12 + f.Add(new Fan("System Fan", 0));
4.13 + f.Add(new Fan("CPU Fan", 1));
4.14 + f.Add(new Fan("Auxiliary Fan", 2));
4.15 + f.Add(new Fan("CPU Fan #2", 3));
4.16 + f.Add(new Fan("Auxiliary Fan #2", 4));
4.17 break;
4.18 case Chip.W83627DHG:
4.19 case Chip.W83627DHGP:
4.20 case Chip.W83667HG:
4.21 case Chip.W83667HGB:
4.22 switch (manufacturer) {
4.23 + case Manufacturer.ASRock:
4.24 + switch (model) {
4.25 + case Model._880GMH_USB3:
4.26 + v.Add(new Voltage("CPU VCore", 0));
4.27 + v.Add(new Voltage("+3.3V", 3, 34, 34, 0));
4.28 + v.Add(new Voltage("+5V", 5, 15, 7.5f, 0));
4.29 + v.Add(new Voltage("+12V", 6, 56, 10, 0));
4.30 + v.Add(new Voltage("Standby +3.3V", 7, 34, 34, 0));
4.31 + v.Add(new Voltage("VBAT", 8, 34, 34, 0));
4.32 + t.Add(new Temperature("CPU", 0));
4.33 + t.Add(new Temperature("Motherboard", 2));
4.34 + f.Add(new Fan("Chassis Fan", 0));
4.35 + f.Add(new Fan("CPU Fan", 1));
4.36 + f.Add(new Fan("Power Fan", 2));
4.37 + break;
4.38 + default:
4.39 + v.Add(new Voltage("CPU VCore", 0));
4.40 + v.Add(new Voltage("Voltage #2", 1, true));
4.41 + v.Add(new Voltage("AVCC", 2, 34, 34, 0));
4.42 + v.Add(new Voltage("3VCC", 3, 34, 34, 0));
4.43 + v.Add(new Voltage("Voltage #5", 4, true));
4.44 + v.Add(new Voltage("Voltage #6", 5, true));
4.45 + v.Add(new Voltage("Voltage #7", 6, true));
4.46 + v.Add(new Voltage("3VSB", 7, 34, 34, 0));
4.47 + v.Add(new Voltage("VBAT", 8, 34, 34, 0));
4.48 + t.Add(new Temperature("CPU", 0));
4.49 + t.Add(new Temperature("Auxiliary", 1));
4.50 + t.Add(new Temperature("System", 2));
4.51 + f.Add(new Fan("System Fan", 0));
4.52 + f.Add(new Fan("CPU Fan", 1));
4.53 + f.Add(new Fan("Auxiliary Fan", 2));
4.54 + f.Add(new Fan("CPU Fan #2", 3));
4.55 + f.Add(new Fan("Auxiliary Fan #2", 4));
4.56 + break;
4.57 + }
4.58 + break;
4.59 case Manufacturer.ASUS:
4.60 switch (model) {
4.61 case Model.P6X58D_E:
4.62 @@ -429,16 +465,17 @@
4.63 v.Add(new Voltage("+12V", 1, 11.5f, 1.91f, 0));
4.64 v.Add(new Voltage("Analog +3.3V", 2, 34, 34, 0));
4.65 v.Add(new Voltage("+3.3V", 3, 34, 34, 0));
4.66 - v.Add(new Voltage("+5V", 4, 20, 10, 0));
4.67 + v.Add(new Voltage("+5V", 4, 15, 7.5f, 0));
4.68 v.Add(new Voltage("Voltage #6", 5, true));
4.69 v.Add(new Voltage("Voltage #7", 6, true));
4.70 v.Add(new Voltage("Standby +3.3V", 7, 34, 34, 0));
4.71 v.Add(new Voltage("VBAT", 8, 34, 34, 0));
4.72 t.Add(new Temperature("CPU", 0));
4.73 + t.Add(new Temperature("Auxiliary", 1, true));
4.74 t.Add(new Temperature("Motherboard", 2));
4.75 f.Add(new Fan("Chassis Fan #1", 0));
4.76 - f.Add(new Fan("CPU", 1));
4.77 - f.Add(new Fan("Power", 2));
4.78 + f.Add(new Fan("CPU Fan", 1));
4.79 + f.Add(new Fan("Power Fan", 2));
4.80 f.Add(new Fan("Chassis Fan #2", 3));
4.81 f.Add(new Fan("Chassis Fan #3", 4));
4.82 break;
4.83 @@ -455,11 +492,11 @@
4.84 t.Add(new Temperature("CPU", 0));
4.85 t.Add(new Temperature("Auxiliary", 1));
4.86 t.Add(new Temperature("System", 2));
4.87 - f.Add(new Fan("System", 0));
4.88 - f.Add(new Fan("CPU", 1));
4.89 - f.Add(new Fan("Auxiliary", 2));
4.90 - f.Add(new Fan("CPU #2", 3));
4.91 - f.Add(new Fan("Auxiliary #2", 4));
4.92 + f.Add(new Fan("System Fan", 0));
4.93 + f.Add(new Fan("CPU Fan", 1));
4.94 + f.Add(new Fan("Auxiliary Fan", 2));
4.95 + f.Add(new Fan("CPU Fan #2", 3));
4.96 + f.Add(new Fan("Auxiliary Fan #2", 4));
4.97 break;
4.98 }
4.99 break;
4.100 @@ -476,11 +513,11 @@
4.101 t.Add(new Temperature("CPU", 0));
4.102 t.Add(new Temperature("Auxiliary", 1));
4.103 t.Add(new Temperature("System", 2));
4.104 - f.Add(new Fan("System", 0));
4.105 - f.Add(new Fan("CPU", 1));
4.106 - f.Add(new Fan("Auxiliary", 2));
4.107 - f.Add(new Fan("CPU #2", 3));
4.108 - f.Add(new Fan("Auxiliary #2", 4));
4.109 + f.Add(new Fan("System Fan", 0));
4.110 + f.Add(new Fan("CPU Fan", 1));
4.111 + f.Add(new Fan("Auxiliary Fan", 2));
4.112 + f.Add(new Fan("CPU Fan #2", 3));
4.113 + f.Add(new Fan("Auxiliary Fan #2", 4));
4.114 break;
4.115 }
4.116 break;
4.117 @@ -497,9 +534,9 @@
4.118 t.Add(new Temperature("CPU", 0));
4.119 t.Add(new Temperature("Auxiliary", 1));
4.120 t.Add(new Temperature("System", 2));
4.121 - f.Add(new Fan("System", 0));
4.122 - f.Add(new Fan("CPU", 1));
4.123 - f.Add(new Fan("Auxiliary", 2));
4.124 + f.Add(new Fan("System Fan", 0));
4.125 + f.Add(new Fan("CPU Fan", 1));
4.126 + f.Add(new Fan("Auxiliary Fan", 2));
4.127 break;
4.128 default:
4.129 for (int i = 0; i < superIO.Voltages.Length; i++)
4.130 @@ -621,10 +658,15 @@
4.131 private class Temperature {
4.132 public readonly string Name;
4.133 public readonly int Index;
4.134 + public readonly bool Hidden;
4.135
4.136 - public Temperature(string name, int index) {
4.137 + public Temperature(string name, int index) :
4.138 + this(name, index, false) { }
4.139 +
4.140 + public Temperature(string name, int index, bool hidden) {
4.141 this.Name = name;
4.142 this.Index = index;
4.143 + this.Hidden = hidden;
4.144 }
4.145 }
4.146