DarthAffe/Artemis
1
0 Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-11-12 03:48:56 +00:00
Code Issues Releases Wiki Activity

1.11.3.0

Browse Source 
Fixed Logitech support
Upped minimum required Logitech Gaming Software version to 9.0.42
Updated Logitech SDK
This commit is contained in:
SpoinkyNL committed 2018-06-12 22:08:16 +02:00
1 parent 177632d9aa
commit 6ffa0e14c2
4 files changed
+13 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Artemis/Artemis.Installer/HeatGeneratedFileList.wxs
-4
View File
@@ -2,9 +2,6 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment> <Fragment>
<DirectoryRef Id="INSTALLFOLDER"> <DirectoryRef Id="INSTALLFOLDER">
<Component Id="cmp378A752E2F224E90D883D53E28337CAE" Guid="*">
<File Id="fil7C034637F4B3C3E93ACB9990B3AE25CE" KeyPath="yes" Source="$(var.HarvestPath)\artemis-1.11.1.0.zip" />
</Component>
<Component Id="cmp9B04FAC2BF56F13B71858D3F9539F8FE" Guid="*"> <Component Id="cmp9B04FAC2BF56F13B71858D3F9539F8FE" Guid="*">
<File Id="filD726820CC88B0C2D4EF316CD550D5B65" KeyPath="yes" Source="$(var.HarvestPath)\Artemis.exe" /> <File Id="filD726820CC88B0C2D4EF316CD550D5B65" KeyPath="yes" Source="$(var.HarvestPath)\Artemis.exe" />
</Component> </Component>
@@ -213,7 +210,6 @@
</Fragment> </Fragment>
<Fragment> <Fragment>
<ComponentGroup Id="HeatGenerated"> <ComponentGroup Id="HeatGenerated">
<ComponentRef Id="cmp378A752E2F224E90D883D53E28337CAE" />
<ComponentRef Id="cmp9B04FAC2BF56F13B71858D3F9539F8FE" /> <ComponentRef Id="cmp9B04FAC2BF56F13B71858D3F9539F8FE" />
<ComponentRef Id="cmp84F8E8E529BEF2230424503D7A54F566" /> <ComponentRef Id="cmp84F8E8E529BEF2230424503D7A54F566" />
<ComponentRef Id="cmp98E421B03991EBFA9D74DA1DE5FDCEB4" /> <ComponentRef Id="cmp98E421B03991EBFA9D74DA1DE5FDCEB4" />
Artemis/Artemis.Installer/Product.wxs
+1 -1
View File
@@ -2,7 +2,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<Product Id="*" Name="Artemis" Language="1033" Version="1.11.2.0" Manufacturer="SpoinkyNL" UpgradeCode="ebc7bc50-0473-4729-8de8-32ddb99bb986"> <Product Id="*" Name="Artemis" Language="1033" Version="1.11.3.0" Manufacturer="SpoinkyNL" UpgradeCode="ebc7bc50-0473-4729-8de8-32ddb99bb986">
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" /> <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
<MediaTemplate EmbedCab="yes" /> <MediaTemplate EmbedCab="yes" />
Artemis/Artemis/DeviceProviders/Logitech/LogitechKeyboard.cs
+9 -2
View File
@@ -21,11 +21,18 @@ namespace Artemis.DeviceProviders.Logitech
CantEnableText = "Couldn't connect to your Logitech keyboard.\n" + CantEnableText = "Couldn't connect to your Logitech keyboard.\n" +
"Please check your cables and updating the Logitech Gaming Software\n" + "Please check your cables and updating the Logitech Gaming Software\n" +
$"A minimum version of 8.81.15 is required (detected {majorNum}.{minorNum}.{buildNum}).\n\n" + $"A minimum version of 9.0.42 is required (detected {majorNum}.{minorNum}.{buildNum}).\n\n" +
"If the detected version differs from the version LGS is reporting, reinstall LGS or see the FAQ.\n\n" + "If the detected version differs from the version LGS is reporting, reinstall LGS or see the FAQ.\n\n" +
"If needed, you can select a different keyboard in Artemis under settings."; "If needed, you can select a different keyboard in Artemis under settings.";
return majorNum >= 9; // Anything below 9 is a no go
if (majorNum < 9)
return false;
// If on 9.0 require 9.0.42 or higher
if (majorNum == 9 && minorNum == 0)
return buildNum >= 42;
// If higher then 9.0 just wing it ¯\_(ツ)_/¯
return true;
} }
public override void Enable() public override void Enable()
Artemis/Artemis/Properties/AssemblyInfo.cs
+3 -3
View File
@@ -12,7 +12,7 @@ using System.Windows;
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("SpoinkyNL")] [assembly: AssemblyCompany("SpoinkyNL")]
[assembly: AssemblyProduct("Artemis")] [assembly: AssemblyProduct("Artemis")]
[assembly: AssemblyCopyright("Copyright © 2017")] [assembly: AssemblyCopyright("Copyright © 2018")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
@@ -53,6 +53,6 @@ using System.Windows;
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.11.2.0")] [assembly: AssemblyVersion("1.11.3.0")]
[assembly: AssemblyFileVersion("1.11.2.0")] [assembly: AssemblyFileVersion("1.11.3.0")]
[assembly: InternalsVisibleTo("Artemis.Explorables")] [assembly: InternalsVisibleTo("Artemis.Explorables")]