1.1 --- a/Hardware/Mainboard/SuperIOHardware.cs Tue Sep 21 10:33:28 2010 +0000
1.2 +++ b/Hardware/Mainboard/SuperIOHardware.cs Tue Sep 21 20:32:36 2010 +0000
1.3 @@ -42,13 +42,13 @@
1.4 namespace OpenHardwareMonitor.Hardware.Mainboard {
1.5 internal class SuperIOHardware : Hardware {
1.6
1.7 - private Mainboard mainboard;
1.8 - private ISuperIO superIO;
1.9 - private string name;
1.10 + private readonly Mainboard mainboard;
1.11 + private readonly ISuperIO superIO;
1.12 + private readonly string name;
1.13
1.14 - private List<Sensor> voltages = new List<Sensor>();
1.15 - private List<Sensor> temperatures = new List<Sensor>();
1.16 - private List<Sensor> fans = new List<Sensor>();
1.17 + private readonly List<Sensor> voltages = new List<Sensor>();
1.18 + private readonly List<Sensor> temperatures = new List<Sensor>();
1.19 + private readonly List<Sensor> fans = new List<Sensor>();
1.20
1.21
1.22 public SuperIOHardware(Mainboard mainboard, ISuperIO superIO,
1.23 @@ -80,9 +80,9 @@
1.24 case Model.M2N_SLI_DELUXE:
1.25 v.Add(new Voltage("CPU VCore", 0));
1.26 v.Add(new Voltage("+3.3V", 1));
1.27 - v.Add(new Voltage("+5V", 3, 6.8f, 10, 0));
1.28 - v.Add(new Voltage("+12V", 4, 30, 10, 0));
1.29 - v.Add(new Voltage("+5VSB", 7, 6.8f, 10, 0));
1.30 + v.Add(new Voltage("+5V", 3, 6.8f, 10));
1.31 + v.Add(new Voltage("+12V", 4, 30, 10));
1.32 + v.Add(new Voltage("+5VSB", 7, 6.8f, 10));
1.33 v.Add(new Voltage("VBat", 8));
1.34 t.Add(new Temperature("CPU", 0));
1.35 t.Add(new Temperature("Motherboard", 1));
1.36 @@ -91,7 +91,7 @@
1.37 f.Add(new Fan("Power Fan", 2));
1.38 break;
1.39 case Model.M4A79XTD_EVO: // IT8720F
1.40 - v.Add(new Voltage("+5V", 3, 6.8f, 10, 0));
1.41 + v.Add(new Voltage("+5V", 3, 6.8f, 10));
1.42 v.Add(new Voltage("VBat", 8));
1.43 t.Add(new Temperature("CPU", 0));
1.44 t.Add(new Temperature("Motherboard", 1));
1.45 @@ -122,11 +122,11 @@
1.46 v.Add(new Voltage("CPU VCore", 0));
1.47 v.Add(new Voltage("FSB VTT", 1));
1.48 v.Add(new Voltage("+3.3V", 2));
1.49 - v.Add(new Voltage("+5V", 3, 6.8f, 10, 0));
1.50 - v.Add(new Voltage("+12V", 4, 30, 10, 0));
1.51 + v.Add(new Voltage("+5V", 3, 6.8f, 10));
1.52 + v.Add(new Voltage("+12V", 4, 30, 10));
1.53 v.Add(new Voltage("NB Core", 5));
1.54 v.Add(new Voltage("VDIMM", 6));
1.55 - v.Add(new Voltage("+5VSB", 7, 6.8f, 10, 0));
1.56 + v.Add(new Voltage("+5VSB", 7, 6.8f, 10));
1.57 v.Add(new Voltage("VBat", 8));
1.58 t.Add(new Temperature("CPU", 0));
1.59 t.Add(new Temperature("System", 1));
1.60 @@ -139,11 +139,11 @@
1.61 v.Add(new Voltage("CPU VCore", 0));
1.62 v.Add(new Voltage("VTT", 1));
1.63 v.Add(new Voltage("+3.3V", 2));
1.64 - v.Add(new Voltage("+5V", 3, 6.8f, 10, 0));
1.65 - v.Add(new Voltage("+12V", 4, 30, 10, 0));
1.66 + v.Add(new Voltage("+5V", 3, 6.8f, 10));
1.67 + v.Add(new Voltage("+12V", 4, 30, 10));
1.68 v.Add(new Voltage("CPU PLL", 5));
1.69 v.Add(new Voltage("DRAM", 6));
1.70 - v.Add(new Voltage("+5VSB", 7, 6.8f, 10, 0));
1.71 + v.Add(new Voltage("+5VSB", 7, 6.8f, 10));
1.72 v.Add(new Voltage("VBat", 8));
1.73 t.Add(new Temperature("Chipset", 0));
1.74 t.Add(new Temperature("CPU PWM", 1));
1.75 @@ -176,8 +176,8 @@
1.76 v.Add(new Voltage("CPU VCore", 0));
1.77 v.Add(new Voltage("DRAM", 1));
1.78 v.Add(new Voltage("+3.3V", 2));
1.79 - v.Add(new Voltage("+5V", 3, 6.8f, 10, 0));
1.80 - v.Add(new Voltage("+12V", 7, 27, 9.1f, 0));
1.81 + v.Add(new Voltage("+5V", 3, 6.8f, 10));
1.82 + v.Add(new Voltage("+12V", 7, 27, 9.1f));
1.83 v.Add(new Voltage("VBat", 8));
1.84 t.Add(new Temperature("System", 0));
1.85 t.Add(new Temperature("CPU", 1));
1.86 @@ -190,8 +190,8 @@
1.87 v.Add(new Voltage("CPU VCore", 0));
1.88 v.Add(new Voltage("DRAM", 1));
1.89 v.Add(new Voltage("+3.3V", 2));
1.90 - v.Add(new Voltage("+5V", 3, 6.8f, 10, 0));
1.91 - v.Add(new Voltage("+12V", 7, 27, 9.1f, 0));
1.92 + v.Add(new Voltage("+5V", 3, 6.8f, 10));
1.93 + v.Add(new Voltage("+12V", 7, 27, 9.1f));
1.94 v.Add(new Voltage("VBat", 8));
1.95 t.Add(new Temperature("System", 0));
1.96 t.Add(new Temperature("CPU", 1));
1.97 @@ -203,7 +203,7 @@
1.98 case Model.EX58_EXTREME: // IT8720F
1.99 v.Add(new Voltage("CPU VCore", 0));
1.100 v.Add(new Voltage("DRAM", 1));
1.101 - v.Add(new Voltage("+5V", 3, 6.8f, 10, 0));
1.102 + v.Add(new Voltage("+5V", 3, 6.8f, 10));
1.103 v.Add(new Voltage("VBat", 8));
1.104 t.Add(new Temperature("System", 0));
1.105 t.Add(new Temperature("CPU", 1));
1.106 @@ -218,8 +218,8 @@
1.107 v.Add(new Voltage("CPU VCore", 0));
1.108 v.Add(new Voltage("DRAM", 1));
1.109 v.Add(new Voltage("+3.3V", 2));
1.110 - v.Add(new Voltage("+5V", 3, 6.8f, 10, 0));
1.111 - v.Add(new Voltage("+12V", 7, 27, 9.1f, 0));
1.112 + v.Add(new Voltage("+5V", 3, 6.8f, 10));
1.113 + v.Add(new Voltage("+12V", 7, 27, 9.1f));
1.114 v.Add(new Voltage("VBat", 8));
1.115 t.Add(new Temperature("System", 0));
1.116 t.Add(new Temperature("CPU", 1));
1.117 @@ -233,8 +233,8 @@
1.118 v.Add(new Voltage("CPU VCore", 0));
1.119 v.Add(new Voltage("DRAM", 1));
1.120 v.Add(new Voltage("+3.3V", 2));
1.121 - v.Add(new Voltage("+5V", 3, 6.8f, 10, 0));
1.122 - v.Add(new Voltage("+12V", 5, 27, 9.1f, 0));
1.123 + v.Add(new Voltage("+5V", 3, 6.8f, 10));
1.124 + v.Add(new Voltage("+12V", 5, 27, 9.1f));
1.125 v.Add(new Voltage("VBat", 8));
1.126 t.Add(new Temperature("System", 0));
1.127 t.Add(new Temperature("CPU", 2));
1.128 @@ -247,8 +247,8 @@
1.129 v.Add(new Voltage("CPU VCore", 0));
1.130 v.Add(new Voltage("DRAM", 1));
1.131 v.Add(new Voltage("+3.3V", 2));
1.132 - v.Add(new Voltage("+5V", 3, 6.8f, 10, 0));
1.133 - v.Add(new Voltage("+12V", 4, 27, 9.1f, 0));
1.134 + v.Add(new Voltage("+5V", 3, 6.8f, 10));
1.135 + v.Add(new Voltage("+12V", 4, 27, 9.1f));
1.136 v.Add(new Voltage("VBat", 8));
1.137 t.Add(new Temperature("System", 0));
1.138 t.Add(new Temperature("CPU", 1));
1.139 @@ -261,8 +261,8 @@
1.140 v.Add(new Voltage("CPU VCore", 0));
1.141 v.Add(new Voltage("DRAM", 1));
1.142 v.Add(new Voltage("+3.3V", 2));
1.143 - v.Add(new Voltage("+5V", 3, 6.8f, 10, 0));
1.144 - v.Add(new Voltage("+12V", 4, 27, 9.1f, 0));
1.145 + v.Add(new Voltage("+5V", 3, 6.8f, 10));
1.146 + v.Add(new Voltage("+12V", 4, 27, 9.1f));
1.147 v.Add(new Voltage("VBat", 8));
1.148 t.Add(new Temperature("System", 0));
1.149 t.Add(new Temperature("CPU", 1));
1.150 @@ -274,8 +274,8 @@
1.151 v.Add(new Voltage("CPU VCore", 0));
1.152 v.Add(new Voltage("DRAM", 1));
1.153 v.Add(new Voltage("+3.3V", 2));
1.154 - v.Add(new Voltage("+5V", 3, 6.8f, 10, 0));
1.155 - v.Add(new Voltage("+12V", 5, 27, 9.1f, 0));
1.156 + v.Add(new Voltage("+5V", 3, 6.8f, 10));
1.157 + v.Add(new Voltage("+12V", 5, 27, 9.1f));
1.158 v.Add(new Voltage("VBat", 8));
1.159 t.Add(new Temperature("System", 0));
1.160 t.Add(new Temperature("CPU", 1));
1.161 @@ -329,10 +329,10 @@
1.162 v.Add(new Voltage("CPU VCore", 0));
1.163 v.Add(new Voltage("VDIMM", 1));
1.164 v.Add(new Voltage("NB Voltage", 2));
1.165 - v.Add(new Voltage("Analog +3.3V", 3, 10, 10, 0));
1.166 + v.Add(new Voltage("Analog +3.3V", 3, 10, 10));
1.167 // v.Add(new Voltage("VDIMM", 6, true));
1.168 - v.Add(new Voltage("Standby +3.3V", 7, 10, 10, 0));
1.169 - v.Add(new Voltage("VBat", 8, 10, 10, 0));
1.170 + v.Add(new Voltage("Standby +3.3V", 7, 10, 10));
1.171 + v.Add(new Voltage("VBat", 8, 10, 10));
1.172 t.Add(new Temperature("CPU", 0));
1.173 t.Add(new Temperature("System", 1));
1.174 t.Add(new Temperature("Northbridge", 2));
1.175 @@ -349,7 +349,7 @@
1.176 v.Add(new Voltage("Voltage #6", 5, true));
1.177 v.Add(new Voltage("Voltage #7", 6, true));
1.178 v.Add(new Voltage("Standby +3.3V", 7, 10, 10, 0, true));
1.179 - v.Add(new Voltage("VBat", 8, 10, 10, 0));
1.180 + v.Add(new Voltage("VBat", 8, 10, 10));
1.181 for (int i = 0; i < superIO.Temperatures.Length; i++)
1.182 t.Add(new Temperature("Temperature #" + (i + 1), i));
1.183 for (int i = 0; i < superIO.Fans.Length; i++)
1.184 @@ -366,7 +366,7 @@
1.185 v.Add(new Voltage("Voltage #6", 5, true));
1.186 v.Add(new Voltage("Voltage #7", 6, true));
1.187 v.Add(new Voltage("Standby +3.3V", 7, 10, 10, 0, true));
1.188 - v.Add(new Voltage("VBat", 8, 10, 10, 0));
1.189 + v.Add(new Voltage("VBat", 8, 10, 10));
1.190 for (int i = 0; i < superIO.Temperatures.Length; i++)
1.191 t.Add(new Temperature("Temperature #" + (i + 1), i));
1.192 for (int i = 0; i < superIO.Fans.Length; i++)
1.193 @@ -376,9 +376,9 @@
1.194 break;
1.195
1.196 case Chip.F71858:
1.197 - v.Add(new Voltage("VCC3V", 0, 150, 150, 0));
1.198 - v.Add(new Voltage("VSB3V", 1, 150, 150, 0));
1.199 - v.Add(new Voltage("Battery", 2, 150, 150, 0));
1.200 + v.Add(new Voltage("VCC3V", 0, 150, 150));
1.201 + v.Add(new Voltage("VSB3V", 1, 150, 150));
1.202 + v.Add(new Voltage("Battery", 2, 150, 150));
1.203 for (int i = 0; i < superIO.Temperatures.Length; i++)
1.204 t.Add(new Temperature("Temperature #" + (i + 1), i));
1.205 for (int i = 0; i < superIO.Fans.Length; i++)
1.206 @@ -393,15 +393,15 @@
1.207 case Manufacturer.EVGA:
1.208 switch (model) {
1.209 case Model.X58_SLI_Classified: // F71882
1.210 - v.Add(new Voltage("VCC3V", 0, 150, 150, 0));
1.211 - v.Add(new Voltage("CPU VCore", 1, 47, 100, 0));
1.212 - v.Add(new Voltage("DIMM", 2, 47, 100, 0));
1.213 - v.Add(new Voltage("CPU VTT", 3, 24, 100, 0));
1.214 - v.Add(new Voltage("IOH Vcore", 4, 24, 100, 0));
1.215 - v.Add(new Voltage("+5V", 5, 51, 12, 0));
1.216 - v.Add(new Voltage("+12V", 6, 56, 6.8f, 0));
1.217 - v.Add(new Voltage("3VSB", 7, 150, 150, 0));
1.218 - v.Add(new Voltage("VBat", 8, 150, 150, 0));
1.219 + v.Add(new Voltage("VCC3V", 0, 150, 150));
1.220 + v.Add(new Voltage("CPU VCore", 1, 47, 100));
1.221 + v.Add(new Voltage("DIMM", 2, 47, 100));
1.222 + v.Add(new Voltage("CPU VTT", 3, 24, 100));
1.223 + v.Add(new Voltage("IOH Vcore", 4, 24, 100));
1.224 + v.Add(new Voltage("+5V", 5, 51, 12));
1.225 + v.Add(new Voltage("+12V", 6, 56, 6.8f));
1.226 + v.Add(new Voltage("3VSB", 7, 150, 150));
1.227 + v.Add(new Voltage("VBat", 8, 150, 150));
1.228 t.Add(new Temperature("CPU", 0));
1.229 t.Add(new Temperature("VREG", 1));
1.230 t.Add(new Temperature("System", 2));
1.231 @@ -410,15 +410,15 @@
1.232 f.Add(new Fan("Chassis Fan", 2));
1.233 break;
1.234 default:
1.235 - v.Add(new Voltage("VCC3V", 0, 150, 150, 0));
1.236 + v.Add(new Voltage("VCC3V", 0, 150, 150));
1.237 v.Add(new Voltage("CPU VCore", 1));
1.238 v.Add(new Voltage("Voltage #3", 2, true));
1.239 v.Add(new Voltage("Voltage #4", 3, true));
1.240 v.Add(new Voltage("Voltage #5", 4, true));
1.241 v.Add(new Voltage("Voltage #6", 5, true));
1.242 v.Add(new Voltage("Voltage #7", 6, true));
1.243 - v.Add(new Voltage("VSB3V", 7, 150, 150, 0));
1.244 - v.Add(new Voltage("VBat", 8, 150, 150, 0));
1.245 + v.Add(new Voltage("VSB3V", 7, 150, 150));
1.246 + v.Add(new Voltage("VBat", 8, 150, 150));
1.247 for (int i = 0; i < superIO.Temperatures.Length; i++)
1.248 t.Add(new Temperature("Temperature #" + (i + 1), i));
1.249 for (int i = 0; i < superIO.Fans.Length; i++)
1.250 @@ -427,15 +427,15 @@
1.251 }
1.252 break;
1.253 default:
1.254 - v.Add(new Voltage("VCC3V", 0, 150, 150, 0));
1.255 + v.Add(new Voltage("VCC3V", 0, 150, 150));
1.256 v.Add(new Voltage("CPU VCore", 1));
1.257 v.Add(new Voltage("Voltage #3", 2, true));
1.258 v.Add(new Voltage("Voltage #4", 3, true));
1.259 v.Add(new Voltage("Voltage #5", 4, true));
1.260 v.Add(new Voltage("Voltage #6", 5, true));
1.261 v.Add(new Voltage("Voltage #7", 6, true));
1.262 - v.Add(new Voltage("VSB3V", 7, 150, 150, 0));
1.263 - v.Add(new Voltage("VBat", 8, 150, 150, 0));
1.264 + v.Add(new Voltage("VSB3V", 7, 150, 150));
1.265 + v.Add(new Voltage("VBat", 8, 150, 150));
1.266 for (int i = 0; i < superIO.Temperatures.Length; i++)
1.267 t.Add(new Temperature("Temperature #" + (i + 1), i));
1.268 for (int i = 0; i < superIO.Fans.Length; i++)
1.269 @@ -447,13 +447,13 @@
1.270 case Chip.W83627EHF:
1.271 v.Add(new Voltage("CPU VCore", 0));
1.272 v.Add(new Voltage("Voltage #2", 1, true));
1.273 - v.Add(new Voltage("AVCC", 2, 34, 34, 0));
1.274 - v.Add(new Voltage("3VCC", 3, 34, 34, 0));
1.275 + v.Add(new Voltage("AVCC", 2, 34, 34));
1.276 + v.Add(new Voltage("3VCC", 3, 34, 34));
1.277 v.Add(new Voltage("Voltage #5", 4, true));
1.278 v.Add(new Voltage("Voltage #6", 5, true));
1.279 v.Add(new Voltage("Voltage #7", 6, true));
1.280 - v.Add(new Voltage("3VSB", 7, 34, 34, 0));
1.281 - v.Add(new Voltage("VBAT", 8, 34, 34, 0));
1.282 + v.Add(new Voltage("3VSB", 7, 34, 34));
1.283 + v.Add(new Voltage("VBAT", 8, 34, 34));
1.284 v.Add(new Voltage("Voltage #10", 9, true));
1.285 t.Add(new Temperature("CPU", 0));
1.286 t.Add(new Temperature("Auxiliary", 1));
1.287 @@ -473,11 +473,11 @@
1.288 switch (model) {
1.289 case Model._880GMH_USB3: // W83627DHG-P
1.290 v.Add(new Voltage("CPU VCore", 0));
1.291 - v.Add(new Voltage("+3.3V", 3, 34, 34, 0));
1.292 - v.Add(new Voltage("+5V", 5, 15, 7.5f, 0));
1.293 - v.Add(new Voltage("+12V", 6, 56, 10, 0));
1.294 - v.Add(new Voltage("Standby +3.3V", 7, 34, 34, 0));
1.295 - v.Add(new Voltage("VBAT", 8, 34, 34, 0));
1.296 + v.Add(new Voltage("+3.3V", 3, 34, 34));
1.297 + v.Add(new Voltage("+5V", 5, 15, 7.5f));
1.298 + v.Add(new Voltage("+12V", 6, 56, 10));
1.299 + v.Add(new Voltage("Standby +3.3V", 7, 34, 34));
1.300 + v.Add(new Voltage("VBAT", 8, 34, 34));
1.301 t.Add(new Temperature("CPU", 0));
1.302 t.Add(new Temperature("Motherboard", 2));
1.303 f.Add(new Fan("Chassis Fan", 0));
1.304 @@ -487,13 +487,13 @@
1.305 default:
1.306 v.Add(new Voltage("CPU VCore", 0));
1.307 v.Add(new Voltage("Voltage #2", 1, true));
1.308 - v.Add(new Voltage("AVCC", 2, 34, 34, 0));
1.309 - v.Add(new Voltage("3VCC", 3, 34, 34, 0));
1.310 + v.Add(new Voltage("AVCC", 2, 34, 34));
1.311 + v.Add(new Voltage("3VCC", 3, 34, 34));
1.312 v.Add(new Voltage("Voltage #5", 4, true));
1.313 v.Add(new Voltage("Voltage #6", 5, true));
1.314 v.Add(new Voltage("Voltage #7", 6, true));
1.315 - v.Add(new Voltage("3VSB", 7, 34, 34, 0));
1.316 - v.Add(new Voltage("VBAT", 8, 34, 34, 0));
1.317 + v.Add(new Voltage("3VSB", 7, 34, 34));
1.318 + v.Add(new Voltage("VBAT", 8, 34, 34));
1.319 t.Add(new Temperature("CPU", 0));
1.320 t.Add(new Temperature("Auxiliary", 1));
1.321 t.Add(new Temperature("System", 2));
1.322 @@ -510,12 +510,12 @@
1.323 case Model.P6X58D_E: // W83667HG
1.324 case Model.Rampage_II_GENE: // W83667HG
1.325 v.Add(new Voltage("CPU VCore", 0));
1.326 - v.Add(new Voltage("+12V", 1, 11.5f, 1.91f, 0));
1.327 - v.Add(new Voltage("Analog +3.3V", 2, 34, 34, 0));
1.328 - v.Add(new Voltage("+3.3V", 3, 34, 34, 0));
1.329 - v.Add(new Voltage("+5V", 4, 15, 7.5f, 0));
1.330 - v.Add(new Voltage("Standby +3.3V", 7, 34, 34, 0));
1.331 - v.Add(new Voltage("VBAT", 8, 34, 34, 0));
1.332 + v.Add(new Voltage("+12V", 1, 11.5f, 1.91f));
1.333 + v.Add(new Voltage("Analog +3.3V", 2, 34, 34));
1.334 + v.Add(new Voltage("+3.3V", 3, 34, 34));
1.335 + v.Add(new Voltage("+5V", 4, 15, 7.5f));
1.336 + v.Add(new Voltage("Standby +3.3V", 7, 34, 34));
1.337 + v.Add(new Voltage("VBAT", 8, 34, 34));
1.338 t.Add(new Temperature("CPU", 0));
1.339 t.Add(new Temperature("Motherboard", 2));
1.340 f.Add(new Fan("Chassis Fan #1", 0));
1.341 @@ -526,12 +526,12 @@
1.342 break;
1.343 case Model.Rampage_Extreme: // W83667HG
1.344 v.Add(new Voltage("CPU VCore", 0));
1.345 - v.Add(new Voltage("+12V", 1, 12, 2, 0));
1.346 - v.Add(new Voltage("Analog +3.3V", 2, 34, 34, 0));
1.347 - v.Add(new Voltage("+3.3V", 3, 34, 34, 0));
1.348 - v.Add(new Voltage("+5V", 4, 15, 7.5f, 0));
1.349 - v.Add(new Voltage("Standby +3.3V", 7, 34, 34, 0));
1.350 - v.Add(new Voltage("VBAT", 8, 34, 34, 0));
1.351 + v.Add(new Voltage("+12V", 1, 12, 2));
1.352 + v.Add(new Voltage("Analog +3.3V", 2, 34, 34));
1.353 + v.Add(new Voltage("+3.3V", 3, 34, 34));
1.354 + v.Add(new Voltage("+5V", 4, 15, 7.5f));
1.355 + v.Add(new Voltage("Standby +3.3V", 7, 34, 34));
1.356 + v.Add(new Voltage("VBAT", 8, 34, 34));
1.357 t.Add(new Temperature("CPU", 0));
1.358 t.Add(new Temperature("Motherboard", 2));
1.359 f.Add(new Fan("Chassis Fan #1", 0));
1.360 @@ -543,13 +543,13 @@
1.361 default:
1.362 v.Add(new Voltage("CPU VCore", 0));
1.363 v.Add(new Voltage("Voltage #2", 1, true));
1.364 - v.Add(new Voltage("AVCC", 2, 34, 34, 0));
1.365 - v.Add(new Voltage("3VCC", 3, 34, 34, 0));
1.366 + v.Add(new Voltage("AVCC", 2, 34, 34));
1.367 + v.Add(new Voltage("3VCC", 3, 34, 34));
1.368 v.Add(new Voltage("Voltage #5", 4, true));
1.369 v.Add(new Voltage("Voltage #6", 5, true));
1.370 v.Add(new Voltage("Voltage #7", 6, true));
1.371 - v.Add(new Voltage("3VSB", 7, 34, 34, 0));
1.372 - v.Add(new Voltage("VBAT", 8, 34, 34, 0));
1.373 + v.Add(new Voltage("3VSB", 7, 34, 34));
1.374 + v.Add(new Voltage("VBAT", 8, 34, 34));
1.375 t.Add(new Temperature("CPU", 0));
1.376 t.Add(new Temperature("Auxiliary", 1));
1.377 t.Add(new Temperature("System", 2));
1.378 @@ -564,13 +564,13 @@
1.379 default:
1.380 v.Add(new Voltage("CPU VCore", 0));
1.381 v.Add(new Voltage("Voltage #2", 1, true));
1.382 - v.Add(new Voltage("AVCC", 2, 34, 34, 0));
1.383 - v.Add(new Voltage("3VCC", 3, 34, 34, 0));
1.384 + v.Add(new Voltage("AVCC", 2, 34, 34));
1.385 + v.Add(new Voltage("3VCC", 3, 34, 34));
1.386 v.Add(new Voltage("Voltage #5", 4, true));
1.387 v.Add(new Voltage("Voltage #6", 5, true));
1.388 v.Add(new Voltage("Voltage #7", 6, true));
1.389 - v.Add(new Voltage("3VSB", 7, 34, 34, 0));
1.390 - v.Add(new Voltage("VBAT", 8, 34, 34, 0));
1.391 + v.Add(new Voltage("3VSB", 7, 34, 34));
1.392 + v.Add(new Voltage("VBAT", 8, 34, 34));
1.393 t.Add(new Temperature("CPU", 0));
1.394 t.Add(new Temperature("Auxiliary", 1));
1.395 t.Add(new Temperature("System", 2));
1.396 @@ -588,9 +588,9 @@
1.397 v.Add(new Voltage("CPU VCore", 0));
1.398 v.Add(new Voltage("Voltage #2", 1, true));
1.399 v.Add(new Voltage("Voltage #3", 2, true));
1.400 - v.Add(new Voltage("AVCC", 3, 34, 51, 0));
1.401 + v.Add(new Voltage("AVCC", 3, 34, 51));
1.402 v.Add(new Voltage("Voltage #5", 4, true));
1.403 - v.Add(new Voltage("5VSB", 5, 34, 51, 0));
1.404 + v.Add(new Voltage("5VSB", 5, 34, 51));
1.405 v.Add(new Voltage("VBAT", 6));
1.406 t.Add(new Temperature("CPU", 0));
1.407 t.Add(new Temperature("Auxiliary", 1));
1.408 @@ -609,12 +609,11 @@
1.409 break;
1.410 }
1.411
1.412 - string formula = "Voltage = value + (value - Vf) * Ri / Rf.";
1.413 + const string formula = "Voltage = value + (value - Vf) * Ri / Rf.";
1.414 foreach (Voltage voltage in v)
1.415 if (voltage.Index < superIO.Voltages.Length) {
1.416 Sensor sensor = new Sensor(voltage.Name, voltage.Index,
1.417 - voltage.Hidden, SensorType.Voltage, this,
1.418 - new ParameterDescription[] {
1.419 + voltage.Hidden, SensorType.Voltage, this, new [] {
1.420 new ParameterDescription("Ri [kΩ]", "Input resistance.\n" +
1.421 formula, voltage.Ri),
1.422 new ParameterDescription("Rf [kΩ]", "Reference resistance.\n" +
1.423 @@ -628,7 +627,7 @@
1.424 foreach (Temperature temperature in t)
1.425 if (temperature.Index < superIO.Temperatures.Length) {
1.426 Sensor sensor = new Sensor(temperature.Name, temperature.Index,
1.427 - SensorType.Temperature, this, new ParameterDescription[] {
1.428 + SensorType.Temperature, this, new [] {
1.429 new ParameterDescription("Offset [°C]", "Temperature offset.", 0)
1.430 }, settings);
1.431 temperatures.Add(sensor);
1.432 @@ -703,17 +702,12 @@
1.433 public readonly float Vf;
1.434 public readonly bool Hidden;
1.435
1.436 - public Voltage(string name, int index) :
1.437 - this(name, index, 0, 1, 0, false) { }
1.438 -
1.439 public Voltage(string name, int index, bool hidden) :
1.440 this(name, index, 0, 1, 0, hidden) { }
1.441
1.442 - public Voltage(string name, int index, float ri, float rf, float vf) :
1.443 - this(name, index, ri, rf, vf, false) { }
1.444 -
1.445 - public Voltage(string name, int index, float ri, float rf, float vf,
1.446 - bool hidden) {
1.447 + public Voltage(string name, int index,
1.448 + float ri = 0, float rf = 1, float vf = 0, bool hidden = false)
1.449 + {
1.450 this.Name = name;
1.451 this.Index = index;
1.452 this.Ri = ri;