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

Update editorconfig + changes (#771)

Browse Source
This commit is contained in:
PhyxionNL
2022-06-29 19:38:57 +02:00
committed by GitHub
parent 47f33f91d9
commit 38b97e10d0
68 changed files with 1530 additions and 2287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LibreHardwareMonitorLib/Hardware/Controller/AquaComputer/AquaComputerGroup.cs
+21 -27
View File
@@ -11,8 +11,8 @@ namespace LibreHardwareMonitor.Hardware.Controller.AquaComputer
{
public class AquaComputerGroup : IGroup
{
private readonly List<IHardware> _hardware = new List<IHardware>();
private readonly StringBuilder _report = new StringBuilder();
private readonly List<IHardware> _hardware = new();
private readonly StringBuilder _report = new();
public AquaComputerGroup(ISettings settings)
{
@@ -27,50 +27,44 @@ namespace LibreHardwareMonitor.Hardware.Controller.AquaComputer
switch (dev.ProductID)
{
case 0xF00E:
{
var device = new D5Next(dev, settings);
var d5Next = new D5Next(dev, settings);
_report.AppendLine($"Device name: {productName}");
_report.AppendLine($"Firmware version: {device.FirmwareVersion}");
_report.AppendLine($"Firmware version: {d5Next.FirmwareVersion}");
_report.AppendLine();
_hardware.Add(device);
_hardware.Add(d5Next);
break;
}
case 0xf0b6:
{
var device = new AquastreamXT(dev, settings);
var aquastreamXt = new AquastreamXT(dev, settings);
_report.AppendLine($"Device name: {productName}");
_report.AppendLine($"Device variant: {device.Variant}");
_report.AppendLine($"Firmware version: {device.FirmwareVersion}");
_report.AppendLine($"{device.Status}");
_report.AppendLine($"Device variant: {aquastreamXt.Variant}");
_report.AppendLine($"Firmware version: {aquastreamXt.FirmwareVersion}");
_report.AppendLine($"{aquastreamXt.Status}");
_report.AppendLine();
_hardware.Add(device);
_hardware.Add(aquastreamXt);
break;
}
case 0xf003:
{
var device = new MPS(dev, settings);
var mps = new MPS(dev, settings);
_report.AppendLine($"Device name: {productName}");
_report.AppendLine($"Firmware version: {device.FirmwareVersion}");
_report.AppendLine($"{device.Status}");
_report.AppendLine($"Firmware version: {mps.FirmwareVersion}");
_report.AppendLine($"{mps.Status}");
_report.AppendLine();
_hardware.Add(device);
_hardware.Add(mps);
break;
}
case 0xF011:
{
var device = new Octo(dev, settings);
var octo = new Octo(dev, settings);
_report.AppendLine($"Device name: {productName}");
_report.AppendLine($"Firmware version: {device.FirmwareVersion}");
_report.AppendLine($"Firmware version: {octo.FirmwareVersion}");
_report.AppendLine();
_hardware.Add(device);
_hardware.Add(octo);
break;
}
default:
{
_report.AppendLine($"Unknown Hardware PID: {dev.ProductID} Name: {productName}");
_report.AppendLine();
break;
}
}
}
LibreHardwareMonitorLib/Hardware/Controller/AquaComputer/AquastreamXT.cs
+13 -16
View File
@@ -40,37 +40,36 @@ namespace LibreHardwareMonitor.Hardware.Controller.AquaComputer
Name = $"Aquastream XT {Variant}";
FirmwareVersion = BitConverter.ToUInt16(_rawData, 50);
_temperatures[0] = new Sensor("External Fan VRM", 0, SensorType.Temperature, this, new ParameterDescription[0], settings);
_temperatures[0] = new Sensor("External Fan VRM", 0, SensorType.Temperature, this, Array.Empty<ParameterDescription>(), settings);
ActivateSensor(_temperatures[0]);
_temperatures[1] = new Sensor("External", 1, SensorType.Temperature, this, new ParameterDescription[0], settings);
_temperatures[1] = new Sensor("External", 1, SensorType.Temperature, this, Array.Empty<ParameterDescription>(), settings);
ActivateSensor(_temperatures[1]);
_temperatures[2] = new Sensor("Internal Water", 2, SensorType.Temperature, this, new ParameterDescription[0], settings);
_temperatures[2] = new Sensor("Internal Water", 2, SensorType.Temperature, this, Array.Empty<ParameterDescription>(), settings);
ActivateSensor(_temperatures[2]);
_voltages[0] = new Sensor("External Fan", 1, SensorType.Voltage, this, new ParameterDescription[0], settings);
_voltages[0] = new Sensor("External Fan", 1, SensorType.Voltage, this, Array.Empty<ParameterDescription>(), settings);
ActivateSensor(_voltages[0]);
_voltages[1] = new Sensor("Pump", 2, SensorType.Voltage, this, new ParameterDescription[0], settings);
_voltages[1] = new Sensor("Pump", 2, SensorType.Voltage, this, Array.Empty<ParameterDescription>(), settings);
ActivateSensor(_voltages[1]);
_pumpPower = new Sensor("Pump", 0, SensorType.Power, this, new ParameterDescription[0], settings);
_pumpPower = new Sensor("Pump", 0, SensorType.Power, this, Array.Empty<ParameterDescription>(), settings);
ActivateSensor(_pumpPower);
_pumpFlow = new Sensor("Pump", 0, SensorType.Flow, this, new ParameterDescription[0], settings);
_pumpFlow = new Sensor("Pump", 0, SensorType.Flow, this, Array.Empty<ParameterDescription>(), settings);
ActivateSensor(_pumpFlow);
_rpmSensors[0] = new Sensor("External Fan", 0, SensorType.Fan, this, new ParameterDescription[0], settings);
_rpmSensors[0] = new Sensor("External Fan", 0, SensorType.Fan, this, Array.Empty<ParameterDescription>(), settings);
ActivateSensor(_rpmSensors[0]);
_rpmSensors[1] = new Sensor("Pump", 1, SensorType.Fan, this, new ParameterDescription[0], settings);
_rpmSensors[1] = new Sensor("Pump", 1, SensorType.Fan, this, Array.Empty<ParameterDescription>(), settings);
ActivateSensor(_rpmSensors[1]);
_fanControl = new Sensor("External Fan", 0, SensorType.Control, this, new ParameterDescription[0], settings);
Control control = new Control(_fanControl, settings, 0, 100);
_fanControl.Control = control;
_fanControl = new Sensor("External Fan", 0, SensorType.Control, this, Array.Empty<ParameterDescription>(), settings);
_fanControl.Control = new Control(_fanControl, settings, 0, 100);
ActivateSensor(_fanControl);
_frequencies[0] = new Sensor("Pump Frequency", 0, SensorType.Frequency, this, new ParameterDescription[0], settings);
_frequencies[0] = new Sensor("Pump Frequency", 0, SensorType.Frequency, this, Array.Empty<ParameterDescription>(), settings);
ActivateSensor(_frequencies[0]);
_frequencies[1] = new Sensor("Pump MaxFrequency", 1, SensorType.Frequency, this, new ParameterDescription[0], settings);
_frequencies[1] = new Sensor("Pump MaxFrequency", 1, SensorType.Frequency, this, Array.Empty<ParameterDescription>(), settings);
ActivateSensor(_frequencies[1]);
}
}
@@ -107,7 +106,6 @@ namespace LibreHardwareMonitor.Hardware.Controller.AquaComputer
if (mode.HasFlag(MODE.MODE_FAN_AMP))
return "Advanced";
return "Standard";
}
}
@@ -128,7 +126,6 @@ namespace LibreHardwareMonitor.Hardware.Controller.AquaComputer
if (_rawData[0] != 0x4)
return;
//var rawSensorsFan = BitConverter.ToUInt16(rawData, 1); //unknown - redundant?
//var rawSensorsExt = BitConverter.ToUInt16(rawData, 3); //unknown - redundant?
//var rawSensorsWater = BitConverter.ToUInt16(rawData, 5); //unknown - redundant?
LibreHardwareMonitorLib/Hardware/Controller/AquaComputer/D5Next.cs
+4 -4
View File
@@ -34,15 +34,15 @@ namespace LibreHardwareMonitor.Hardware.Controller.AquaComputer
Name = $"D5Next";
FirmwareVersion = Convert.ToUInt16(_rawData[14] | (_rawData[13] << 8));
_temperatures[0] = new Sensor("Water Temperature", 0, SensorType.Temperature, this, new ParameterDescription[0], settings);
_temperatures[0] = new Sensor("Water Temperature", 0, SensorType.Temperature, this, Array.Empty<ParameterDescription>(), settings);
ActivateSensor(_temperatures[0]);
_rpmSensors[0] = new Sensor("Pump", 0, SensorType.Fan, this, new ParameterDescription[0], settings);
_rpmSensors[0] = new Sensor("Pump", 0, SensorType.Fan, this, Array.Empty<ParameterDescription>(), settings);
ActivateSensor(_rpmSensors[0]);
}
}
public ushort FirmwareVersion { get; private set; }
public ushort FirmwareVersion { get; }
public override HardwareType HardwareType
{
LibreHardwareMonitorLib/Hardware/Controller/AquaComputer/MPS.cs
+4 -5
View File
@@ -16,7 +16,7 @@ namespace LibreHardwareMonitor.Hardware.Controller.AquaComputer
private readonly byte[] _rawData = new byte[64];
private readonly HidStream _stream;
private readonly Sensor[] _temperatures = new Sensor[2];
private ushort _externalTemperature;
public MPS(HidDevice dev, ISettings settings) : base("MPS", new Identifier(dev.DevicePath), settings)
@@ -33,12 +33,12 @@ namespace LibreHardwareMonitor.Hardware.Controller.AquaComputer
Name = "MPS";
FirmwareVersion = ExtractFirmwareVersion();
_temperatures[0] = new Sensor("External", 0, SensorType.Temperature, this, new ParameterDescription[0], settings);
_temperatures[0] = new Sensor("External", 0, SensorType.Temperature, this, Array.Empty<ParameterDescription>(), settings);
ActivateSensor(_temperatures[0]);
_temperatures[1] = new Sensor("Internal Water", 1, SensorType.Temperature, this, new ParameterDescription[0], settings);
_temperatures[1] = new Sensor("Internal Water", 1, SensorType.Temperature, this, Array.Empty<ParameterDescription>(), settings);
ActivateSensor(_temperatures[1]);
_pumpFlow = new Sensor("Pump", 0, SensorType.Flow, this, new ParameterDescription[0], settings);
_pumpFlow = new Sensor("Pump", 0, SensorType.Flow, this, Array.Empty<ParameterDescription>(), settings);
ActivateSensor(_pumpFlow);
}
}
@@ -79,7 +79,6 @@ namespace LibreHardwareMonitor.Hardware.Controller.AquaComputer
if (_rawData[0] != MPS_REPORT_ID)
return;
_pumpFlow.Value = BitConverter.ToUInt16(_rawData, MPSDataIndexes.PumpFlow) / 10f;
_externalTemperature = BitConverter.ToUInt16(_rawData, MPSDataIndexes.ExternalTemperature);
LibreHardwareMonitorLib/Hardware/Controller/AquaComputer/Octo.cs
+1 -1
View File
@@ -69,7 +69,7 @@ namespace LibreHardwareMonitor.Hardware.Controller.AquaComputer
}
}
public ushort FirmwareVersion { get; private set; }
public ushort FirmwareVersion { get; }
public override HardwareType HardwareType
{