Merge default tip
authorStephaneLenclud
Mon, 23 Mar 2015 13:08:31 +0100
changeset 89f8cfba91e6cd
parent 88 3429909219c8
parent 87 a6684684a9c3
Merge
SharpLibHid.nuspec
     1.1 --- a/Hid/HidEvent.cs	Wed Mar 18 07:46:39 2015 +0100
     1.2 +++ b/Hid/HidEvent.cs	Mon Mar 23 13:08:31 2015 +0100
     1.3 @@ -529,9 +529,9 @@
     1.4  
     1.5                  UsagePage usagePage = (UsagePage)UsagePage;
     1.6                  string name = Enum.GetName(Utils.UsageType(usagePage), usage);
     1.7 -                if (name == null)
     1.8 +                if (name == null || Device.IsGamePad) //Gamepad buttons do not belong to Usage enumeration, they are just ordinal
     1.9                  {
    1.10 -                    name += usage.ToString("X2");
    1.11 +                    name = usage.ToString("X2");
    1.12                  }
    1.13                  usageText += name;
    1.14              }
     2.1 --- a/Hid/HidUsageTables.cs	Wed Mar 18 07:46:39 2015 +0100
     2.2 +++ b/Hid/HidUsageTables.cs	Mon Mar 23 13:08:31 2015 +0100
     2.3 @@ -698,7 +698,7 @@
     2.4          /// <summary>
     2.5          ///
     2.6          /// </summary>
     2.7 -        enum GenericDesktop : ushort
     2.8 +        public enum GenericDesktop : ushort
     2.9          {
    2.10              Null = 0x00,
    2.11              Pointer = 0x01,
    2.12 @@ -773,7 +773,7 @@
    2.13          /// <summary>
    2.14          ///
    2.15          /// </summary>
    2.16 -        enum SimulationControl : ushort
    2.17 +        public enum SimulationControl : ushort
    2.18          {
    2.19              Null = 0x00,
    2.20              FlightSimulationDevice = 0x01,
    2.21 @@ -832,7 +832,7 @@
    2.22          /// <summary>
    2.23          ///
    2.24          /// </summary>
    2.25 -        enum GameControl : ushort
    2.26 +        public enum GameControl : ushort
    2.27          {
    2.28              Null = 0x00,
    2.29              GameController3D = 0x01,
    2.30 @@ -868,7 +868,7 @@
    2.31          /// <summary>
    2.32          ///
    2.33          /// </summary>
    2.34 -        enum TelephonyDevice : ushort
    2.35 +        public enum TelephonyDevice : ushort
    2.36          {
    2.37              Null = 0x00,
    2.38              Phone = 0x01,
     3.1 --- a/SharpLibHid.csproj	Wed Mar 18 07:46:39 2015 +0100
     3.2 +++ b/SharpLibHid.csproj	Mon Mar 23 13:08:31 2015 +0100
     3.3 @@ -32,6 +32,26 @@
     3.4      <WarningLevel>4</WarningLevel>
     3.5      <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     3.6    </PropertyGroup>
     3.7 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     3.8 +    <DebugSymbols>true</DebugSymbols>
     3.9 +    <OutputPath>bin\x86\Debug\</OutputPath>
    3.10 +    <DefineConstants>DEBUG;TRACE</DefineConstants>
    3.11 +    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    3.12 +    <DebugType>full</DebugType>
    3.13 +    <PlatformTarget>x86</PlatformTarget>
    3.14 +    <ErrorReport>prompt</ErrorReport>
    3.15 +    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    3.16 +  </PropertyGroup>
    3.17 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    3.18 +    <OutputPath>bin\x86\Release\</OutputPath>
    3.19 +    <DefineConstants>TRACE</DefineConstants>
    3.20 +    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    3.21 +    <Optimize>true</Optimize>
    3.22 +    <DebugType>pdbonly</DebugType>
    3.23 +    <PlatformTarget>x86</PlatformTarget>
    3.24 +    <ErrorReport>prompt</ErrorReport>
    3.25 +    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    3.26 +  </PropertyGroup>
    3.27    <ItemGroup>
    3.28      <Reference Include="System" />
    3.29      <Reference Include="System.Core" />
     4.1 --- a/SharpLibHid.nuspec	Wed Mar 18 07:46:39 2015 +0100
     4.2 +++ b/SharpLibHid.nuspec	Mon Mar 23 13:08:31 2015 +0100
     4.3 @@ -2,7 +2,7 @@
     4.4  <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     4.5      <metadata>
     4.6          <id>SharpLibHid</id>
     4.7 -        <version>1.0.1</version>
     4.8 +        <version>1.0.4</version>
     4.9          <title>C# HID Library</title>
    4.10          <authors>Stéphane Lenclud</authors>
    4.11          <owners>Stéphane Lenclud</owners>
    4.12 @@ -10,8 +10,17 @@
    4.13          <projectUrl>http://hg.slions.net/SharpLibHid</projectUrl>
    4.14          <requireLicenseAcceptance>false</requireLicenseAcceptance>
    4.15          <description>C# HID library designed to handle raw input. Most useful to support IR remote control and gamepad inputs.</description>
    4.16 -        <releaseNotes>v1.0.1
    4.17 -Adding ThinkPad specific usages.
    4.18 +        <releaseNotes>v1.0.4
    4.19 +Build configuration fix.
    4.20 +
    4.21 +v1.0.3
    4.22 +x86 Build.
    4.23 +
    4.24 +v1.0.2
    4.25 +Adding missing public keyword for some of our Usage enumerations.
    4.26 +
    4.27 +v1.0.1
    4.28 +Adding ThinkPad specific usages.
    4.29  Adding support for optional event repeat.</releaseNotes>
    4.30          <copyright>Stéphane Lenclud</copyright>
    4.31          <language />
     5.1 --- a/SharpLibHid.sln	Wed Mar 18 07:46:39 2015 +0100
     5.2 +++ b/SharpLibHid.sln	Mon Mar 23 13:08:31 2015 +0100
     5.3 @@ -1,6 +1,8 @@
     5.4  
     5.5  Microsoft Visual Studio Solution File, Format Version 12.00
     5.6  # Visual Studio 2013
     5.7 +VisualStudioVersion = 12.0.31101.0
     5.8 +MinimumVisualStudioVersion = 10.0.40219.1
     5.9  Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E70B5E73-7045-4EA7-968D-06BB68773DAB}"
    5.10  	ProjectSection(SolutionItems) = preProject
    5.11  		Rebracer.xml = Rebracer.xml
    5.12 @@ -24,11 +26,12 @@
    5.13  		{4F3F96E6-668A-488E-BA0C-ED249AFACE9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
    5.14  		{4F3F96E6-668A-488E-BA0C-ED249AFACE9E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
    5.15  		{4F3F96E6-668A-488E-BA0C-ED249AFACE9E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
    5.16 -		{4F3F96E6-668A-488E-BA0C-ED249AFACE9E}.Debug|x86.ActiveCfg = Debug|Any CPU
    5.17 +		{4F3F96E6-668A-488E-BA0C-ED249AFACE9E}.Debug|x86.ActiveCfg = Debug|x86
    5.18 +		{4F3F96E6-668A-488E-BA0C-ED249AFACE9E}.Debug|x86.Build.0 = Debug|x86
    5.19  		{4F3F96E6-668A-488E-BA0C-ED249AFACE9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
    5.20  		{4F3F96E6-668A-488E-BA0C-ED249AFACE9E}.Release|Any CPU.Build.0 = Release|Any CPU
    5.21 -		{4F3F96E6-668A-488E-BA0C-ED249AFACE9E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
    5.22 -		{4F3F96E6-668A-488E-BA0C-ED249AFACE9E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
    5.23 +		{4F3F96E6-668A-488E-BA0C-ED249AFACE9E}.Release|Mixed Platforms.ActiveCfg = Release|x86
    5.24 +		{4F3F96E6-668A-488E-BA0C-ED249AFACE9E}.Release|Mixed Platforms.Build.0 = Release|x86
    5.25  		{4F3F96E6-668A-488E-BA0C-ED249AFACE9E}.Release|x86.ActiveCfg = Release|Any CPU
    5.26  		{7435D21C-6A5C-4F57-8868-94A8D911980E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    5.27  		{7435D21C-6A5C-4F57-8868-94A8D911980E}.Debug|Any CPU.Build.0 = Debug|Any CPU