Skip to content

Commit

Permalink
Merge branch 'dev' into feature/discord
Browse files Browse the repository at this point in the history
  • Loading branch information
diogotr7 authored Nov 12, 2019
2 parents 6e9a667 + 3bc061a commit 0ffbf89
Show file tree
Hide file tree
Showing 35 changed files with 1,078 additions and 1,281 deletions.
5 changes: 1 addition & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
[submodule "Wooting.NET"]
path = Wooting.NET
url = https://github.com/simon-wh/Wooting.NET.git
[submodule "SBAuroraR.NET"]
path = SBAuroraR.NET
url = https://github.com/rajkosto/SBAuroraR.NET.git
[submodule "NZXTSharp"]
path = NZXTSharp
url = https://github.com/akmadian/NZXTSharp.git
url = https://github.com/akmadian/NZXTSharp.git
15 changes: 2 additions & 13 deletions Project-Aurora/Project-Aurora.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26228.4
# Visual Studio Version 16
VisualStudioVersion = 16.0.29418.71
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Project-Aurora", "Project-Aurora\Project-Aurora.csproj", "{18D2D471-3F57-4ECE-9C62-836A801473D8}"
ProjectSection(ProjectDependencies) = postProject
Expand Down Expand Up @@ -31,8 +30,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ColorBox", "ColorBox\ColorB
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin-Example", "Plugin-Example\Plugin-Example.csproj", "{DAE33996-53E3-46A3-8F06-CBAF0AFE3708}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wooting.NET", "..\Wooting.NET\Wooting.NET\Wooting.NET.csproj", "{FEA699AE-DB83-43DC-AB85-99F2E90C328F}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SBAuroraReactive", "..\SBAuroraR.NET\SBAuroraReactive\SBAuroraReactive.vcxproj", "{053A704B-5C79-4CDE-B1FC-B952051ACAA0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NZXTSharp", "..\NZXTSharp\NZXTSharp\NZXTSharp.csproj", "{62094023-0479-4DD4-8A74-4321CC0F08DD}"
Expand Down Expand Up @@ -105,14 +102,6 @@ Global
{DAE33996-53E3-46A3-8F06-CBAF0AFE3708}.Release|Any CPU.Build.0 = Release|Any CPU
{DAE33996-53E3-46A3-8F06-CBAF0AFE3708}.Release|x64.ActiveCfg = Release|Any CPU
{DAE33996-53E3-46A3-8F06-CBAF0AFE3708}.Release|x64.Build.0 = Release|Any CPU
{FEA699AE-DB83-43DC-AB85-99F2E90C328F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FEA699AE-DB83-43DC-AB85-99F2E90C328F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FEA699AE-DB83-43DC-AB85-99F2E90C328F}.Debug|x64.ActiveCfg = Debug|Any CPU
{FEA699AE-DB83-43DC-AB85-99F2E90C328F}.Debug|x64.Build.0 = Debug|Any CPU
{FEA699AE-DB83-43DC-AB85-99F2E90C328F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FEA699AE-DB83-43DC-AB85-99F2E90C328F}.Release|Any CPU.Build.0 = Release|Any CPU
{FEA699AE-DB83-43DC-AB85-99F2E90C328F}.Release|x64.ActiveCfg = Release|Any CPU
{FEA699AE-DB83-43DC-AB85-99F2E90C328F}.Release|x64.Build.0 = Release|Any CPU
{053A704B-5C79-4CDE-B1FC-B952051ACAA0}.Debug|Any CPU.ActiveCfg = Debug|Win32
{053A704B-5C79-4CDE-B1FC-B952051ACAA0}.Debug|x64.ActiveCfg = Debug|x64
{053A704B-5C79-4CDE-B1FC-B952051ACAA0}.Debug|x64.Build.0 = Debug|x64
Expand Down
14 changes: 7 additions & 7 deletions Project-Aurora/Project-Aurora/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public static void LogLine(this NLog.Logger logger, string text, Logging_Level l
public static KeyboardLayoutManager kbLayout;
public static Effects effengine;
public static KeyRecorder key_recorder;
public static RzManager razerManager;
public static RzSdkManager razerSdkManager;

/// <summary>
/// Currently held down modifer key
Expand Down Expand Up @@ -326,30 +326,30 @@ protected override void OnStartup(StartupEventArgs e)

Global.key_recorder = new KeyRecorder(Global.InputEvents);

Global.logger.Info("Loading RazerManager");
Global.logger.Info("Loading RazerSdkManager");
if (RzHelper.IsSdkVersionSupported(RzHelper.GetSdkVersion()))
{
try
{
Global.razerManager = new RzManager()
Global.razerSdkManager = new RzSdkManager()
{
KeyboardEnabled = true,
MouseEnabled = true,
MousepadEnabled = true,
AppListEnabled = true,
};

Global.logger.Info("RazerManager loaded successfully!");
Global.logger.Info("RazerSdkManager loaded successfully!");
}
catch (Exception exc)
{
Global.logger.Fatal("RazerManager failed to load!");
Global.logger.Fatal("RazerSdkManager failed to load!");
Global.logger.Fatal(exc.ToString());
}
}
else
{
Global.logger.Warn("Currently installed razer sdk version \"{0}\" is not supported!", RzHelper.GetSdkVersion());
Global.logger.Warn("Currently installed razer sdk version \"{0}\" is not supported by the RazerSdkManager!", RzHelper.GetSdkVersion());
}

Global.logger.Info("Loading Applications");
Expand Down Expand Up @@ -483,7 +483,7 @@ protected override void OnExit(ExitEventArgs e)

try
{
Global.razerManager?.Dispose();
Global.razerSdkManager?.Dispose();
}
catch (Exception exc)
{
Expand Down
1 change: 1 addition & 0 deletions Project-Aurora/Project-Aurora/Devices/DeviceManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ public DeviceManager()
devices.Add(new DeviceContainer(new Devices.YeeLight.YeeLightDevice())); // YeeLight Device
devices.Add(new DeviceContainer(new Devices.Asus.AsusDevice())); // Asus Device
devices.Add(new DeviceContainer(new Devices.NZXT.NZXTDevice())); //NZXT Device
devices.Add(new DeviceContainer(new Devices.Vulcan.VulcanDevice()));

string devices_scripts_path = System.IO.Path.Combine(Global.ExecutingDirectory, "Scripts", "Devices");

Expand Down
Loading

0 comments on commit 0ffbf89

Please sign in to comment.