diff --git a/LibreHardwareMonitor/Resources/loudspeaker.png b/LibreHardwareMonitor/Resources/loudspeaker.png new file mode 100644 index 0000000..32c0fce Binary files /dev/null and b/LibreHardwareMonitor/Resources/loudspeaker.png differ diff --git a/LibreHardwareMonitor/UI/PlotPanel.cs b/LibreHardwareMonitor/UI/PlotPanel.cs index a96379c..eadfbb5 100644 --- a/LibreHardwareMonitor/UI/PlotPanel.cs +++ b/LibreHardwareMonitor/UI/PlotPanel.cs @@ -172,7 +172,8 @@ namespace LibreHardwareMonitor.UI { SensorType.Power, "W" }, { SensorType.Data, "GB" }, { SensorType.Frequency, "Hz" }, - { SensorType.Energy, "mWh" } + { SensorType.Energy, "mWh" }, + { SensorType.Noise, "dBA" } }; foreach (SensorType type in Enum.GetValues(typeof(SensorType))) diff --git a/LibreHardwareMonitor/UI/SensorGadget.cs b/LibreHardwareMonitor/UI/SensorGadget.cs index 9fb6f64..07f0872 100644 --- a/LibreHardwareMonitor/UI/SensorGadget.cs +++ b/LibreHardwareMonitor/UI/SensorGadget.cs @@ -646,6 +646,9 @@ namespace LibreHardwareMonitor.UI case SensorType.Energy: format = "{0:F0} mWh"; break; + case SensorType.Noise: + format = "{0:F0} dBA"; + break; } if (sensor.SensorType == SensorType.Temperature && _unitManager.TemperatureUnit == TemperatureUnit.Fahrenheit) diff --git a/LibreHardwareMonitor/UI/SensorNode.cs b/LibreHardwareMonitor/UI/SensorNode.cs index 2016130..918002b 100644 --- a/LibreHardwareMonitor/UI/SensorNode.cs +++ b/LibreHardwareMonitor/UI/SensorNode.cs @@ -79,6 +79,9 @@ namespace LibreHardwareMonitor.UI case SensorType.Energy: Format = "{0:F0} mWh"; break; + case SensorType.Noise: + Format = "{0:F0} dBA"; + break; } bool hidden = settings.GetValue(new Identifier(sensor.Identifier, "hidden").ToString(), sensor.IsDefaultHidden); diff --git a/LibreHardwareMonitor/UI/SensorNotifyIcon.cs b/LibreHardwareMonitor/UI/SensorNotifyIcon.cs index 7c101b7..ec4fdf2 100644 --- a/LibreHardwareMonitor/UI/SensorNotifyIcon.cs +++ b/LibreHardwareMonitor/UI/SensorNotifyIcon.cs @@ -182,6 +182,7 @@ namespace LibreHardwareMonitor.UI case SensorType.Data: case SensorType.Load: case SensorType.Energy: + case SensorType.Noise: return $"{Sensor.Value:F0}"; default: return "-"; @@ -257,6 +258,7 @@ namespace LibreHardwareMonitor.UI case SensorType.Data: format = "\n{0}: {1:F0} GB"; break; case SensorType.Factor: format = "\n{0}: {1:F3} GB"; break; case SensorType.Energy: format = "\n{0}: {0:F0} mWh"; break; + case SensorType.Noise: format = "\n{0}: {0:F0} dBA"; break; } string formattedValue = string.Format(format, Sensor.Name, Sensor.Value); diff --git a/LibreHardwareMonitor/UI/TypeNode.cs b/LibreHardwareMonitor/UI/TypeNode.cs index a5901d5..6056172 100644 --- a/LibreHardwareMonitor/UI/TypeNode.cs +++ b/LibreHardwareMonitor/UI/TypeNode.cs @@ -91,6 +91,10 @@ namespace LibreHardwareMonitor.UI Image = Utilities.EmbeddedResources.GetImage("time.png"); Text = "Times"; break; + case SensorType.Noise: + Image = Utilities.EmbeddedResources.GetImage("loudspeaker.png"); + Text = "Noise Levels"; + break; } NodeAdded += TypeNode_NodeAdded; diff --git a/LibreHardwareMonitor/Utilities/HttpServer.cs b/LibreHardwareMonitor/Utilities/HttpServer.cs index 570fbe8..e35715b 100644 --- a/LibreHardwareMonitor/Utilities/HttpServer.cs +++ b/LibreHardwareMonitor/Utilities/HttpServer.cs @@ -675,6 +675,8 @@ namespace LibreHardwareMonitor.Utilities return "level.png"; case SensorType.Power: return "power.png"; + case SensorType.Noise: + return "loudspeaker.png"; case SensorType.Throughput: return "throughput.png"; default: diff --git a/LibreHardwareMonitorLib/Hardware/ISensor.cs b/LibreHardwareMonitorLib/Hardware/ISensor.cs index 20223d9..6c0f128 100644 --- a/LibreHardwareMonitorLib/Hardware/ISensor.cs +++ b/LibreHardwareMonitorLib/Hardware/ISensor.cs @@ -30,7 +30,8 @@ namespace LibreHardwareMonitor.Hardware SmallData, // MB = 2^20 Bytes Throughput, // B/s TimeSpan, // Seconds - Energy // milliwatt-hour (mWh) + Energy, // milliwatt-hour (mWh) + Noise // dBA } ///