1.1 --- a/Hardware/Mainboard/SuperIOHardware.cs Sun Jul 11 15:52:50 2010 +0000
1.2 +++ b/Hardware/Mainboard/SuperIOHardware.cs Sun Jul 11 21:26:49 2010 +0000
1.3 @@ -411,17 +411,53 @@
1.4 t.Add(new Temperature("CPU", 0));
1.5 t.Add(new Temperature("Auxiliary", 1));
1.6 t.Add(new Temperature("System", 2));
1.7 - f.Add(new Fan("System", 0));
1.8 - f.Add(new Fan("CPU", 1));
1.9 - f.Add(new Fan("Auxiliary", 2));
1.10 - f.Add(new Fan("CPU #2", 3));
1.11 - f.Add(new Fan("Auxiliary #2", 4));
1.12 + f.Add(new Fan("System Fan", 0));
1.13 + f.Add(new Fan("CPU Fan", 1));
1.14 + f.Add(new Fan("Auxiliary Fan", 2));
1.15 + f.Add(new Fan("CPU Fan #2", 3));
1.16 + f.Add(new Fan("Auxiliary Fan #2", 4));
1.17 break;
1.18 case Chip.W83627DHG:
1.19 case Chip.W83627DHGP:
1.20 case Chip.W83667HG:
1.21 case Chip.W83667HGB:
1.22 switch (manufacturer) {
1.23 + case Manufacturer.ASRock:
1.24 + switch (model) {
1.25 + case Model._880GMH_USB3:
1.26 + v.Add(new Voltage("CPU VCore", 0));
1.27 + v.Add(new Voltage("+3.3V", 3, 34, 34, 0));
1.28 + v.Add(new Voltage("+5V", 5, 15, 7.5f, 0));
1.29 + v.Add(new Voltage("+12V", 6, 56, 10, 0));
1.30 + v.Add(new Voltage("Standby +3.3V", 7, 34, 34, 0));
1.31 + v.Add(new Voltage("VBAT", 8, 34, 34, 0));
1.32 + t.Add(new Temperature("CPU", 0));
1.33 + t.Add(new Temperature("Motherboard", 2));
1.34 + f.Add(new Fan("Chassis Fan", 0));
1.35 + f.Add(new Fan("CPU Fan", 1));
1.36 + f.Add(new Fan("Power Fan", 2));
1.37 + break;
1.38 + default:
1.39 + v.Add(new Voltage("CPU VCore", 0));
1.40 + v.Add(new Voltage("Voltage #2", 1, true));
1.41 + v.Add(new Voltage("AVCC", 2, 34, 34, 0));
1.42 + v.Add(new Voltage("3VCC", 3, 34, 34, 0));
1.43 + v.Add(new Voltage("Voltage #5", 4, true));
1.44 + v.Add(new Voltage("Voltage #6", 5, true));
1.45 + v.Add(new Voltage("Voltage #7", 6, true));
1.46 + v.Add(new Voltage("3VSB", 7, 34, 34, 0));
1.47 + v.Add(new Voltage("VBAT", 8, 34, 34, 0));
1.48 + t.Add(new Temperature("CPU", 0));
1.49 + t.Add(new Temperature("Auxiliary", 1));
1.50 + t.Add(new Temperature("System", 2));
1.51 + f.Add(new Fan("System Fan", 0));
1.52 + f.Add(new Fan("CPU Fan", 1));
1.53 + f.Add(new Fan("Auxiliary Fan", 2));
1.54 + f.Add(new Fan("CPU Fan #2", 3));
1.55 + f.Add(new Fan("Auxiliary Fan #2", 4));
1.56 + break;
1.57 + }
1.58 + break;
1.59 case Manufacturer.ASUS:
1.60 switch (model) {
1.61 case Model.P6X58D_E:
1.62 @@ -429,16 +465,17 @@
1.63 v.Add(new Voltage("+12V", 1, 11.5f, 1.91f, 0));
1.64 v.Add(new Voltage("Analog +3.3V", 2, 34, 34, 0));
1.65 v.Add(new Voltage("+3.3V", 3, 34, 34, 0));
1.66 - v.Add(new Voltage("+5V", 4, 20, 10, 0));
1.67 + v.Add(new Voltage("+5V", 4, 15, 7.5f, 0));
1.68 v.Add(new Voltage("Voltage #6", 5, true));
1.69 v.Add(new Voltage("Voltage #7", 6, true));
1.70 v.Add(new Voltage("Standby +3.3V", 7, 34, 34, 0));
1.71 v.Add(new Voltage("VBAT", 8, 34, 34, 0));
1.72 t.Add(new Temperature("CPU", 0));
1.73 + t.Add(new Temperature("Auxiliary", 1, true));
1.74 t.Add(new Temperature("Motherboard", 2));
1.75 f.Add(new Fan("Chassis Fan #1", 0));
1.76 - f.Add(new Fan("CPU", 1));
1.77 - f.Add(new Fan("Power", 2));
1.78 + f.Add(new Fan("CPU Fan", 1));
1.79 + f.Add(new Fan("Power Fan", 2));
1.80 f.Add(new Fan("Chassis Fan #2", 3));
1.81 f.Add(new Fan("Chassis Fan #3", 4));
1.82 break;
1.83 @@ -455,11 +492,11 @@
1.84 t.Add(new Temperature("CPU", 0));
1.85 t.Add(new Temperature("Auxiliary", 1));
1.86 t.Add(new Temperature("System", 2));
1.87 - f.Add(new Fan("System", 0));
1.88 - f.Add(new Fan("CPU", 1));
1.89 - f.Add(new Fan("Auxiliary", 2));
1.90 - f.Add(new Fan("CPU #2", 3));
1.91 - f.Add(new Fan("Auxiliary #2", 4));
1.92 + f.Add(new Fan("System Fan", 0));
1.93 + f.Add(new Fan("CPU Fan", 1));
1.94 + f.Add(new Fan("Auxiliary Fan", 2));
1.95 + f.Add(new Fan("CPU Fan #2", 3));
1.96 + f.Add(new Fan("Auxiliary Fan #2", 4));
1.97 break;
1.98 }
1.99 break;
1.100 @@ -476,11 +513,11 @@
1.101 t.Add(new Temperature("CPU", 0));
1.102 t.Add(new Temperature("Auxiliary", 1));
1.103 t.Add(new Temperature("System", 2));
1.104 - f.Add(new Fan("System", 0));
1.105 - f.Add(new Fan("CPU", 1));
1.106 - f.Add(new Fan("Auxiliary", 2));
1.107 - f.Add(new Fan("CPU #2", 3));
1.108 - f.Add(new Fan("Auxiliary #2", 4));
1.109 + f.Add(new Fan("System Fan", 0));
1.110 + f.Add(new Fan("CPU Fan", 1));
1.111 + f.Add(new Fan("Auxiliary Fan", 2));
1.112 + f.Add(new Fan("CPU Fan #2", 3));
1.113 + f.Add(new Fan("Auxiliary Fan #2", 4));
1.114 break;
1.115 }
1.116 break;
1.117 @@ -497,9 +534,9 @@
1.118 t.Add(new Temperature("CPU", 0));
1.119 t.Add(new Temperature("Auxiliary", 1));
1.120 t.Add(new Temperature("System", 2));
1.121 - f.Add(new Fan("System", 0));
1.122 - f.Add(new Fan("CPU", 1));
1.123 - f.Add(new Fan("Auxiliary", 2));
1.124 + f.Add(new Fan("System Fan", 0));
1.125 + f.Add(new Fan("CPU Fan", 1));
1.126 + f.Add(new Fan("Auxiliary Fan", 2));
1.127 break;
1.128 default:
1.129 for (int i = 0; i < superIO.Voltages.Length; i++)
1.130 @@ -621,10 +658,15 @@
1.131 private class Temperature {
1.132 public readonly string Name;
1.133 public readonly int Index;
1.134 + public readonly bool Hidden;
1.135
1.136 - public Temperature(string name, int index) {
1.137 + public Temperature(string name, int index) :
1.138 + this(name, index, false) { }
1.139 +
1.140 + public Temperature(string name, int index, bool hidden) {
1.141 this.Name = name;
1.142 this.Index = index;
1.143 + this.Hidden = hidden;
1.144 }
1.145 }
1.146