diff --git a/src/Artemis.Core/Artemis.Core.csproj b/src/Artemis.Core/Artemis.Core.csproj index 4e3c28780..7cecd25e8 100644 --- a/src/Artemis.Core/Artemis.Core.csproj +++ b/src/Artemis.Core/Artemis.Core.csproj @@ -42,17 +42,17 @@ ..\packages\HidSharp.1.5\lib\net35\HidSharp.dll - - ..\packages\Microsoft.CodeAnalysis.Common.2.6.1\lib\netstandard1.3\Microsoft.CodeAnalysis.dll + + ..\packages\Microsoft.CodeAnalysis.Common.2.7.0\lib\netstandard1.3\Microsoft.CodeAnalysis.dll - - ..\packages\Microsoft.CodeAnalysis.CSharp.2.6.1\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll + + ..\packages\Microsoft.CodeAnalysis.CSharp.2.7.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll - - ..\packages\Microsoft.CodeAnalysis.CSharp.Scripting.2.6.1\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.Scripting.dll + + ..\packages\Microsoft.CodeAnalysis.CSharp.Scripting.2.7.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.Scripting.dll - - ..\packages\Microsoft.CodeAnalysis.Scripting.Common.2.6.1\lib\netstandard1.3\Microsoft.CodeAnalysis.Scripting.dll + + ..\packages\Microsoft.CodeAnalysis.Scripting.Common.2.7.0\lib\netstandard1.3\Microsoft.CodeAnalysis.Scripting.dll ..\packages\Microsoft.EntityFrameworkCore.2.0.2\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll @@ -85,7 +85,7 @@ ..\packages\CS-Script.bin.3.28.2.0\lib\net46\Mono.CSharp.dll - ..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll ..\packages\Ninject.3.3.4\lib\net45\Ninject.dll @@ -96,50 +96,41 @@ ..\packages\Ninject.Extensions.Factory.3.3.2\lib\net45\Ninject.Extensions.Factory.dll - - ..\packages\Remotion.Linq.2.1.1\lib\net45\Remotion.Linq.dll + + ..\packages\Remotion.Linq.2.2.0\lib\net45\Remotion.Linq.dll - ..\packages\RGB.NET.Brushes.0.0.1.48\lib\net45\RGB.NET.Brushes.dll + ..\packages\RGB.NET.Brushes.0.0.1.49\lib\net45\RGB.NET.Brushes.dll - ..\packages\RGB.NET.Core.0.0.1.48\lib\net45\RGB.NET.Core.dll + ..\packages\RGB.NET.Core.0.0.1.49\lib\net45\RGB.NET.Core.dll - ..\packages\RGB.NET.Decorators.0.0.1.48\lib\net45\RGB.NET.Decorators.dll + ..\packages\RGB.NET.Decorators.0.0.1.49\lib\net45\RGB.NET.Decorators.dll - ..\packages\RGB.NET.Devices.Asus.0.0.1.48\lib\net45\RGB.NET.Devices.Asus.dll + ..\packages\RGB.NET.Devices.Asus.0.0.1.49\lib\net45\RGB.NET.Devices.Asus.dll - ..\packages\RGB.NET.Devices.CoolerMaster.0.0.1.48\lib\net45\RGB.NET.Devices.CoolerMaster.dll + ..\packages\RGB.NET.Devices.CoolerMaster.0.0.1.49\lib\net45\RGB.NET.Devices.CoolerMaster.dll - ..\packages\RGB.NET.Devices.Corsair.0.0.1.48\lib\net45\RGB.NET.Devices.Corsair.dll + ..\packages\RGB.NET.Devices.Corsair.0.0.1.49\lib\net45\RGB.NET.Devices.Corsair.dll - ..\packages\RGB.NET.Devices.DMX.0.0.1.48\lib\net45\RGB.NET.Devices.DMX.dll + ..\packages\RGB.NET.Devices.DMX.0.0.1.49\lib\net45\RGB.NET.Devices.DMX.dll - ..\packages\RGB.NET.Devices.Logitech.0.0.1.48\lib\net45\RGB.NET.Devices.Logitech.dll - - - ..\packages\RGB.NET.Devices.Msi.0.0.1.38\lib\net45\RGB.NET.Devices.Msi.dll + ..\packages\RGB.NET.Devices.Logitech.0.0.1.49\lib\net45\RGB.NET.Devices.Logitech.dll - ..\packages\RGB.NET.Devices.Novation.0.0.1.48\lib\net45\RGB.NET.Devices.Novation.dll + ..\packages\RGB.NET.Devices.Novation.0.0.1.49\lib\net45\RGB.NET.Devices.Novation.dll - ..\packages\RGB.NET.Devices.Razer.0.0.1.48\lib\net45\RGB.NET.Devices.Razer.dll + ..\packages\RGB.NET.Devices.Razer.0.0.1.49\lib\net45\RGB.NET.Devices.Razer.dll - ..\packages\RGB.NET.Groups.0.0.1.48\lib\net45\RGB.NET.Groups.dll - - - ..\packages\RGB.NET.Input.0.0.1.38\lib\net45\RGB.NET.Input.dll - - - ..\packages\RGB.NET.Input.Corsair.0.0.1.42\lib\net45\RGB.NET.Input.Corsair.dll + ..\packages\RGB.NET.Groups.0.0.1.49\lib\net45\RGB.NET.Groups.dll ..\packages\Sanford.Multimedia.Midi.6.6.0\lib\net20\Sanford.Multimedia.Midi.dll @@ -156,7 +147,7 @@ ..\packages\System.Collections.Immutable.1.4.0\lib\netstandard2.0\System.Collections.Immutable.dll - ..\packages\System.ComponentModel.Annotations.4.4.0\lib\net461\System.ComponentModel.Annotations.dll + ..\packages\System.ComponentModel.Annotations.4.4.1\lib\net461\System.ComponentModel.Annotations.dll @@ -299,11 +290,21 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + + + + + + + + + + + \ No newline at end of file diff --git a/src/Artemis.Core/Services/RgbService.cs b/src/Artemis.Core/Services/RgbService.cs index ed59aebb5..32e599d65 100644 --- a/src/Artemis.Core/Services/RgbService.cs +++ b/src/Artemis.Core/Services/RgbService.cs @@ -21,7 +21,9 @@ namespace Artemis.Core.Services // Let's throw these for now Surface.Exception += SurfaceOnException; - Surface.UpdateMode = UpdateMode.Continuous; + + var updateTrigger = new TimerUpdateTrigger {UpdateFrequency = 1.0 / 30}; + Surface.RegisterUpdateTrigger(updateTrigger); } /// @@ -50,8 +52,6 @@ namespace Artemis.Core.Services // TODO SpoinkyNL 8-1-18: Load alignment Surface.AlignDevices(); - - Surface.UpdateMode = UpdateMode.Continuous; }); OnFinishedLoadedDevices(); diff --git a/src/Artemis.Core/app.config b/src/Artemis.Core/app.config index 605f36b95..a91462552 100644 --- a/src/Artemis.Core/app.config +++ b/src/Artemis.Core/app.config @@ -20,19 +20,19 @@ - + - + - + - + @@ -40,19 +40,19 @@ - + - + - + - + @@ -60,7 +60,7 @@ - + @@ -74,6 +74,14 @@ + + + + + + + + diff --git a/src/Artemis.Core/packages.config b/src/Artemis.Core/packages.config index 30507053e..c9b8a56bc 100644 --- a/src/Artemis.Core/packages.config +++ b/src/Artemis.Core/packages.config @@ -4,10 +4,10 @@ - - - - + + + + @@ -17,35 +17,45 @@ - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -61,8 +71,8 @@ - - + + diff --git a/src/Artemis.Plugins.BuiltIn/Artemis.Plugins.BuiltIn.csproj b/src/Artemis.Plugins.BuiltIn/Artemis.Plugins.BuiltIn.csproj index 7cec15d25..66453b0bd 100644 --- a/src/Artemis.Plugins.BuiltIn/Artemis.Plugins.BuiltIn.csproj +++ b/src/Artemis.Plugins.BuiltIn/Artemis.Plugins.BuiltIn.csproj @@ -11,6 +11,8 @@ Artemis.Plugins.BuiltIn v4.6.1 512 + + true @@ -31,10 +33,46 @@ 4 + + ..\packages\HidSharp.1.5\lib\net35\HidSharp.dll + + + ..\packages\RGB.NET.Brushes.0.0.1.49\lib\net45\RGB.NET.Brushes.dll + - ..\packages\RGB.NET.Core.0.0.1.48\lib\net45\RGB.NET.Core.dll + ..\packages\RGB.NET.Core.0.0.1.49\lib\net45\RGB.NET.Core.dll + + + ..\packages\RGB.NET.Decorators.0.0.1.49\lib\net45\RGB.NET.Decorators.dll + + + ..\packages\RGB.NET.Devices.Asus.0.0.1.49\lib\net45\RGB.NET.Devices.Asus.dll + + + ..\packages\RGB.NET.Devices.CoolerMaster.0.0.1.49\lib\net45\RGB.NET.Devices.CoolerMaster.dll + + + ..\packages\RGB.NET.Devices.Corsair.0.0.1.49\lib\net45\RGB.NET.Devices.Corsair.dll + + + ..\packages\RGB.NET.Devices.DMX.0.0.1.49\lib\net45\RGB.NET.Devices.DMX.dll + + + ..\packages\RGB.NET.Devices.Logitech.0.0.1.49\lib\net45\RGB.NET.Devices.Logitech.dll + + + ..\packages\RGB.NET.Devices.Novation.0.0.1.49\lib\net45\RGB.NET.Devices.Novation.dll + + + ..\packages\RGB.NET.Devices.Razer.0.0.1.49\lib\net45\RGB.NET.Devices.Razer.dll + + + ..\packages\RGB.NET.Groups.0.0.1.49\lib\net45\RGB.NET.Groups.dll + + + ..\packages\Sanford.Multimedia.Midi.6.6.0\lib\net20\Sanford.Multimedia.Midi.dll ..\packages\Stylet.1.1.21\lib\net45\Stylet.dll @@ -77,4 +115,21 @@ + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Artemis.Plugins.BuiltIn/app.config b/src/Artemis.Plugins.BuiltIn/app.config index 547ac4d3e..e42778948 100644 --- a/src/Artemis.Plugins.BuiltIn/app.config +++ b/src/Artemis.Plugins.BuiltIn/app.config @@ -5,7 +5,7 @@ - + @@ -13,15 +13,15 @@ - + - + - + @@ -29,7 +29,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -57,15 +57,15 @@ - + - + - + @@ -75,6 +75,14 @@ + + + + + + + + \ No newline at end of file diff --git a/src/Artemis.Plugins.BuiltIn/packages.config b/src/Artemis.Plugins.BuiltIn/packages.config index 553a252cf..8fd1e9d7b 100644 --- a/src/Artemis.Plugins.BuiltIn/packages.config +++ b/src/Artemis.Plugins.BuiltIn/packages.config @@ -1,6 +1,34 @@  - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Artemis.UI/App.config b/src/Artemis.UI/App.config index 7d73a5c5e..d8acc4051 100644 --- a/src/Artemis.UI/App.config +++ b/src/Artemis.UI/App.config @@ -20,11 +20,11 @@ - + - + @@ -32,11 +32,11 @@ - + - + @@ -44,19 +44,19 @@ - + - + - + - + @@ -64,7 +64,7 @@ - + @@ -78,6 +78,14 @@ + + + + + + + + \ No newline at end of file diff --git a/src/Artemis.UI/Artemis.UI.csproj b/src/Artemis.UI/Artemis.UI.csproj index 8c39bb877..e8a3b86ad 100644 --- a/src/Artemis.UI/Artemis.UI.csproj +++ b/src/Artemis.UI/Artemis.UI.csproj @@ -35,6 +35,7 @@ prompt 4 + ..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll @@ -45,8 +46,8 @@ ..\packages\HidSharp.1.5\lib\net35\HidSharp.dll - - ..\packages\MahApps.Metro.1.6.0\lib\net45\MahApps.Metro.dll + + ..\packages\MahApps.Metro.1.6.1\lib\net45\MahApps.Metro.dll ..\packages\MaterialDesignColors.1.1.3\lib\net45\MaterialDesignColors.dll @@ -54,8 +55,8 @@ ..\packages\MaterialDesignThemes.MahApps.0.0.11\lib\net45\MaterialDesignThemes.MahApps.dll - - ..\packages\MaterialDesignThemes.2.3.1.953\lib\net45\MaterialDesignThemes.Wpf.dll + + ..\packages\MaterialDesignThemes.2.4.0.1044\lib\net45\MaterialDesignThemes.Wpf.dll ..\packages\Ninject.3.3.4\lib\net45\Ninject.dll @@ -66,50 +67,41 @@ ..\packages\Ninject.Extensions.Factory.3.3.2\lib\net45\Ninject.Extensions.Factory.dll - - ..\packages\PropertyChanged.Fody.2.2.6\lib\net452\PropertyChanged.dll + + ..\packages\PropertyChanged.Fody.2.4.0\lib\net452\PropertyChanged.dll - ..\packages\RGB.NET.Brushes.0.0.1.48\lib\net45\RGB.NET.Brushes.dll + ..\packages\RGB.NET.Brushes.0.0.1.49\lib\net45\RGB.NET.Brushes.dll - ..\packages\RGB.NET.Core.0.0.1.48\lib\net45\RGB.NET.Core.dll + ..\packages\RGB.NET.Core.0.0.1.49\lib\net45\RGB.NET.Core.dll - ..\packages\RGB.NET.Decorators.0.0.1.48\lib\net45\RGB.NET.Decorators.dll + ..\packages\RGB.NET.Decorators.0.0.1.49\lib\net45\RGB.NET.Decorators.dll - ..\packages\RGB.NET.Devices.Asus.0.0.1.48\lib\net45\RGB.NET.Devices.Asus.dll + ..\packages\RGB.NET.Devices.Asus.0.0.1.49\lib\net45\RGB.NET.Devices.Asus.dll - ..\packages\RGB.NET.Devices.CoolerMaster.0.0.1.48\lib\net45\RGB.NET.Devices.CoolerMaster.dll + ..\packages\RGB.NET.Devices.CoolerMaster.0.0.1.49\lib\net45\RGB.NET.Devices.CoolerMaster.dll - ..\packages\RGB.NET.Devices.Corsair.0.0.1.48\lib\net45\RGB.NET.Devices.Corsair.dll + ..\packages\RGB.NET.Devices.Corsair.0.0.1.49\lib\net45\RGB.NET.Devices.Corsair.dll - ..\packages\RGB.NET.Devices.DMX.0.0.1.48\lib\net45\RGB.NET.Devices.DMX.dll + ..\packages\RGB.NET.Devices.DMX.0.0.1.49\lib\net45\RGB.NET.Devices.DMX.dll - ..\packages\RGB.NET.Devices.Logitech.0.0.1.48\lib\net45\RGB.NET.Devices.Logitech.dll - - - ..\packages\RGB.NET.Devices.Msi.0.0.1.38\lib\net45\RGB.NET.Devices.Msi.dll + ..\packages\RGB.NET.Devices.Logitech.0.0.1.49\lib\net45\RGB.NET.Devices.Logitech.dll - ..\packages\RGB.NET.Devices.Novation.0.0.1.48\lib\net45\RGB.NET.Devices.Novation.dll + ..\packages\RGB.NET.Devices.Novation.0.0.1.49\lib\net45\RGB.NET.Devices.Novation.dll - ..\packages\RGB.NET.Devices.Razer.0.0.1.48\lib\net45\RGB.NET.Devices.Razer.dll + ..\packages\RGB.NET.Devices.Razer.0.0.1.49\lib\net45\RGB.NET.Devices.Razer.dll - ..\packages\RGB.NET.Groups.0.0.1.48\lib\net45\RGB.NET.Groups.dll - - - ..\packages\RGB.NET.Input.0.0.1.38\lib\net45\RGB.NET.Input.dll - - - ..\packages\RGB.NET.Input.Corsair.0.0.1.42\lib\net45\RGB.NET.Input.Corsair.dll + ..\packages\RGB.NET.Groups.0.0.1.49\lib\net45\RGB.NET.Groups.dll ..\packages\Sanford.Multimedia.Midi.6.6.0\lib\net20\Sanford.Multimedia.Midi.dll @@ -251,13 +243,23 @@ echo Copying built-in plugins... xcopy /s /y /q $(SolutionDir)Artemis.Plugins.BuiltIn\Modules %25ProgramData%25\Artemis\plugins - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + + + + + + - + + + + + + + \ No newline at end of file diff --git a/src/Artemis.UI/packages.config b/src/Artemis.UI/packages.config index fbac0ff0e..23ff11d46 100644 --- a/src/Artemis.UI/packages.config +++ b/src/Artemis.UI/packages.config @@ -2,33 +2,43 @@ - + - + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +