From 38e83d0cd5dd5a9c9827b60ba676626a45288463 Mon Sep 17 00:00:00 2001 From: gyorokpeter Date: Sun, 11 Apr 2021 15:18:54 +0100 Subject: [PATCH] integrate SteelSeries Server --- .gitmodules | 5 +- .../Aurora-Updater/Aurora-Updater.csproj | 2 +- Project-Aurora/Project-Aurora.sln | 7 +++ .../Project-Aurora/ConfigUI.xaml.cs | 6 +++ .../Cardaclysm/CardaclysmApplication.cs | 21 ++++++++ .../Cardaclysm/Control_Cardaclysm.xaml | 27 +++++++++++ .../Cardaclysm/Control_Cardaclysm.xaml.cs | 45 ++++++++++++++++++ .../Profiles/Factorio/Control_Factorio.xaml | 5 +- .../Factorio/Control_Factorio.xaml.cs | 8 +++- .../Project-Aurora/Project-Aurora.csproj | 5 +- .../Properties/Resources.Designer.cs | 10 ++++ .../Project-Aurora/Properties/Resources.resx | 3 ++ .../Resources/cardaclysm_64x64.png | Bin 0 -> 4998 bytes .../Project-Aurora/Settings/Configuration.cs | 1 + .../Settings/Control_Settings.xaml | 16 +++++-- .../Settings/Control_Settings.xaml.cs | 28 +++++++++++ SteelSeriesServer | 1 + 17 files changed, 179 insertions(+), 11 deletions(-) create mode 100644 Project-Aurora/Project-Aurora/Profiles/Cardaclysm/CardaclysmApplication.cs create mode 100644 Project-Aurora/Project-Aurora/Profiles/Cardaclysm/Control_Cardaclysm.xaml create mode 100644 Project-Aurora/Project-Aurora/Profiles/Cardaclysm/Control_Cardaclysm.xaml.cs create mode 100644 Project-Aurora/Project-Aurora/Resources/cardaclysm_64x64.png create mode 160000 SteelSeriesServer diff --git a/.gitmodules b/.gitmodules index f8fc18f50..61cd5ad6d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "SBAuroraR.NET"] path = SBAuroraR.NET - url = https://github.com/rajkosto/SBAuroraR.NET.git \ No newline at end of file + url = https://github.com/rajkosto/SBAuroraR.NET.git +[submodule "SteelSeriesServer"] + path = SteelSeriesServer + url = https://github.com/gyorokpeter/SteelSeriesServer.git diff --git a/Project-Aurora/Aurora-Updater/Aurora-Updater.csproj b/Project-Aurora/Aurora-Updater/Aurora-Updater.csproj index c45859826..38e59b0da 100644 --- a/Project-Aurora/Aurora-Updater/Aurora-Updater.csproj +++ b/Project-Aurora/Aurora-Updater/Aurora-Updater.csproj @@ -63,7 +63,7 @@ - 12.0.3 + 13.0.1 0.47.0 diff --git a/Project-Aurora/Project-Aurora.sln b/Project-Aurora/Project-Aurora.sln index 266392fd6..820a9d978 100644 --- a/Project-Aurora/Project-Aurora.sln +++ b/Project-Aurora/Project-Aurora.sln @@ -7,6 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Project-Aurora", "Project-A {A759300D-9550-47BA-8616-C24B6BC05A02} = {A759300D-9550-47BA-8616-C24B6BC05A02} {40085232-ACED-4CBE-945B-90BA8153C151} = {40085232-ACED-4CBE-945B-90BA8153C151} {004D1E3E-F20E-4ECA-ABB1-467D1CE2C173} = {004D1E3E-F20E-4ECA-ABB1-467D1CE2C173} + {87555B4B-E379-4ACC-9899-CAD4CCA227CA} = {87555B4B-E379-4ACC-9899-CAD4CCA227CA} {20259BE1-55C9-4EFB-9D30-C933F621B9D4} = {20259BE1-55C9-4EFB-9D30-C933F621B9D4} EndProjectSection EndProject @@ -27,6 +28,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Plugin-Example", "Plugin-Ex EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SBAuroraReactive", "..\SBAuroraR.NET\SBAuroraReactive\SBAuroraReactive.vcxproj", "{053A704B-5C79-4CDE-B1FC-B952051ACAA0}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SteelSeriesServer", "..\SteelSeriesServer\SteelSeriesServer.csproj", "{87555B4B-E379-4ACC-9899-CAD4CCA227CA}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -65,6 +68,10 @@ Global {053A704B-5C79-4CDE-B1FC-B952051ACAA0}.Debug|x64.Build.0 = Debug|x64 {053A704B-5C79-4CDE-B1FC-B952051ACAA0}.Release|x64.ActiveCfg = Release|x64 {053A704B-5C79-4CDE-B1FC-B952051ACAA0}.Release|x64.Build.0 = Release|x64 + {87555B4B-E379-4ACC-9899-CAD4CCA227CA}.Debug|x64.ActiveCfg = Debug|Any CPU + {87555B4B-E379-4ACC-9899-CAD4CCA227CA}.Debug|x64.Build.0 = Debug|Any CPU + {87555B4B-E379-4ACC-9899-CAD4CCA227CA}.Release|x64.ActiveCfg = Release|Any CPU + {87555B4B-E379-4ACC-9899-CAD4CCA227CA}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Project-Aurora/Project-Aurora/ConfigUI.xaml.cs b/Project-Aurora/Project-Aurora/ConfigUI.xaml.cs index 01133260d..0a5855ace 100755 --- a/Project-Aurora/Project-Aurora/ConfigUI.xaml.cs +++ b/Project-Aurora/Project-Aurora/ConfigUI.xaml.cs @@ -133,6 +133,12 @@ private void CtrlLayerManager_ProfileOverviewRequest(UserControl profile_control SelectedControl = profile_control; } + internal void GoToSteelSeriesPage() + { + DesktopControl_MouseLeftButtonDown(null, null); + settingsControl.tabMain.SelectedIndex = settingsControl.tabMain.Items.IndexOf(settingsControl.devicesAndWrappersPage); + } + private void Layer_manager_NewLayer(Layer layer) { layerPresenter.Layer = layer; diff --git a/Project-Aurora/Project-Aurora/Profiles/Cardaclysm/CardaclysmApplication.cs b/Project-Aurora/Project-Aurora/Profiles/Cardaclysm/CardaclysmApplication.cs new file mode 100644 index 000000000..ccf0836cf --- /dev/null +++ b/Project-Aurora/Project-Aurora/Profiles/Cardaclysm/CardaclysmApplication.cs @@ -0,0 +1,21 @@ +using Aurora.Settings.Layers; + +namespace Aurora.Profiles.Cardaclysm +{ + public class Cardaclysm : Application + { + public Cardaclysm() : base(new LightEventConfig { + Name = "Cardaclysm", + ID = "Cardaclysm", + ProcessNames = new[] { "cardaclysm.exe" }, + ProfileType = typeof(WrapperProfile), + OverviewControlType = typeof(Control_Cardaclysm), + GameStateType = typeof(GameState_Wrapper), + Event = new GameEvent_Generic(), + IconURI = "Resources/cardaclysm_64x64.png" + }) + { + AllowLayer(); + } + } +} diff --git a/Project-Aurora/Project-Aurora/Profiles/Cardaclysm/Control_Cardaclysm.xaml b/Project-Aurora/Project-Aurora/Profiles/Cardaclysm/Control_Cardaclysm.xaml new file mode 100644 index 000000000..098eb05c0 --- /dev/null +++ b/Project-Aurora/Project-Aurora/Profiles/Cardaclysm/Control_Cardaclysm.xaml @@ -0,0 +1,27 @@ + + + + + + + + +