update to latest

LibreHardwareMonitor/LibreHardwareMonitor.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net472</TargetFramework>
@@ -25,7 +25,7 @@
     <PackageReference Include="TaskScheduler" Version="2.10.1" />
     <PackageReference Include="OxyPlot.Core" Version="2.1.2" />
     <PackageReference Include="OxyPlot.WindowsForms" Version="2.1.2" />
-    <PackageReference Include="System.Management" Version="7.0.0" />
+    <PackageReference Include="System.Management" Version="7.0.2" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Web" />

LibreHardwareMonitor/Resources/app.manifest

@@ -7,7 +7,7 @@
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <requestedExecutionLevel level="highestAvailable" uiAccess="false" />
+        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
       </requestedPrivileges>
     </security>
   </trustInfo>

LibreHardwareMonitorLib/Hardware/Battery/BatteryGroup.cs

@@ -91,7 +91,7 @@ public unsafe BatteryGroup(ISettings settings)
                                                                  IntPtr.Zero))
                                     {
                                         // Only batteries count.
-                                        if (bi.Capabilities == Kernel32.BatteryCapabilities.BATTERY_SYSTEM_BATTERY)
+                                        if (bi.Capabilities.HasFlag(Kernel32.BatteryCapabilities.BATTERY_SYSTEM_BATTERY))
                                         {
                                             const int maxLoadString = 100;
 
@@ -215,4 +215,4 @@ public string GetReport()
 
         return reportBuilder.ToString();
     }
-}
+}

LibreHardwareMonitorLib/Hardware/Computer.cs

@@ -14,6 +14,7 @@
 using LibreHardwareMonitor.Hardware.Controller.AquaComputer;
 using LibreHardwareMonitor.Hardware.Controller.Heatmaster;
 using LibreHardwareMonitor.Hardware.Controller.Nzxt;
+using LibreHardwareMonitor.Hardware.Controller.Razer;
 using LibreHardwareMonitor.Hardware.Controller.TBalancer;
 using LibreHardwareMonitor.Hardware.Cpu;
 using LibreHardwareMonitor.Hardware.Gpu;
@@ -123,6 +124,7 @@ public bool IsControllerEnabled
                     Add(new AquaComputerGroup(_settings));
                     Add(new AeroCoolGroup(_settings));
                     Add(new NzxtGroup(_settings));
+                    Add(new RazerGroup(_settings));
                 }
                 else
                 {
@@ -131,6 +133,7 @@ public bool IsControllerEnabled
                     RemoveType<AquaComputerGroup>();
                     RemoveType<AeroCoolGroup>();
                     RemoveType<NzxtGroup>();
+                    RemoveType<RazerGroup>();
                 }
             }
 
@@ -487,6 +490,7 @@ public void Open()
         _smbios = new SMBios();
 
         Ring0.Open();
+        Mutexes.Open();
         OpCode.Open();
 
         AddGroups();
@@ -519,6 +523,7 @@ private void AddGroups()
             Add(new AquaComputerGroup(_settings));
             Add(new AeroCoolGroup(_settings));
             Add(new NzxtGroup(_settings));
+            Add(new RazerGroup(_settings));
         }
 
         if (_storageEnabled)
@@ -628,6 +633,7 @@ public void Close()
         OpCode.Close();
         InpOut.Close();
         Ring0.Close();
+        Mutexes.Close();
 
         _smbios = null;
         _open = false;

LibreHardwareMonitorLib/Hardware/Controller/AquaComputer/AquastreamXT.cs

@@ -5,6 +5,7 @@
 
 using System;
 using System.Diagnostics.CodeAnalysis;
+using System.IO;
 using HidSharp;
 
 namespace LibreHardwareMonitor.Hardware.Controller.AquaComputer;
@@ -119,8 +120,16 @@ public override void Close()
     //TODO: Check tested and fix unknown variables
     public override void Update()
     {
-        _rawData[0] = 0x4;
-        _stream.GetFeature(_rawData);
+        try
+        {
+            _rawData[0] = 0x4;
+            _stream.GetFeature(_rawData);
+        }
+        catch (IOException)
+        {
+            return;
+        }
+
 
         if (_rawData[0] != 0x4)
             return;
@@ -156,4 +165,4 @@ private enum MODE : byte
         MODE_FAN_AMP = 2,
         MODE_FAN_CONTROLLER = 4
     }
-}
+}

LibreHardwareMonitorLib/Hardware/Controller/AquaComputer/MPS.cs

@@ -4,6 +4,7 @@
 // All Rights Reserved.
 
 using System;
+using System.IO;
 using HidSharp;
 
 namespace LibreHardwareMonitor.Hardware.Controller.AquaComputer;
@@ -76,8 +77,15 @@ public override void Close()
 
     public override void Update()
     {
-        _rawData[0] = MPS_REPORT_ID;
-        _stream.GetFeature(_rawData);
+        try
+        {
+            _rawData[0] = MPS_REPORT_ID;
+            _stream.GetFeature(_rawData);
+        }
+        catch (IOException)
+        {
+            return;
+        }
 
         if (_rawData[0] != MPS_REPORT_ID)
             return;
@@ -96,6 +104,7 @@ public override void Update()
         }
 
         _temperatures[1].Value = BitConverter.ToUInt16(_rawData, InternalWaterTemperature) / 100f;
+
     }
 
     private ushort ExtractFirmwareVersion()

LibreHardwareMonitorLib/Hardware/Controller/Nzxt/GridV3.cs

@@ -15,34 +15,30 @@ namespace LibreHardwareMonitor.Hardware.Controller.Nzxt;
 /// </summary>
 internal sealed class GridV3 : Hardware
 {
+    private const int FANS_COUNT = 6;
+
     // Some initialization messages to send to the controller. No visible effects but NZXT CAM send them.
     private static readonly byte[] _initialize1 = { 0x01, 0x5c };
     private static readonly byte[] _initialize2 = { 0x01, 0x5d };
     private static readonly byte[] _initialize3 = { 0x01, 0x59 };
 
-    private const int FANS_COUNT = 6;
-
-    private readonly byte[] _setFanSpeedMsg;
-    private readonly HidStream _stream;
-    private readonly Dictionary<int, byte[]> _rawData = new();
-
-    private readonly Sensor _noise;
     private readonly Sensor[] _currents = new Sensor[FANS_COUNT];
+    private readonly Control[] _fanControls = new Control[FANS_COUNT];
+    private readonly Sensor _noise;
     private readonly Sensor[] _powers = new Sensor[FANS_COUNT];
     private readonly Sensor[] _pwmControls = new Sensor[FANS_COUNT];
+    private readonly Dictionary<int, byte[]> _rawData = new();
     private readonly Sensor[] _rpmSensors = new Sensor[FANS_COUNT];
+    private readonly byte[] _setFanSpeedMsg;
+    private readonly HidStream _stream;
     private readonly Sensor[] _voltages = new Sensor[FANS_COUNT];
 
-    private readonly Control[] _fanControls = new Control[FANS_COUNT];
-
     public GridV3(HidDevice dev, ISettings settings) : base("NZXT GRID+ V3", new Identifier("nzxt", "gridv3", dev.GetSerialNumber().TrimStart('0')), settings)
     {
         if (dev.TryOpen(out _stream))
         {
-            for (int fanID = 0; fanID < FANS_COUNT; fanID++)
-            {
-                _rawData[fanID] = new byte[21];
-            }
+            for (int fanId = 0; fanId < FANS_COUNT; fanId++)
+                _rawData[fanId] = new byte[21];
 
             _setFanSpeedMsg = new byte[65];
             _setFanSpeedMsg[0] = 0x02;
@@ -90,42 +86,48 @@ internal sealed class GridV3 : Hardware
                 // NZXT GRID does not report current PWM value. So we need to initialize it with some value to keep GUI and device values in sync.
                 _fanControls[i].SetDefault();
             }
+
             _noise = new Sensor("GRID Noise", 0, SensorType.Noise, this, Array.Empty<ParameterDescription>(), settings);
             ActivateSensor(_noise);
 
             Thread readGridReports = new(ContinuousRead) { IsBackground = true };
             readGridReports.Start(_rawData);
+
+            IsValid = true;
         }
     }
 
     public string FirmwareVersion { get; }
 
     public override HardwareType HardwareType => HardwareType.Cooler;
 
+    public bool IsValid { get; }
+
     private void SoftwareControlValueChanged(Control control)
     {
-        if (control.ControlMode == ControlMode.Software)
+        switch (control.ControlMode)
         {
-            float value = control.SoftwareValue;
-            byte fanSpeed = (byte)(value > 100 ? 100 : value < 0 ? 0 : value); // Clamp the value, anything out of range will fail
+            case ControlMode.Software:
+                float value = control.SoftwareValue;
+                byte fanSpeed = (byte)(value > 100 ? 100 : value < 0 ? 0 : value); // Clamp the value, anything out of range will fail
 
-            //_controlling = true;
-            _setFanSpeedMsg[2] = (byte)control.Sensor.Index;
-            _setFanSpeedMsg[4] = fanSpeed;
+                //_controlling = true;
+                _setFanSpeedMsg[2] = (byte)control.Sensor.Index;
+                _setFanSpeedMsg[4] = fanSpeed;
 
-            _stream.Write(_setFanSpeedMsg);
+                _stream.Write(_setFanSpeedMsg);
 
-            _pwmControls[control.Sensor.Index].Value = value;
-        }
-        else if (control.ControlMode == ControlMode.Default)
-        {
-            // There isn't a "default" mode, but let's say a safe setting is 40%
-            _setFanSpeedMsg[2] = (byte)control.Sensor.Index;
-            _setFanSpeedMsg[4] = 40;
+                _pwmControls[control.Sensor.Index].Value = value;
+                break;
+            case ControlMode.Default:
+                // There isn't a "default" mode, but let's say a safe setting is 40%
+                _setFanSpeedMsg[2] = (byte)control.Sensor.Index;
+                _setFanSpeedMsg[4] = 40;
 
-            _stream.Write(_setFanSpeedMsg);
+                _stream.Write(_setFanSpeedMsg);
 
-            _pwmControls[control.Sensor.Index].Value = 40;
+                _pwmControls[control.Sensor.Index].Value = 40;
+                break;
         }
     }
 
@@ -147,8 +149,8 @@ private void ContinuousRead(object state)
                 {
                     lock (_rawData)
                     {
-                        int fanID = (buffer[15] >> 4) & 0x0f;
-                        Array.Copy(buffer, _rawData[fanID], buffer.Length);
+                        int fanId = (buffer[15] >> 4) & 0x0f;
+                        Array.Copy(buffer, _rawData[fanId], buffer.Length);
                     }
                 }
             }
@@ -167,16 +169,17 @@ private void ContinuousRead(object state)
 
     public override void Update()
     {
-        // The NZXT GRID+ V3 series sends updates periodically. We have to read it in a seperate thread, this call just reads that data.
+        // The NZXT GRID+ V3 series sends updates periodically. We have to read it in a separate thread, this call just reads that data.
         lock (_rawData)
         {
-            for (int fanID = 0; fanID < FANS_COUNT; fanID++)
+            for (int fanId = 0; fanId < FANS_COUNT; fanId++)
             {
-                _rpmSensors[fanID].Value = (_rawData[fanID][3] << 8) | _rawData[fanID][4];
-                _voltages[fanID].Value = _rawData[fanID][7] + _rawData[fanID][8] / 100.0f;
-                _currents[fanID].Value = _rawData[fanID][9] + _rawData[fanID][10] / 100.0f;
-                _powers[fanID].Value = _currents[fanID].Value * _voltages[fanID].Value;
+                _rpmSensors[fanId].Value = (_rawData[fanId][3] << 8) | _rawData[fanId][4];
+                _voltages[fanId].Value = _rawData[fanId][7] + _rawData[fanId][8] / 100.0f;
+                _currents[fanId].Value = _rawData[fanId][9] + _rawData[fanId][10] / 100.0f;
+                _powers[fanId].Value = _currents[fanId].Value * _voltages[fanId].Value;
             }
+
             _noise.Value = _rawData[2][1];
         }
     }