1
0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00

Fixed up Corsair things and updated CUE.Net

This commit is contained in:
Logan Saso 2016-02-20 15:57:37 -08:00
parent c1c6c2420e
commit 73bfcd0422
5 changed files with 341 additions and 365 deletions

View File

@ -1,255 +1,230 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<configSections> <configSections>
<sectionGroup name="userSettings" <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <section name="Artemis.Modules.Games.RocketLeague.RocketLeague" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="Artemis.Modules.Games.RocketLeague.RocketLeague" <section name="Artemis.Settings.Offsets" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" <section name="Artemis.Modules.Games.Witcher3.Witcher3" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
allowExeDefinition="MachineToLocalUser" requirePermission="false" /> <section name="Artemis.Modules.Effects.AudioVisualizer.AudioVisualization" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="Artemis.Settings.Offsets" <section name="Artemis.Modules.Games.CounterStrike.CounterStrike" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" <section name="Artemis.Settings.CounterStrike" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
allowExeDefinition="MachineToLocalUser" requirePermission="false" /> <section name="Artemis.Settings.VolumeDisplay" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="Artemis.Modules.Games.Witcher3.Witcher3" <section name="Artemis.Settings.AudioVisualization" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" <section name="Artemis.Settings.RocketLeague" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
allowExeDefinition="MachineToLocalUser" requirePermission="false" /> <section name="Artemis.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="Artemis.Modules.Effects.AudioVisualizer.AudioVisualization" <section name="Artemis.Settings.TypeWave" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" <section name="Artemis.Settings.General" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
allowExeDefinition="MachineToLocalUser" requirePermission="false" /> </sectionGroup>
<section name="Artemis.Modules.Games.CounterStrike.CounterStrike" </configSections>
type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" <connectionStrings />
allowExeDefinition="MachineToLocalUser" requirePermission="false" /> <startup>
<section name="Artemis.Settings.CounterStrike" <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" </startup>
allowExeDefinition="MachineToLocalUser" requirePermission="false" /> <userSettings>
<section name="Artemis.Settings.VolumeDisplay" <Artemis.Modules.Games.RocketLeague.RocketLeague>
type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" <setting name="Enabled" serializeAs="String">
allowExeDefinition="MachineToLocalUser" requirePermission="false" /> <value>True</value>
<section name="Artemis.Settings.AudioVisualization" </setting>
type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" <setting name="MainColor" serializeAs="String">
allowExeDefinition="MachineToLocalUser" requirePermission="false" /> <value>#FFFF5000</value>
<section name="Artemis.Settings.RocketLeague" </setting>
type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" <setting name="SecondaryColor" serializeAs="String">
allowExeDefinition="MachineToLocalUser" requirePermission="false" /> <value>#FFFF0000</value>
<section name="Artemis.Properties.Settings" </setting>
type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" </Artemis.Modules.Games.RocketLeague.RocketLeague>
allowExeDefinition="MachineToLocalUser" requirePermission="false" /> <Artemis.Settings.Offsets>
<section name="Artemis.Settings.TypeWave" <setting name="RocketLeague" serializeAs="String">
type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" <value>{"Game":"RocketLeague","GameVersion":"1.10","GameAddresses":[{"Description":"Boost","BasePointer":{"value":21998084},"Offsets":[88,1452,1780,540]}]}</value>
allowExeDefinition="MachineToLocalUser" requirePermission="false" /> </setting>
<section name="Artemis.Settings.General" <setting name="Witcher3" serializeAs="String">
type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" <value>{"Game":"Witcher3","GameVersion":"1.11","GameAddresses":[{"Description":"Sign","BasePointer":{"value":42942304},"Offsets":[40,16,32,3008]}]}</value>
allowExeDefinition="MachineToLocalUser" requirePermission="false" /> </setting>
</sectionGroup> </Artemis.Settings.Offsets>
</configSections> <Artemis.Modules.Games.Witcher3.Witcher3>
<connectionStrings /> <setting name="Enabled" serializeAs="String">
<startup> <value>True</value>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /> </setting>
</startup> </Artemis.Modules.Games.Witcher3.Witcher3>
<userSettings> <Artemis.Modules.Effects.AudioVisualizer.AudioVisualization>
<Artemis.Modules.Games.RocketLeague.RocketLeague> <setting name="Sensitivity" serializeAs="String">
<setting name="Enabled" serializeAs="String"> <value>4</value>
<value>True</value> </setting>
</setting> <setting name="Bars" serializeAs="String">
<setting name="MainColor" serializeAs="String"> <value>21</value>
<value>#FFFF5000</value> </setting>
</setting> <setting name="FromBottom" serializeAs="String">
<setting name="SecondaryColor" serializeAs="String"> <value>True</value>
<value>#FFFF0000</value> </setting>
</setting> <setting name="FadeSpeed" serializeAs="String">
</Artemis.Modules.Games.RocketLeague.RocketLeague> <value>3</value>
<Artemis.Settings.Offsets> </setting>
<setting name="RocketLeague" serializeAs="String"> <setting name="TopColor" serializeAs="String">
<value>{"Game":"RocketLeague","GameVersion":"1.10","GameAddresses":[{"Description":"Boost","BasePointer":{"value":21998084},"Offsets":[88,1452,1780,540]}]}</value> <value>#FFF90000</value>
</setting> </setting>
<setting name="Witcher3" serializeAs="String"> <setting name="MiddleColor" serializeAs="String">
<value>{"Game":"Witcher3","GameVersion":"1.11","GameAddresses":[{"Description":"Sign","BasePointer":{"value":42942304},"Offsets":[40,16,32,3008]}]}</value> <value>#FFFF761E</value>
</setting> </setting>
</Artemis.Settings.Offsets> <setting name="BottomColor" serializeAs="String">
<Artemis.Modules.Games.Witcher3.Witcher3> <value>#FF00DF00</value>
<setting name="Enabled" serializeAs="String"> </setting>
<value>True</value> </Artemis.Modules.Effects.AudioVisualizer.AudioVisualization>
</setting> <Artemis.Modules.Games.CounterStrike.CounterStrike>
</Artemis.Modules.Games.Witcher3.Witcher3> <setting name="GameDirectory" serializeAs="String">
<Artemis.Modules.Effects.AudioVisualizer.AudioVisualization> <value />
<setting name="Sensitivity" serializeAs="String"> </setting>
<value>4</value> <setting name="AmmoEnabled" serializeAs="String">
</setting> <value>True</value>
<setting name="Bars" serializeAs="String"> </setting>
<value>21</value> <setting name="AmmoMainColor" serializeAs="String">
</setting> <value>#FFFF2900</value>
<setting name="FromBottom" serializeAs="String"> </setting>
<value>True</value> <setting name="AmmoSecondaryColor" serializeAs="String">
</setting> <value>#FF26F600</value>
<setting name="FadeSpeed" serializeAs="String"> </setting>
<value>3</value> <setting name="TeamColorEnabled" serializeAs="String">
</setting> <value>True</value>
<setting name="TopColor" serializeAs="String"> </setting>
<value>#FFF90000</value> <setting name="FlashEnabled" serializeAs="String">
</setting> <value>True</value>
<setting name="MiddleColor" serializeAs="String"> </setting>
<value>#FFFF761E</value> <setting name="SmokeEnabled" serializeAs="String">
</setting> <value>True</value>
<setting name="BottomColor" serializeAs="String"> </setting>
<value>#FF00DF00</value> <setting name="LowHpEnabled" serializeAs="String">
</setting> <value>True</value>
</Artemis.Modules.Effects.AudioVisualizer.AudioVisualization> </setting>
<Artemis.Modules.Games.CounterStrike.CounterStrike> <setting name="Enabled" serializeAs="String">
<setting name="GameDirectory" serializeAs="String"> <value>True</value>
<value /> </setting>
</setting> </Artemis.Modules.Games.CounterStrike.CounterStrike>
<setting name="AmmoEnabled" serializeAs="String"> <Artemis.Settings.CounterStrike>
<value>True</value> <setting name="GameDirectory" serializeAs="String">
</setting> <value>C:\Program Files (x86)\Steam\steamapps\common\Counter-Strike Global Offensive</value>
<setting name="AmmoMainColor" serializeAs="String"> </setting>
<value>#FFFF2900</value> <setting name="AmmoEnabled" serializeAs="String">
</setting> <value>True</value>
<setting name="AmmoSecondaryColor" serializeAs="String"> </setting>
<value>#FF26F600</value> <setting name="AmmoMainColor" serializeAs="String">
</setting> <value>#FFFF2900</value>
<setting name="TeamColorEnabled" serializeAs="String"> </setting>
<value>True</value> <setting name="AmmoSecondaryColor" serializeAs="String">
</setting> <value>#FF26F600</value>
<setting name="FlashEnabled" serializeAs="String"> </setting>
<value>True</value> <setting name="TeamColorEnabled" serializeAs="String">
</setting> <value>True</value>
<setting name="SmokeEnabled" serializeAs="String"> </setting>
<value>True</value> <setting name="FlashEnabled" serializeAs="String">
</setting> <value>True</value>
<setting name="LowHpEnabled" serializeAs="String"> </setting>
<value>True</value> <setting name="SmokeEnabled" serializeAs="String">
</setting> <value>True</value>
<setting name="Enabled" serializeAs="String"> </setting>
<value>True</value> <setting name="LowHpEnabled" serializeAs="String">
</setting> <value>True</value>
</Artemis.Modules.Games.CounterStrike.CounterStrike> </setting>
<Artemis.Settings.CounterStrike> </Artemis.Settings.CounterStrike>
<setting name="GameDirectory" serializeAs="String"> <Artemis.Settings.VolumeDisplay>
<value>C:\Program Files (x86)\Steam\steamapps\common\Counter-Strike Global Offensive</value> <setting name="MainColor" serializeAs="String">
</setting> <value>#FFFF2900</value>
<setting name="AmmoEnabled" serializeAs="String"> </setting>
<value>True</value> <setting name="SecondaryColor" serializeAs="String">
</setting> <value>#FF26F600</value>
<setting name="AmmoMainColor" serializeAs="String"> </setting>
<value>#FFFF2900</value> <setting name="Enabled" serializeAs="String">
</setting> <value>True</value>
<setting name="AmmoSecondaryColor" serializeAs="String"> </setting>
<value>#FF26F600</value> </Artemis.Settings.VolumeDisplay>
</setting> <Artemis.Settings.AudioVisualization>
<setting name="TeamColorEnabled" serializeAs="String"> <setting name="Sensitivity" serializeAs="String">
<value>True</value> <value>4</value>
</setting> </setting>
<setting name="FlashEnabled" serializeAs="String"> <setting name="Bars" serializeAs="String">
<value>True</value> <value>21</value>
</setting> </setting>
<setting name="SmokeEnabled" serializeAs="String"> <setting name="Spread" serializeAs="String">
<value>True</value> <value>1</value>
</setting> </setting>
<setting name="LowHpEnabled" serializeAs="String"> <setting name="FadeSpeed" serializeAs="String">
<value>True</value> <value>3</value>
</setting> </setting>
</Artemis.Settings.CounterStrike> <setting name="MainColor" serializeAs="String">
<Artemis.Settings.VolumeDisplay> <value>#FF0000FF</value>
<setting name="MainColor" serializeAs="String"> </setting>
<value>#FFFF2900</value> <setting name="SecondaryColor" serializeAs="String">
</setting> <value>#FF1E90FF</value>
<setting name="SecondaryColor" serializeAs="String"> </setting>
<value>#FF26F600</value> </Artemis.Settings.AudioVisualization>
</setting> <Artemis.Settings.RocketLeague>
<setting name="Enabled" serializeAs="String"> <setting name="Enabled" serializeAs="String">
<value>True</value> <value>False</value>
</setting> </setting>
</Artemis.Settings.VolumeDisplay> <setting name="MainColor" serializeAs="String">
<Artemis.Settings.AudioVisualization> <value>#FFFF5000</value>
<setting name="Sensitivity" serializeAs="String"> </setting>
<value>4</value> <setting name="SecondaryColor" serializeAs="String">
</setting> <value>#FFFF0000</value>
<setting name="Bars" serializeAs="String"> </setting>
<value>21</value> </Artemis.Settings.RocketLeague>
</setting> <Artemis.Properties.Settings>
<setting name="Spread" serializeAs="String"> <setting name="LastEffect" serializeAs="String">
<value>1</value> <value>TypeWave</value>
</setting> </setting>
<setting name="FadeSpeed" serializeAs="String"> </Artemis.Properties.Settings>
<value>3</value> <Artemis.Settings.TypeWave>
</setting> <setting name="IsRandomColors" serializeAs="String">
<setting name="MainColor" serializeAs="String"> <value>True</value>
<value>#FF0000FF</value> </setting>
</setting> <setting name="WaveColor" serializeAs="String">
<setting name="SecondaryColor" serializeAs="String"> <value>#FFFF0000</value>
<value>#FF1E90FF</value> </setting>
</setting> <setting name="IsShiftColors" serializeAs="String">
</Artemis.Settings.AudioVisualization> <value>True</value>
<Artemis.Settings.RocketLeague> </setting>
<setting name="Enabled" serializeAs="String"> <setting name="ShiftColorSpeed" serializeAs="String">
<value>False</value> <value>20</value>
</setting> </setting>
<setting name="MainColor" serializeAs="String"> <setting name="TimeToLive" serializeAs="String">
<value>#FFFF5000</value> <value>500</value>
</setting> </setting>
<setting name="SecondaryColor" serializeAs="String"> <setting name="SpreadSpeed" serializeAs="String">
<value>#FFFF0000</value> <value>4</value>
</setting> </setting>
</Artemis.Settings.RocketLeague> </Artemis.Settings.TypeWave>
<Artemis.Properties.Settings> <Artemis.Settings.General>
<setting name="LastEffect" serializeAs="String"> <setting name="LastEffect" serializeAs="String">
<value>TypeWave</value> <value>TypeWave</value>
</setting> </setting>
</Artemis.Properties.Settings> <setting name="LastKeyboard" serializeAs="String">
<Artemis.Settings.TypeWave> <value>Corsair Gaming K95 RGB</value>
<setting name="IsRandomColors" serializeAs="String"> </setting>
<value>True</value> <setting name="EnablePointersUpdate" serializeAs="String">
</setting> <value>True</value>
<setting name="WaveColor" serializeAs="String"> </setting>
<value>#FFFF0000</value> <setting name="GamestatePort" serializeAs="String">
</setting> <value>51364</value>
<setting name="IsShiftColors" serializeAs="String"> </setting>
<value>True</value> </Artemis.Settings.General>
</setting> </userSettings>
<setting name="ShiftColorSpeed" serializeAs="String"> <runtime>
<value>20</value> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
</setting> <dependentAssembly>
<setting name="TimeToLive" serializeAs="String"> <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<value>500</value> <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</setting> </dependentAssembly>
<setting name="SpreadSpeed" serializeAs="String"> <dependentAssembly>
<value>4</value> <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
</setting> <bindingRedirect oldVersion="0.0.0.0-1.2.15.0" newVersion="1.2.15.0" />
</Artemis.Settings.TypeWave> </dependentAssembly>
<Artemis.Settings.General> <dependentAssembly>
<setting name="LastEffect" serializeAs="String"> <assemblyIdentity name="Caliburn.Micro" publicKeyToken="8e5891231f2ed21f" culture="neutral" />
<value>TypeWave</value> <bindingRedirect oldVersion="0.0.0.0-2.0.2.0" newVersion="2.0.2.0" />
</setting> </dependentAssembly>
<setting name="LastKeyboard" serializeAs="String"> <dependentAssembly>
<value>Corsair Gaming K95 RGB</value> <assemblyIdentity name="Caliburn.Micro.Platform" publicKeyToken="8e5891231f2ed21f" culture="neutral" />
</setting> <bindingRedirect oldVersion="0.0.0.0-2.0.2.0" newVersion="2.0.2.0" />
<setting name="EnablePointersUpdate" serializeAs="String"> </dependentAssembly>
<value>True</value> </assemblyBinding>
</setting> </runtime>
<setting name="GamestatePort" serializeAs="String">
<value>51364</value>
</setting>
</Artemis.Settings.General>
</userSettings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.2.15.0" newVersion="1.2.15.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Caliburn.Micro" publicKeyToken="8e5891231f2ed21f" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.0.2.0" newVersion="2.0.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Caliburn.Micro.Platform" publicKeyToken="8e5891231f2ed21f" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.0.2.0" newVersion="2.0.2.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration> </configuration>

View File

@ -135,8 +135,8 @@
<HintPath>..\packages\Colore.3.0.2\lib\net35\Corale.Colore.dll</HintPath> <HintPath>..\packages\Colore.3.0.2\lib\net35\Corale.Colore.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="CUE.NET, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="CUE.NET, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\CUE.NET.1.0.0\lib\net45\CUE.NET.dll</HintPath> <HintPath>..\packages\CUE.NET.1.0.2\lib\net45\CUE.NET.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="Gma.System.MouseKeyHook, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Gma.System.MouseKeyHook, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL">
@ -527,12 +527,12 @@
</BootstrapperPackage> </BootstrapperPackage>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\CUE.NET.1.0.0\build\net45\CUE.NET.targets" Condition="Exists('..\packages\CUE.NET.1.0.0\build\net45\CUE.NET.targets')" /> <Import Project="..\packages\CUE.NET.1.0.2\build\net45\CUE.NET.targets" Condition="Exists('..\packages\CUE.NET.1.0.2\build\net45\CUE.NET.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <PropertyGroup>
<ErrorText>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}.</ErrorText> <ErrorText>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}.</ErrorText>
</PropertyGroup> </PropertyGroup>
<Error Condition="!Exists('..\packages\CUE.NET.1.0.0\build\net45\CUE.NET.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CUE.NET.1.0.0\build\net45\CUE.NET.targets'))" /> <Error Condition="!Exists('..\packages\CUE.NET.1.0.2\build\net45\CUE.NET.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CUE.NET.1.0.2\build\net45\CUE.NET.targets'))" />
</Target> </Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.

View File

@ -1,88 +1,89 @@
using System; using System;
using System.Drawing; using System.Drawing;
using System.Windows.Forms; using System.Windows.Forms;
using Artemis.Utilities; using Artemis.Utilities;
using CUE.NET; using CUE.NET;
using CUE.NET.Devices.Generic.Enums; using CUE.NET.Devices.Generic.Enums;
using CUE.NET.Devices.Keyboard; using CUE.NET.Devices.Keyboard;
using CUE.NET.Exceptions; using CUE.NET.Exceptions;
namespace Artemis.KeyboardProviders.Corsair namespace Artemis.KeyboardProviders.Corsair
{ {
internal class K70 : KeyboardProvider internal class K70 : KeyboardProvider
{ {
private CorsairKeyboard _keyboard; private CorsairKeyboard _keyboard;
public K70() public K70()
{ {
Name = "Corsair Gaming K70 RGB"; Name = "Corsair Gaming K70 RGB";
} }
public override bool CanEnable() public override bool CanEnable()
{ {
try try
{ {
CueSDK.Initialize(); CueSDK.Initialize();
} }
catch (CUEException e) catch (CUEException e)
{ {
if (e.Error == CorsairError.ServerNotFound) if (e.Error == CorsairError.ServerNotFound)
return false; return false;
throw; throw;
} }
return true; return true;
} }
/// <summary> /// <summary>
/// Enables the SDK and sets updatemode to manual as well as the color of the background to black. /// Enables the SDK and sets updatemode to manual as well as the color of the background to black.
/// </summary> /// </summary>
public override void Enable() public override void Enable()
{ {
try try
{ {
CueSDK.Initialize(); CueSDK.Initialize();
} }
catch (WrapperException) catch (WrapperException)
{ {
/*CUE is already initialized*/ /*CUE is already initialized*/
} }
_keyboard = CueSDK.KeyboardSDK; _keyboard = CueSDK.KeyboardSDK;
Height = (int)_keyboard.KeyboardRectangle.Height; Height = 7; //(int) _keyboard.KeyboardRectangle.Height;
Width = (int)_keyboard.KeyboardRectangle.Width; Width = 21; //(int) _keyboard.KeyboardRectangle.Width;
// _keyboard.UpdateMode = UpdateMode.Manual; // _keyboard.UpdateMode = UpdateMode.Manual;
_keyboard.Update(true); _keyboard.Update(true);
} }
public override void Disable() public override void Disable()
{ {
} CueSDK.Reinitialize();
}
/// <summary>
/// Properly resizes any size bitmap to the keyboard by creating a rectangle whose size is dependent on the bitmap /// <summary>
/// size. /// Properly resizes any size bitmap to the keyboard by creating a rectangle whose size is dependent on the bitmap
/// Does not reset the color each time. Uncomment line 48 for collor reset. /// size.
/// </summary> /// Does not reset the color each time. Uncomment line 48 for collor reset.
/// <param name="bitmap//"></param> /// </summary>
public override void DrawBitmap(Bitmap bitmap) /// <param name="bitmap"></param>
{ public override void DrawBitmap(Bitmap bitmap)
using ( {
var resized = ImageUtilities.ResizeImage(bitmap, using (
(int)_keyboard.KeyboardRectangle.Width, var resized = ImageUtilities.ResizeImage(bitmap,
(int)_keyboard.KeyboardRectangle.Height) (int)_keyboard.KeyboardRectangle.Width,
) (int)_keyboard.KeyboardRectangle.Height)
{ )
foreach (var item in _keyboard.Keys) {
{ foreach (var item in _keyboard.Keys)
var ledColor = resized.GetPixel((int)item.KeyRectangle.X, (int)item.KeyRectangle.Y); {
if (ledColor == Color.FromArgb(0, 0, 0, 0)) var ledColor = resized.GetPixel((int)item.KeyRectangle.X, (int)item.KeyRectangle.Y);
ledColor = Color.Black; if (ledColor == Color.FromArgb(0, 0, 0, 0))
item.Led.Color = ledColor; ledColor = Color.Black;
} item.Led.Color = ledColor;
} }
_keyboard.Update(true); }
} _keyboard.Update(true);
} }
}
} }

View File

@ -49,8 +49,8 @@ namespace Artemis.KeyboardProviders.Corsair
/*CUE is already initialized*/ /*CUE is already initialized*/
} }
_keyboard = CueSDK.KeyboardSDK; _keyboard = CueSDK.KeyboardSDK;
Height = (int) _keyboard.KeyboardRectangle.Height; Height = 7; //(int) _keyboard.KeyboardRectangle.Height;
Width = (int) _keyboard.KeyboardRectangle.Width; Width = 24; //(int) _keyboard.KeyboardRectangle.Width;
// _keyboard.UpdateMode = UpdateMode.Manual; // _keyboard.UpdateMode = UpdateMode.Manual;
_keyboard.Update(true); _keyboard.Update(true);
@ -58,6 +58,7 @@ namespace Artemis.KeyboardProviders.Corsair
public override void Disable() public override void Disable()
{ {
CueSDK.Reinitialize();
} }
/// <summary> /// <summary>

View File

@ -1,19 +1,18 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages>
<packages> <package id="Autofac" version="3.5.2" targetFramework="net452" />
<package id="Autofac" version="3.5.2" targetFramework="net452" /> <package id="Caliburn.Micro" version="2.0.2" targetFramework="net452" />
<package id="Caliburn.Micro" version="2.0.2" targetFramework="net452" /> <package id="Caliburn.Micro.AutofacBootstrap" version="2.0.8" targetFramework="net452" />
<package id="Caliburn.Micro.AutofacBootstrap" version="2.0.8" targetFramework="net452" /> <package id="Caliburn.Micro.Core" version="2.0.2" targetFramework="net452" />
<package id="Caliburn.Micro.Core" version="2.0.2" targetFramework="net452" /> <package id="Colore" version="3.0.2" targetFramework="net452" />
<package id="Colore" version="3.0.2" targetFramework="net452" /> <package id="CUE.NET" version="1.0.2" targetFramework="net452" />
<package id="CUE.NET" version="1.0.0" targetFramework="net452" /> <package id="Extended.Wpf.Toolkit" version="2.6" targetFramework="net452" />
<package id="Extended.Wpf.Toolkit" version="2.6" targetFramework="net452" /> <package id="Hardcodet.NotifyIcon.Wpf" version="1.0.5" targetFramework="net452" />
<package id="Hardcodet.NotifyIcon.Wpf" version="1.0.5" targetFramework="net452" /> <package id="log4net" version="2.0.5" targetFramework="net452" />
<package id="log4net" version="2.0.5" targetFramework="net452" /> <package id="MahApps.Metro" version="1.3.0-ALPHA017" targetFramework="net452" />
<package id="MahApps.Metro" version="1.3.0-ALPHA017" targetFramework="net452" /> <package id="MahApps.Metro.Resources" version="0.4.0.0" targetFramework="net452" />
<package id="MahApps.Metro.Resources" version="0.4.0.0" targetFramework="net452" /> <package id="MouseKeyHook" version="5.4.0" targetFramework="net452" />
<package id="MouseKeyHook" version="5.4.0" targetFramework="net452" /> <package id="NAudio" version="1.7.3" targetFramework="net452" />
<package id="NAudio" version="1.7.3" targetFramework="net452" /> <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net452" />
<package id="Newtonsoft.Json" version="8.0.2" targetFramework="net452" /> <package id="WpfExceptionViewer" version="1.0.0.0" targetFramework="net452" />
<package id="WpfExceptionViewer" version="1.0.0.0" targetFramework="net452" />
</packages> </packages>