diff --git a/src/Artemis.Core/Artemis.Core.csproj b/src/Artemis.Core/Artemis.Core.csproj index 2d5f2b177..9e94b34a1 100644 --- a/src/Artemis.Core/Artemis.Core.csproj +++ b/src/Artemis.Core/Artemis.Core.csproj @@ -17,6 +17,16 @@ x64 + + 2.0-{chash:6} + true + true + true + v[0-9]* + true + git + true + false @@ -43,6 +53,10 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/src/Artemis.Core/Models/Surface/ArtemisDevice.cs b/src/Artemis.Core/Models/Surface/ArtemisDevice.cs index 62c309168..3cb5f73f0 100644 --- a/src/Artemis.Core/Models/Surface/ArtemisDevice.cs +++ b/src/Artemis.Core/Models/Surface/ArtemisDevice.cs @@ -67,31 +67,51 @@ namespace Artemis.Core.Models.Surface public double X { get => DeviceEntity.X; - set => DeviceEntity.X = value; + set + { + DeviceEntity.X = value; + NotifyOfPropertyChange(nameof(X)); + } } public double Y { get => DeviceEntity.Y; - set => DeviceEntity.Y = value; + set + { + DeviceEntity.Y = value; + NotifyOfPropertyChange(nameof(Y)); + } } public double Rotation { get => DeviceEntity.Rotation; - set => DeviceEntity.Rotation = value; + set + { + DeviceEntity.Rotation = value; + NotifyOfPropertyChange(nameof(Rotation)); + } } public double Scale { get => DeviceEntity.Scale; - set => DeviceEntity.Scale = value; + set + { + DeviceEntity.Scale = value; + NotifyOfPropertyChange(nameof(Scale)); + } } public int ZIndex { get => DeviceEntity.ZIndex; - set => DeviceEntity.ZIndex = value; + set + { + DeviceEntity.ZIndex = value; + NotifyOfPropertyChange(nameof(ZIndex)); + } } public override string ToString() diff --git a/src/Artemis.Core/Services/CoreService.cs b/src/Artemis.Core/Services/CoreService.cs index 2d3855246..4fb246a6a 100644 --- a/src/Artemis.Core/Services/CoreService.cs +++ b/src/Artemis.Core/Services/CoreService.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; using System.Diagnostics; +using System.Reflection; using Artemis.Core.Events; using Artemis.Core.Exceptions; using Artemis.Core.JsonConverters; using Artemis.Core.Ninject; -using Artemis.Core.Plugins.Abstract; using Artemis.Core.Plugins.Models; using Artemis.Core.Services.Interfaces; using Artemis.Core.Services.Storage.Interfaces; @@ -15,6 +15,7 @@ using RGB.NET.Core; using Serilog; using Serilog.Events; using SkiaSharp; +using Module = Artemis.Core.Plugins.Abstract.Module; namespace Artemis.Core.Services { @@ -73,7 +74,8 @@ namespace Artemis.Core.Services if (IsInitialized) throw new ArtemisCoreException("Cannot initialize the core as it is already initialized."); - _logger.Information("Initializing Artemis Core version {version}", typeof(CoreService).Assembly.GetName().Version); + var versionAttribute = typeof(CoreService).Assembly.GetCustomAttribute(); + _logger.Information("Initializing Artemis Core version {version}", versionAttribute?.InformationalVersion); ApplyLoggingLevel(); // Initialize the services diff --git a/src/Artemis.Core/Services/PluginService.cs b/src/Artemis.Core/Services/PluginService.cs index 9ef9dd508..17c0ed90b 100644 --- a/src/Artemis.Core/Services/PluginService.cs +++ b/src/Artemis.Core/Services/PluginService.cs @@ -75,8 +75,7 @@ namespace Artemis.Core.Services var metadataFile = Path.Combine(match.FullName, "plugin.json"); if (!File.Exists(metadataFile)) { - _logger.Information("Copying missing built-in plugin {name} version: {version}", - builtInPluginInfo.Name, builtInPluginInfo.Version); + _logger.Debug("Copying missing built-in plugin {builtInPluginInfo}", builtInPluginInfo); CopyBuiltInPlugin(subDirectory); } else @@ -88,15 +87,13 @@ namespace Artemis.Core.Services #if DEBUG if (builtInPluginInfo.Version >= pluginInfo.Version) { - _logger.Information("Copying updated built-in plugin {name} version: {version} (old version: {oldVersion})", - builtInPluginInfo.Name, builtInPluginInfo.Version, pluginInfo.Version); + _logger.Debug("Copying updated built-in plugin {builtInPluginInfo}", builtInPluginInfo); CopyBuiltInPlugin(subDirectory); } #else - if (builtInPluginInfo.Version > pluginInfo.Version) + if (builtInPluginInfo.Version > pluginInfo.Version) { - _logger.Information("Copying updated built-in plugin {name} version: {version} (old version: {oldVersion})", - builtInPluginInfo.Name, builtInPluginInfo.Version, pluginInfo.Version); + _logger.Debug("Copying updated built-in plugin from {pluginInfo} to {builtInPluginInfo}", pluginInfo, builtInPluginInfo); CopyBuiltInPlugin(subDirectory); } #endif @@ -139,6 +136,8 @@ namespace Artemis.Core.Services // Locate the main entry var pluginInfo = JsonConvert.DeserializeObject(File.ReadAllText(metadataFile)); pluginInfo.Directory = subDirectory; + + _logger.Debug("Loading plugin {pluginInfo}", pluginInfo); OnPluginLoading(new PluginEventArgs(pluginInfo)); LoadPlugin(pluginInfo); } @@ -165,11 +164,12 @@ namespace Artemis.Core.Services var threwException = false; try { + _logger.Debug("Enabling plugin {pluginInfo}", pluginInfo); pluginInfo.Instance.SetEnabled(true); } catch (Exception e) { - _logger.Warning(new ArtemisPluginException(pluginInfo, "Failed to load enable plugin", e), "Plugin exception"); + _logger.Warning(new ArtemisPluginException(pluginInfo, "Failed to enable plugin", e), "Plugin exception"); pluginInfo.Enabled = false; threwException = true; } diff --git a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj index 4a1745b00..c456eb1e2 100644 --- a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj +++ b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj @@ -18,6 +18,16 @@ pdbonly + + 2.0-{chash:6} + true + true + true + v[0-9]* + true + git + true + @@ -35,6 +45,10 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/src/Artemis.UI/Screens/RootViewModel.cs b/src/Artemis.UI/Screens/RootViewModel.cs index 62bacff72..b70172f9d 100644 --- a/src/Artemis.UI/Screens/RootViewModel.cs +++ b/src/Artemis.UI/Screens/RootViewModel.cs @@ -93,10 +93,7 @@ namespace Artemis.UI.Screens private void UpdateWindowTitle() { var versionAttribute = typeof(RootViewModel).Assembly.GetCustomAttribute(); - if (versionAttribute != null) - WindowTitle = $"Artemis {versionAttribute.InformationalVersion} - Frame time: {_coreService.FrameTime.TotalMilliseconds:F2} ms"; - else - WindowTitle = $"Artemis - Frame time: {_coreService.FrameTime.TotalMilliseconds:F2} ms"; + WindowTitle = $"Artemis {versionAttribute?.InformationalVersion} - Frame time: {_coreService.FrameTime.TotalMilliseconds:F2} ms"; } private void SidebarViewModelOnPropertyChanged(object sender, PropertyChangedEventArgs e) diff --git a/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Memory/DOMINATORPLATINUMRGB.png b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Memory/DOMINATORPLATINUMRGB.png new file mode 100644 index 000000000..efd2c11ee Binary files /dev/null and b/src/Plugins/Artemis.Plugins.Devices.Corsair/Images/Corsair/Memory/DOMINATORPLATINUMRGB.png differ diff --git a/src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Memory/DOMINATORPLATINUMRGB.xml b/src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Memory/DOMINATORPLATINUMRGB.xml new file mode 100644 index 000000000..c10b4516c --- /dev/null +++ b/src/Plugins/Artemis.Plugins.Devices.Corsair/Layouts/Corsair/Memory/DOMINATORPLATINUMRGB.xml @@ -0,0 +1,170 @@ + + + Corsair Dominator Platinum RGB + Physical layout of Corsairs Dominator Platinum RGB + DRAM + Key + Corsair + GLAIVE RGB + 9 + 135 + 6 + 6 + Images\Corsair\Memory + DOMINATORPLATINUMRGB.png + + + 1.5 + 10.5 + 1 + + + = + +1.6 + + + = + +1.2 + + + = + +1.7 + + + = + +1.3 + + + = + +5.5 + 2.4 + + + = + + + 2.4 + + + = + +5.3 + + + = + +1.8 + + + = + +1.8 + + + = + +1.5 + + + = + +1.8 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file