Skip to content

Commit fb7a2f8

Browse files
author
gyorokpeter
committed
integrate SteelSeries Server
1 parent 2fc8d3f commit fb7a2f8

17 files changed

+178
-10
lines changed

‎.gitmodules‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "SBAuroraR.NET"]
22
path = SBAuroraR.NET
3-
url = https://github.com/rajkosto/SBAuroraR.NET.git
3+
url = https://github.com/rajkosto/SBAuroraR.NET.git
4+
[submodule "SteelSeriesServer"]
5+
path = SteelSeriesServer
6+
url = https://github.com/gyorokpeter/SteelSeriesServer.git

‎Project-Aurora/Aurora-Updater/Aurora-Updater.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363

6464
<ItemGroup>
6565
<PackageReference Include="Newtonsoft.Json">
66-
<Version>12.0.3</Version>
66+
<Version>13.0.1</Version>
6767
</PackageReference>
6868
<PackageReference Include="Octokit">
6969
<Version>0.47.0</Version>

‎Project-Aurora/Project-Aurora.sln‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Project-Aurora", "Project-A
77
{A759300D-9550-47BA-8616-C24B6BC05A02} = {A759300D-9550-47BA-8616-C24B6BC05A02}
88
{40085232-ACED-4CBE-945B-90BA8153C151} = {40085232-ACED-4CBE-945B-90BA8153C151}
99
{004D1E3E-F20E-4ECA-ABB1-467D1CE2C173} = {004D1E3E-F20E-4ECA-ABB1-467D1CE2C173}
10+
{87555B4B-E379-4ACC-9899-CAD4CCA227CA} = {87555B4B-E379-4ACC-9899-CAD4CCA227CA}
1011
{20259BE1-55C9-4EFB-9D30-C933F621B9D4} = {20259BE1-55C9-4EFB-9D30-C933F621B9D4}
1112
EndProjectSection
1213
EndProject
@@ -27,6 +28,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Plugin-Example", "Plugin-Ex
2728
EndProject
2829
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SBAuroraReactive", "..\SBAuroraR.NET\SBAuroraReactive\SBAuroraReactive.vcxproj", "{053A704B-5C79-4CDE-B1FC-B952051ACAA0}"
2930
EndProject
31+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SteelSeriesServer", "..\SteelSeriesServer\SteelSeriesServer.csproj", "{87555B4B-E379-4ACC-9899-CAD4CCA227CA}"
32+
EndProject
3033
Global
3134
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3235
Debug|x64 = Debug|x64
@@ -65,6 +68,10 @@ Global
6568
{053A704B-5C79-4CDE-B1FC-B952051ACAA0}.Debug|x64.Build.0 = Debug|x64
6669
{053A704B-5C79-4CDE-B1FC-B952051ACAA0}.Release|x64.ActiveCfg = Release|x64
6770
{053A704B-5C79-4CDE-B1FC-B952051ACAA0}.Release|x64.Build.0 = Release|x64
71+
{87555B4B-E379-4ACC-9899-CAD4CCA227CA}.Debug|x64.ActiveCfg = Debug|Any CPU
72+
{87555B4B-E379-4ACC-9899-CAD4CCA227CA}.Debug|x64.Build.0 = Debug|Any CPU
73+
{87555B4B-E379-4ACC-9899-CAD4CCA227CA}.Release|x64.ActiveCfg = Release|Any CPU
74+
{87555B4B-E379-4ACC-9899-CAD4CCA227CA}.Release|x64.Build.0 = Release|Any CPU
6875
EndGlobalSection
6976
GlobalSection(SolutionProperties) = preSolution
7077
HideSolutionNode = FALSE

‎Project-Aurora/Project-Aurora/ConfigUI.xaml.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,12 @@ private void CtrlLayerManager_ProfileOverviewRequest(UserControl profile_control
133133
SelectedControl = profile_control;
134134
}
135135

136+
internal void GoToSteelSeriesPage()
137+
{
138+
DesktopControl_MouseLeftButtonDown(null, null);
139+
settingsControl.tabMain.SelectedIndex = settingsControl.tabMain.Items.IndexOf(settingsControl.devicesAndWrappersPage);
140+
}
141+
136142
private void Layer_manager_NewLayer(Layer layer)
137143
{
138144
layerPresenter.Layer = layer;

‎Project-Aurora/Project-Aurora/Profiles/Cardaclysm/CardaclysmApplication.cs‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
using Aurora.Settings.Layers;
2+
3+
namespace Aurora.Profiles.Cardaclysm
4+
{
5+
public class Cardaclysm : Application
6+
{
7+
public Cardaclysm() : base(new LightEventConfig {
8+
Name = "Cardaclysm",
9+
ID = "Cardaclysm",
10+
ProcessNames = new[] { "cardaclysm.exe" },
11+
ProfileType = typeof(WrapperProfile),
12+
OverviewControlType = typeof(Control_Cardaclysm),
13+
GameStateType = typeof(GameState_Wrapper),
14+
Event = new GameEvent_Generic(),
15+
IconURI = "Resources/cardaclysm_64x64.png"
16+
})
17+
{
18+
AllowLayer<WrapperLightsLayerHandler>();
19+
}
20+
}
21+
}

‎Project-Aurora/Project-Aurora/Profiles/Cardaclysm/Control_Cardaclysm.xaml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<UserControl
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+
xmlns:local="clr-namespace:Aurora.Profiles.Cardaclysm"
7+
xmlns:EnumDeviceKeys="clr-namespace:Aurora.Devices"
8+
xmlns:EnumPercentEffectType="clr-namespace:Aurora.Settings"
9+
xmlns:EnumValueConverters="clr-namespace:Aurora.Utils"
10+
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
11+
xmlns:Controls="clr-namespace:Aurora.Controls" x:Class="Aurora.Profiles.Cardaclysm.Control_Cardaclysm"
12+
mc:Ignorable="d"
13+
d:DesignHeight="300" Height="Auto" Width="Auto" d:DesignWidth="850" >
14+
<Grid>
15+
<TabControl>
16+
<TabItem Header="Overview for Cardaclysm">
17+
<Grid>
18+
<StackPanel>
19+
<CheckBox x:Name="game_enabled" Content="Enable Aurora to provide lighting effects with Cardaclysm" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Checked="game_enabled_Checked" Unchecked="game_enabled_Checked"/>
20+
<TextBlock Margin="10,10,64,0" VerticalAlignment="Top" TextWrapping="Wrap"><Run Text="To enable Cardaclysm support, you need to start the SteelSeries Server which will allow receiving lighting information from all games that support SteelSeries GameSense, including Cardaclysm."/></TextBlock>
21+
<Button x:Name="go_to_steelseries" Content="Go to SteelSeries Configuration" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Click="go_to_steelseries_Click"/>
22+
</StackPanel>
23+
</Grid>
24+
</TabItem>
25+
</TabControl>
26+
</Grid>
27+
</UserControl>

‎Project-Aurora/Project-Aurora/Profiles/Cardaclysm/Control_Cardaclysm.xaml.cs‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
using Aurora.Settings;
2+
using System;
3+
using System.IO;
4+
using System.Windows;
5+
using System.Windows.Controls;
6+
7+
namespace Aurora.Profiles.Cardaclysm
8+
{
9+
/// <summary>
10+
/// Interaction logic for Control_Cardaclysm.xaml
11+
/// </summary>
12+
public partial class Control_Cardaclysm : UserControl
13+
{
14+
private Application profile_manager;
15+
16+
public Control_Cardaclysm(Application profile)
17+
{
18+
InitializeComponent();
19+
20+
profile_manager = profile;
21+
22+
SetSettings();
23+
}
24+
25+
private void SetSettings()
26+
{
27+
this.game_enabled.IsChecked = profile_manager.Settings.IsEnabled;
28+
}
29+
30+
private void game_enabled_Checked(object sender, RoutedEventArgs e)
31+
{
32+
if (IsLoaded)
33+
{
34+
profile_manager.Settings.IsEnabled = (this.game_enabled.IsChecked.HasValue) ? this.game_enabled.IsChecked.Value : false;
35+
profile_manager.SaveProfiles();
36+
}
37+
}
38+
39+
private void go_to_steelseries_Click(object sender, RoutedEventArgs e)
40+
{
41+
var mainWindow = (ConfigUI)System.Windows.Application.Current.MainWindow;
42+
mainWindow.GoToSteelSeriesPage();
43+
}
44+
}
45+
}

‎Project-Aurora/Project-Aurora/Profiles/Factorio/Control_Factorio.xaml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,15 @@
1313
<Grid>
1414
<StackPanel>
1515
<CheckBox x:Name="game_enabled" Content="Enable Aurora to provide lighting effects with Factorio" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Checked="game_enabled_Checked" Unchecked="game_enabled_Checked"/>
16-
<TextBlock Margin="10,10,64,0" VerticalAlignment="Top" TextWrapping="Wrap"><Run Text="In order for Factorio support to work, you have to apply the Aurora Wrapper Patch for Razer in order for Aurora to receive lighting information. Press the &quot;Patch Factorio&quot; button to install automatically to the detected game directory. To choose manually press the &quot;Patch "/><Run Text="Factorio "/><Run Text="Manually&quot; button and navigate to the "/><Run Text="Factorio "/><Run Text="install directory. This should not trigger any anti-cheat, but it should be used at your own risk. P.S. You can actually apply this patch to any Razer Chroma supported game, and Aurora will work with it."/></TextBlock>
16+
<TextBlock Margin="10,10,64,0" VerticalAlignment="Top" TextWrapping="Wrap"><Run Text="There are two ways to enable Factorio support:"/></TextBlock>
17+
<TextBlock Margin="10,10,64,0" VerticalAlignment="Top" TextWrapping="Wrap"><Run Text="1. Apply the Aurora Wrapper Patch for Razer in order for Aurora to receive lighting information. Press the &quot;Patch Factorio&quot; button to install automatically to the detected game directory. To choose manually press the &quot;Patch "/><Run Text="Factorio "/><Run Text="Manually&quot; button and navigate to the "/><Run Text="Factorio "/><Run Text="install directory. This should not trigger any anti-cheat, but it should be used at your own risk. P.S. You can actually apply this patch to any Razer Chroma supported game, and Aurora will work with it."/></TextBlock>
1718
<StackPanel Orientation="Horizontal" Margin="10,10,0,0">
1819
<Button x:Name="patch_button" Content="Patch Factorio" HorizontalAlignment="Left" VerticalAlignment="Top" Click="patch_button_Click"/>
1920
<Button x:Name="patch_button_manually" Content="Patch Factorio Manually" HorizontalAlignment="Left" Margin="10,0,0,0" VerticalAlignment="Top" Click="patch_button_manually_Click"/>
2021
</StackPanel>
2122
<Button x:Name="unpatch_button" Content="Unpatch Factorio" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Click="unpatch_button_Click"/>
23+
<TextBlock Margin="10,10,64,0" VerticalAlignment="Top" TextWrapping="Wrap"><Run Text="2. Start the SteelSeries Server which will allow receiving lighting information from all games that support SteelSeries GameSense, including Factorio."/></TextBlock>
24+
<Button x:Name="go_to_steelseries" Content="Go to SteelSeries Configuration" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Click="go_to_steelseries_Click"/>
2225
</StackPanel>
2326
</Grid>
2427
</TabItem>

‎Project-Aurora/Project-Aurora/Profiles/Factorio/Control_Factorio.xaml.cs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
namespace Aurora.Profiles.Factorio
88
{
99
/// <summary>
10-
/// Interaction logic for Control_Overwatch.xaml
10+
/// Interaction logic for Control_Factorio.xaml
1111
/// </summary>
1212
public partial class Control_Factorio : UserControl
1313
{
@@ -115,5 +115,11 @@ private void game_enabled_Checked(object sender, RoutedEventArgs e)
115115
profile_manager.SaveProfiles();
116116
}
117117
}
118+
119+
private void go_to_steelseries_Click(object sender, RoutedEventArgs e)
120+
{
121+
var mainWindow = (ConfigUI)System.Windows.Application.Current.MainWindow;
122+
mainWindow.GoToSteelSeriesPage();
123+
}
118124
}
119125
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<PackageReference Include="LibreHardwareMonitorLib" Version="0.8.8" />
7373
<PackageReference Include="MouseKeyHook" Version="5.6.0" />
7474
<PackageReference Include="NAudio" Version="1.10.0" />
75-
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
75+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
7676
<PackageReference Include="NLog" Version="4.7.0" />
7777
<PackageReference Include="Octokit" Version="0.47.0" />
7878
<PackageReference Include="OpenRGB.NET" Version="1.7.0" />
@@ -95,6 +95,7 @@
9595
<ProjectReference Include="..\..\SBAuroraR.NET\SBAuroraReactive\SBAuroraReactive.vcxproj">
9696
<Private>false</Private>
9797
</ProjectReference>
98+
<ProjectReference Include="..\..\SteelSeriesServer\SteelSeriesServer.csproj" />
9899
<ProjectReference Include="..\ColorBox\ColorBox.csproj" />
99100
</ItemGroup>
100101

0 commit comments

Comments
 (0)