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

Unify remaining memory names

Browse Source
This commit is contained in:
Phyxion
2019-10-11 12:39:56 +02:00
parent b7df6db209
commit 059b43cc14
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LibreHardwareMonitorLib/Hardware/Cpu/IntelCpu.cs
+3 -2
View File
@@ -26,7 +26,6 @@ namespace LibreHardwareMonitor.Hardware.CPU
private readonly MicroArchitecture _microArchitecture;
private readonly Sensor _packageTemperature;
private readonly string[] _powerSensorLabels = { "CPU Package", "CPU Cores", "CPU Graphics", "CPU DRAM" };
private readonly Sensor[] _powerSensors;
private readonly double _timeStampCounterMultiplier;
@@ -346,6 +345,8 @@ namespace LibreHardwareMonitor.Hardware.CPU
if (_energyUnitMultiplier != 0)
{
string[] powerSensorLabels = { "CPU Package", "CPU Cores", "CPU Graphics", "CPU Memory" };
for (int i = 0; i < _energyStatusMsrs.Length; i++)
{
if (!Ring0.ReadMsr(_energyStatusMsrs[i], out eax, out uint _))
@@ -354,7 +355,7 @@ namespace LibreHardwareMonitor.Hardware.CPU
_lastEnergyTime[i] = DateTime.UtcNow;
_lastEnergyConsumed[i] = eax;
_powerSensors[i] = new Sensor(_powerSensorLabels[i],
_powerSensors[i] = new Sensor(powerSensorLabels[i],
i,
SensorType.Power,
this,
LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs
+1 -1
View File
@@ -736,7 +736,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard
v.Add(new Voltage("+5V", 3, 1.5f, 1));
v.Add(new Voltage("VSOC", 4));
v.Add(new Voltage("VDDP", 5));
v.Add(new Voltage("VDRAM", 6));
v.Add(new Voltage("DIMM", 6));
v.Add(new Voltage("3VSB", 7, 10, 10));
v.Add(new Voltage("VBat", 8, 10, 10));
v.Add(new Voltage("AVCC3", 9, 7.53f, 1));