Added a sensor type Control (with unit percent) for (fan) PWM control sensors. Fixed Issue 2.

This commit is contained in:
Michael Möller
2010-05-15 14:16:00 +00:00
parent 604884777f
commit fa260097d4
8 changed files with 37 additions and 13 deletions
+1
View File
@@ -58,6 +58,7 @@ namespace OpenHardwareMonitor.GUI {
typeNodes.Add(new TypeNode(SensorType.Load));
typeNodes.Add(new TypeNode(SensorType.Fan));
typeNodes.Add(new TypeNode(SensorType.Flow));
typeNodes.Add(new TypeNode(SensorType.Control));
foreach (ISensor sensor in hardware.Sensors)
SensorAdded(sensor);
+1
View File
@@ -63,6 +63,7 @@ namespace OpenHardwareMonitor.GUI {
case SensorType.Temperature: format = "{0:F1} °C"; break;
case SensorType.Fan: format = "{0:F0} RPM"; break;
case SensorType.Flow: format = "{0:F0} L/h"; break;
case SensorType.Control: format = "{0:F1} %"; break;
}
bool hidden = Config.Get(new Identifier(sensor.Identifier,
+4 -1
View File
@@ -151,13 +151,15 @@ namespace OpenHardwareMonitor.GUI {
case SensorType.Clock:
return string.Format("{0:F11}", 1e-3f * sensor.Value);
case SensorType.Load:
return string.Format("{0:F0}", sensor.Value < 99 ? sensor.Value : 99);
return string.Format("{0:F0}", sensor.Value);
case SensorType.Temperature:
return string.Format("{0:F0}", sensor.Value);
case SensorType.Fan:
return string.Format("{0:F11}", 1e-3f * sensor.Value);
case SensorType.Flow:
return string.Format("{0:F11}", 1e-3f * sensor.Value);
case SensorType.Control:
return string.Format("{0:F0}", sensor.Value);
}
return "-";
}
@@ -235,6 +237,7 @@ namespace OpenHardwareMonitor.GUI {
case SensorType.Temperature: format = "\n{0}: {1:F1} °C"; break;
case SensorType.Fan: format = "\n{0}: {1:F0} RPM"; break;
case SensorType.Flow: format = "\n{0}: {1:F0} L/h"; break;
case SensorType.Control: format = "\n{0}: {1:F1} %"; break;
}
string formattedValue = string.Format(format, sensor.Name, sensor.Value);
string hardwareName = sensor.Hardware.Name;
+4
View File
@@ -72,6 +72,10 @@ namespace OpenHardwareMonitor.GUI {
this.Image = Utilities.EmbeddedResources.GetImage("flow.png");
this.Text = "Flows";
break;
case SensorType.Control:
this.Image = Utilities.EmbeddedResources.GetImage("control.png");
this.Text = "Controls";
break;
}
NodeAdded += new NodeEventHandler(TypeNode_NodeAdded);