JMR-dev/ReLibreHardwareMonitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fixed Issue 69.

Browse Source
This commit is contained in:
Michael Möller
2010-06-06 11:07:57 +00:00
parent c641a6a2fc
commit dd67a0aa5c
12 changed files with 27 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Hardware/ATI/ATIGPU.cs
+1 -2
View File
@@ -69,8 +69,7 @@ namespace OpenHardwareMonitor.Hardware.ATI {
this.temperature =
new Sensor("GPU Core", 0, SensorType.Temperature, this);
this.fan = new Sensor("GPU", 0, speedInfo.MaxRPM, SensorType.Fan, this,
null);
this.fan = new Sensor("GPU", 0, SensorType.Fan, this, null);
this.coreClock = new Sensor("GPU Core", 0, SensorType.Clock, this);
this.memoryClock = new Sensor("GPU Memory", 1, SensorType.Clock, this);
this.coreVoltage = new Sensor("GPU Core", 0, SensorType.Voltage, this);
Hardware/CPU/AMD0FCPU.cs
+1 -1
View File
@@ -88,7 +88,7 @@ namespace OpenHardwareMonitor.Hardware.CPU {
coreTemperatures = new Sensor[coreCount];
for (int i = 0; i < coreCount; i++) {
coreTemperatures[i] =
new Sensor("Core #" + (i + 1), i, null, SensorType.Temperature,
new Sensor("Core #" + (i + 1), i, SensorType.Temperature,
this, new ParameterDescription[] {
new ParameterDescription("Offset [°C]",
"Temperature offset of the thermal sensor.\n" +
Hardware/CPU/AMD10CPU.cs
+1 -1
View File
@@ -85,7 +85,7 @@ namespace OpenHardwareMonitor.Hardware.CPU {
// AMD family 10h processors support only one temperature sensor
coreTemperature = new Sensor(
"Core" + (coreCount > 1 ? " #1 - #" + coreCount : ""), 0, null,
"Core" + (coreCount > 1 ? " #1 - #" + coreCount : ""), 0,
SensorType.Temperature, this, new ParameterDescription[] {
new ParameterDescription("Offset [°C]", "Temperature offset.", 0)
});
Hardware/CPU/IntelCPU.cs
+1 -1
View File
@@ -172,7 +172,7 @@ namespace OpenHardwareMonitor.Hardware.CPU {
{
coreTemperatures = new Sensor[coreCount];
for (int i = 0; i < coreTemperatures.Length; i++) {
coreTemperatures[i] = new Sensor(CoreString(i), i, tjMax[i],
coreTemperatures[i] = new Sensor(CoreString(i), i,
SensorType.Temperature, this, new ParameterDescription[] {
new ParameterDescription(
"TjMax [°C]", "TjMax temperature of the core.\n" +
Hardware/ISensor.cs
+1 -2
View File
@@ -72,8 +72,7 @@ namespace OpenHardwareMonitor.Hardware {
float? Value { get; }
float? Min { get; }
float? Max { get; }
float? Limit { get; set; }
float? Max { get; }
IEnumerable<ISensorEntry> Plot { get; }
}
Hardware/Mainboard/SuperIOHardware.cs
+3 -3
View File
@@ -431,7 +431,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
foreach (Voltage voltage in v)
if (voltage.Index < superIO.Voltages.Length) {
Sensor sensor = new Sensor(voltage.Name, voltage.Index,
voltage.Hidden, null, SensorType.Voltage, this,
voltage.Hidden, SensorType.Voltage, this,
new ParameterDescription[] {
new ParameterDescription("Ri [kΩ]", "Input resistance.\n" +
formula, voltage.Ri),
@@ -445,7 +445,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
foreach (Temperature temperature in t)
if (temperature.Index < superIO.Temperatures.Length) {
Sensor sensor = new Sensor(temperature.Name, temperature.Index, null,
Sensor sensor = new Sensor(temperature.Name, temperature.Index,
SensorType.Temperature, this, new ParameterDescription[] {
new ParameterDescription("Offset [°C]", "Temperature offset.", 0)
});
@@ -454,7 +454,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
foreach (Fan fan in f)
if (fan.Index < superIO.Fans.Length) {
Sensor sensor = new Sensor(fan.Name, fan.Index, null, SensorType.Fan,
Sensor sensor = new Sensor(fan.Name, fan.Index, SensorType.Fan,
this, null);
fans.Add(sensor);
}
Hardware/Nvidia/NvidiaGPU.cs
+2 -2
View File
@@ -74,8 +74,8 @@ namespace OpenHardwareMonitor.Hardware.Nvidia {
case NvThermalTarget.UNKNOWN: name = "GPU Unknown"; break;
default: name = "GPU"; break;
}
temperatures[i] = new Sensor(name, i, sensor.DefaultMaxTemp,
SensorType.Temperature, this, new ParameterDescription[0]);
temperatures[i] = new Sensor(name, i, SensorType.Temperature, this,
new ParameterDescription[0]);
ActivateSensor(temperatures[i]);
}
Hardware/Sensor.cs
+4 -30
View File
@@ -53,8 +53,6 @@ namespace OpenHardwareMonitor.Hardware {
private float? value;
private float? min;
private float? max;
private float? limit;
private float? defaultLimit;
private Queue<ISensorEntry> entries =
new Queue<ISensorEntry>(MAX_MINUTES * 15);
@@ -64,22 +62,21 @@ namespace OpenHardwareMonitor.Hardware {
private const int MAX_MINUTES = 120;
public Sensor(string name, int index, SensorType sensorType,
IHardware hardware) : this(name, index, null, sensorType, hardware,
IHardware hardware) : this(name, index, sensorType, hardware,
null) { }
public Sensor(string name, int index, float? limit, SensorType sensorType,
public Sensor(string name, int index, SensorType sensorType,
IHardware hardware, ParameterDescription[] parameterDescriptions) :
this(name, index, false, limit, sensorType, hardware,
this(name, index, false, sensorType, hardware,
parameterDescriptions) { }
public Sensor(string name, int index, bool defaultHidden,
float? limit, SensorType sensorType, IHardware hardware,
SensorType sensorType, IHardware hardware,
ParameterDescription[] parameterDescriptions)
{
this.defaultName = name;
this.index = index;
this.defaultHidden = defaultHidden;
this.defaultLimit = limit;
this.sensorType = sensorType;
this.hardware = hardware;
Parameter[] parameters = new Parameter[parameterDescriptions == null ?
@@ -94,12 +91,6 @@ namespace OpenHardwareMonitor.Hardware {
this.name = configName;
else
this.name = name;
string configLimit = Config.Settings[
new Identifier(Identifier, "limit").ToString()];
if (configLimit != null && configLimit != "")
this.limit = float.Parse(configLimit);
else
this.limit = limit;
}
public IHardware Hardware {
@@ -172,23 +163,6 @@ namespace OpenHardwareMonitor.Hardware {
public float? Min { get { return min; } }
public float? Max { get { return max; } }
public float? Limit {
get {
return limit;
}
set {
if (value.HasValue) {
limit = value;
Config.Settings[new Identifier(Identifier, "limit").ToString()] =
limit.ToString();
} else {
limit = defaultLimit;
Config.Settings[new Identifier(Identifier, "limit").ToString()] = "";
}
}
}
public IEnumerable<ISensorEntry> Plot {
get { return entries; }
}
Hardware/TBalancer/TBalancer.cs
+8 -8
View File
@@ -78,34 +78,34 @@ namespace OpenHardwareMonitor.Hardware.TBalancer {
int offset = 0;
for (int i = 0; i < digitalTemperatures.Length; i++)
digitalTemperatures[i] = new Sensor("Digital Sensor " + i,
offset + i, null, SensorType.Temperature, this, parameter);
offset + i, SensorType.Temperature, this, parameter);
offset += digitalTemperatures.Length;
for (int i = 0; i < analogTemperatures.Length; i++)
analogTemperatures[i] = new Sensor("Analog Sensor " + (i + 1),
offset + i, null, SensorType.Temperature, this, parameter);
offset + i, SensorType.Temperature, this, parameter);
offset += analogTemperatures.Length;
for (int i = 0; i < sensorhubTemperatures.Length; i++)
sensorhubTemperatures[i] = new Sensor("Sensorhub Sensor " + i,
offset + i, null, SensorType.Temperature, this, parameter);
offset + i, SensorType.Temperature, this, parameter);
offset += sensorhubTemperatures.Length;
for (int i = 0; i < miniNGTemperatures.Length; i++)
miniNGTemperatures[i] = new Sensor("miniNG #" + (i / 2 + 1) +
" Sensor " + (i % 2 + 1), offset + i, null, SensorType.Temperature,
" Sensor " + (i % 2 + 1), offset + i, SensorType.Temperature,
this, parameter);
offset += miniNGTemperatures.Length;
for (int i = 0; i < sensorhubFlows.Length; i++)
sensorhubFlows[i] = new Sensor("Flowmeter " + (i + 1),
i, null, SensorType.Flow, this, new ParameterDescription[] {
i, SensorType.Flow, this, new ParameterDescription[] {
new ParameterDescription("Impulse Rate",
"The impulse rate of the flowmeter in pulses/L", 509)
});
for (int i = 0; i < controls.Length; i++) {
controls[i] = new Sensor("Fan Channel " + i, i, null,
controls[i] = new Sensor("Fan Channel " + i, i,
SensorType.Control, this, null);
ActivateSensor(controls[i]);
}
@@ -159,7 +159,7 @@ namespace OpenHardwareMonitor.Hardware.TBalancer {
if (miniNGFans[number * 2 + i] == null)
miniNGFans[number * 2 + i] =
new Sensor("miniNG #" + (number + 1) + " Fan Channel " + (i + 1),
4 + number * 2 + i, maxRPM, SensorType.Fan, this, null);
4 + number * 2 + i, SensorType.Fan, this, null);
Sensor sensor = miniNGFans[number * 2 + i];
@@ -226,7 +226,7 @@ namespace OpenHardwareMonitor.Hardware.TBalancer {
float maxRPM = 11.5f * ((data[149 + 2 * i] << 8) | data[148 + 2 * i]);
if (fans[i] == null)
fans[i] = new Sensor("Fan Channel " + i, i, maxRPM, SensorType.Fan,
fans[i] = new Sensor("Fan Channel " + i, i, SensorType.Fan,
this, new ParameterDescription[] {
new ParameterDescription("MaxRPM",
"Maximum revolutions per minute (RPM) of the fan.", maxRPM)