Fixed Issue 12.

This commit is contained in:
Michael Möller
2010-03-08 20:05:51 +00:00
parent 051c74a72d
commit cdde3208aa
2 changed files with 8 additions and 9 deletions

View File

@@ -50,8 +50,7 @@ namespace OpenHardwareMonitor.Hardware.CPU {
private uint pciAddress; private uint pciAddress;
private Sensor[] coreTemperatures; private Sensor[] coreTemperatures;
private float offset;
private Sensor totalLoad; private Sensor totalLoad;
private Sensor[] coreLoads; private Sensor[] coreLoads;
@@ -79,7 +78,7 @@ namespace OpenHardwareMonitor.Hardware.CPU {
totalLoad = new Sensor("CPU Total", 0, SensorType.Load, this); totalLoad = new Sensor("CPU Total", 0, SensorType.Load, this);
offset = -49.0f; float offset = -49.0f;
// AM2+ 65nm +21 offset // AM2+ 65nm +21 offset
if (model >= 0x69 && model != 0xc1 && model != 0x6c && model != 0x7c) if (model >= 0x69 && model != 0xc1 && model != 0x6c && model != 0x7c)
@@ -89,13 +88,13 @@ namespace OpenHardwareMonitor.Hardware.CPU {
coreLoads = new Sensor[coreCount]; coreLoads = new Sensor[coreCount];
for (int i = 0; i < coreCount; i++) { for (int i = 0; i < coreCount; i++) {
coreTemperatures[i] = coreTemperatures[i] =
new Sensor("Core #" + (i + 1), i, SensorType.Temperature, this); new Sensor("Core #" + (i + 1), i, null, SensorType.Temperature, this,
coreLoads[i] = new Sensor("Core #" + (i + 1), i + 1, null, new ParameterDescription[] { new ParameterDescription("Offset",
SensorType.Load, this, new ParameterDescription[] {
new ParameterDescription("Offset",
"Temperature offset of the thermal sensor.\n" + "Temperature offset of the thermal sensor.\n" +
"Temperature = Value + Offset.", offset) "Temperature = Value + Offset.", offset)
}); });
coreLoads[i] = new Sensor("Core #" + (i + 1), i + 1,
SensorType.Load, this);
} }
cpuLoad = new CPULoad(coreCount, 1); cpuLoad = new CPULoad(coreCount, 1);

View File

@@ -69,5 +69,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.1.26.0")] [assembly: AssemblyVersion("0.1.26.1")]
[assembly: AssemblyFileVersion("0.1.26.0")] [assembly: AssemblyFileVersion("0.1.26.1")]