Skip to content
This repository was archived by the owner on Sep 2, 2025. It is now read-only.

Commit 302e374

Browse files
committed
update LibreHardwareMonitorLib version because of false positive
optimize Razer Chroma Layer
1 parent c073854 commit 302e374

3 files changed

Lines changed: 28 additions & 32 deletions

File tree

Project-Aurora/Project-Aurora/Project-Aurora.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<PackageReference Include="Infragistics.Themes.MetroDark.Wpf" Version="1.0.0" />
7676
<PackageReference Include="IronPython" Version="2.7.11" />
7777
<PackageReference Include="JsonSubTypes" Version="1.8.0" />
78-
<PackageReference Include="LibreHardwareMonitorLib" Version="0.8.8" />
78+
<PackageReference Include="LibreHardwareMonitorLib" Version="0.8.9" />
7979
<PackageReference Include="MouseKeyHook" Version="5.6.0" />
8080
<PackageReference Include="NAudio" Version="2.0.1" />
8181
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />

Project-Aurora/Project-Aurora/Settings/Layers/RazerLayerHandler.cs

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@ public override void Default()
6363
[LayerHandlerMeta(Name = "Razer Chroma", IsDefault = true)]
6464
public class RazerLayerHandler : LayerHandler<RazerLayerHandlerProperties>
6565
{
66-
private Color[] _keyboardColors;
67-
private Color[] _mousepadColors;
66+
private readonly Color[] _keyboardColors;
67+
private readonly Color[] _mousepadColors;
6868
private Color _mouseColor;
6969
private string _currentAppExecutable;
70-
private int _currentAppPid;
7170
private bool _isDumping;
71+
private readonly EffectLayer _layer = new("Chroma Layer");
7272

7373
public RazerLayerHandler()
7474
{
@@ -82,7 +82,6 @@ public RazerLayerHandler()
8282
var appList = Global.razerSdkManager.GetDataProvider<RzAppListDataProvider>();
8383
appList.Update();
8484
_currentAppExecutable = appList.CurrentAppExecutable;
85-
_currentAppPid = appList.CurrentAppPid;
8685
}
8786
}
8887

@@ -93,7 +92,7 @@ protected override UserControl CreateControl()
9392

9493
private void OnDataUpdated(object s, EventArgs e)
9594
{
96-
if (!(s is AbstractDataProvider provider))
95+
if (s is not AbstractDataProvider provider)
9796
return;
9897

9998
provider.Update();
@@ -118,7 +117,6 @@ private void OnDataUpdated(object s, EventArgs e)
118117
else if (provider is RzAppListDataProvider appList)
119118
{
120119
_currentAppExecutable = appList.CurrentAppExecutable;
121-
_currentAppPid = appList.CurrentAppPid;
122120
}
123121
}
124122

@@ -150,33 +148,37 @@ public void DumpData(AbstractDataProvider provider)
150148
{
151149
var path = Path.Combine(Global.LogsDirectory, "RazerLayer");
152150
var filename = $"{provider.GetType().Name}_{Environment.TickCount}.bin";
153-
using (var file = File.Open($@"{path}\{filename}", FileMode.Create)) {
154-
var data = provider.Read();
155-
file.Write(data, 0, data.Length);
156-
}
151+
using var file = File.Open($@"{path}\{filename}", FileMode.Create);
152+
var data = provider.Read();
153+
file.Write(data, 0, data.Length);
157154
}
158155

156+
private bool _empty = true;
159157
public override EffectLayer Render(IGameState gamestate)
160158
{
161-
var layer = new EffectLayer();
162-
163159
if (!IsCurrentAppValid())
164-
return layer;
160+
{
161+
if (_empty) return _layer;
162+
_layer.Clear();
163+
_empty = true;
164+
return _layer;
165+
}
166+
_empty = false;
165167

166168
foreach (var key in (DeviceKeys[])Enum.GetValues(typeof(DeviceKeys)))
167169
{
168-
if (!TryGetColor(key, out Color color))
170+
if (!TryGetColor(key, out var color))
169171
continue;
170172

171-
layer.Set(key, color);
173+
_layer.Set(key, color);
172174
}
173175

174-
if (Properties.KeyCloneMap != null)
175-
foreach (var target in Properties.KeyCloneMap)
176-
if(TryGetColor(target.Value, out var clr))
177-
layer.Set(target.Key, clr);
176+
if (Properties.KeyCloneMap == null) return _layer;
177+
foreach (var target in Properties.KeyCloneMap)
178+
if(TryGetColor(target.Value, out var clr))
179+
_layer.Set(target.Key, clr);
178180

179-
return layer;
181+
return _layer;
180182
}
181183

182184
private bool TryGetColor(DeviceKeys key, out Color color)
@@ -199,7 +201,7 @@ private bool TryGetColor(DeviceKeys key, out Color color)
199201

200202
private bool IsCurrentAppValid()
201203
=> !string.IsNullOrEmpty(_currentAppExecutable)
202-
&& string.Compare(_currentAppExecutable, "Aurora.exe", true) != 0;
204+
&& string.Compare(_currentAppExecutable, "Aurora.exe", StringComparison.OrdinalIgnoreCase) != 0;
203205

204206
private Color PostProcessColor(Color color)
205207
{

Project-Aurora/Project-Aurora/packages.lock.json

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,12 @@
7676
},
7777
"LibreHardwareMonitorLib": {
7878
"type": "Direct",
79-
"requested": "[0.8.8, )",
80-
"resolved": "0.8.8",
81-
"contentHash": "KBPf4HJkGtubkFG8PL7Hr0E736CW4KLk6vqiC4aXY6quEd861/3tBo9h8VVvrL/q2r58xVq5zaoylIjqB5bqHA==",
79+
"requested": "[0.8.9, )",
80+
"resolved": "0.8.9",
81+
"contentHash": "e0axsjvbjtQLdsuL25PwYgPsOAZjDORY+K+qgvtvUh8Rt4P/t+Xk0sDKRCHVcTlr/J6UGWKcd0dhmE5v25ujqQ==",
8282
"dependencies": {
8383
"HidSharp": "2.1.0",
84-
"NvAPIWrapper.Net": "0.8.1.101",
85-
"System.Management": "4.7.0"
84+
"System.Management": "5.0.0"
8685
}
8786
},
8887
"MouseKeyHook": {
@@ -389,11 +388,6 @@
389388
"NAudio.Core": "2.0.0"
390389
}
391390
},
392-
"NvAPIWrapper.Net": {
393-
"type": "Transitive",
394-
"resolved": "0.8.1.101",
395-
"contentHash": "qX+5EQ32tCTqBkX/9BNfx7w4HPi18s3XhMubjbxSjPhYQ6pXWL+HGnaZEmGvFlOxvsQN+/6eV3x5bRo1CDY/mQ=="
396-
},
397391
"SharpDX": {
398392
"type": "Transitive",
399393
"resolved": "4.0.1",

0 commit comments

Comments
 (0)