diff --git a/Artemis/Artemis/Artemis.csproj b/Artemis/Artemis/Artemis.csproj index d284a598a..45ae2cfd6 100644 --- a/Artemis/Artemis/Artemis.csproj +++ b/Artemis/Artemis/Artemis.csproj @@ -39,7 +39,7 @@ Artemis Artemis 0 - 1.1.0.0 + 1.1.2.0 false true true diff --git a/Artemis/Artemis/DeviceProviders/Corsair/CorsairRGB.cs b/Artemis/Artemis/DeviceProviders/Corsair/CorsairRGB.cs index 4a8823b27..ddc637a53 100644 --- a/Artemis/Artemis/DeviceProviders/Corsair/CorsairRGB.cs +++ b/Artemis/Artemis/DeviceProviders/Corsair/CorsairRGB.cs @@ -7,17 +7,20 @@ using CUE.NET; using CUE.NET.Brushes; using CUE.NET.Devices.Generic.Enums; using CUE.NET.Devices.Keyboard; +using Ninject.Extensions.Logging; using Point = System.Drawing.Point; namespace Artemis.DeviceProviders.Corsair { public class CorsairRGB : KeyboardProvider { + public ILogger Logger { get; set; } private CorsairKeyboard _keyboard; private ImageBrush _keyboardBrush; - public CorsairRGB() + public CorsairRGB(ILogger logger) { + Logger = logger; Name = "Corsair RGB Keyboards"; CantEnableText = "Couldn't connect to your Corsair keyboard.\n" + "Please check your cables and/or drivers (could be outdated) and that Corsair Utility Engine is running.\n" + @@ -57,6 +60,7 @@ namespace Artemis.DeviceProviders.Corsair PreviewSettings = new PreviewSettings(676, 190, new Thickness(0, -15, 0, 0), Resources.k95); break; case "K70 RGB": + case "K70 RGB RAPIDFIRE": Height = 7; Width = 21; PreviewSettings = new PreviewSettings(676, 210, new Thickness(0, -25, 0, 0), Resources.k70); @@ -72,6 +76,7 @@ namespace Artemis.DeviceProviders.Corsair PreviewSettings = new PreviewSettings(665, 215, new Thickness(0, -5, 0, 0), Resources.strafe); break; } + Logger.Debug("Corsair SDK reported device as: {0}", _keyboard.DeviceInfo.Model); Slug = "corsair-" + _keyboard.DeviceInfo.Model.Replace(' ', '-').ToLower(); _keyboard.Brush = _keyboardBrush ?? (_keyboardBrush = new ImageBrush()); } diff --git a/Artemis/Artemis/Utilities/Updater.cs b/Artemis/Artemis/Utilities/Updater.cs index 39c07a6f6..bc79c9ad3 100644 --- a/Artemis/Artemis/Utilities/Updater.cs +++ b/Artemis/Artemis/Utilities/Updater.cs @@ -15,7 +15,7 @@ namespace Artemis.Utilities { public static class Updater { - public static int CurrentVersion = 111; + public static int CurrentVersion = 112; private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); public static async Task CheckForUpdate(MetroDialogService dialogService) diff --git a/Artemis/Artemis/Views/Flyouts/FlyoutSettingsView.xaml b/Artemis/Artemis/Views/Flyouts/FlyoutSettingsView.xaml index f380927c9..048f1629b 100644 --- a/Artemis/Artemis/Views/Flyouts/FlyoutSettingsView.xaml +++ b/Artemis/Artemis/Views/Flyouts/FlyoutSettingsView.xaml @@ -105,7 +105,7 @@ -