# HG changeset patch
# User StephaneLenclud
# Date 1427112511 -3600
# Node ID f8cfba91e6cd39c18363819ac3b2761c2734d0a1
# Parent  3429909219c8b94b71d05bb962f43bb0da92ed9d# Parent  a6684684a9c3b60bbb88b3961b27714b7f4374de
Merge

diff -r 3429909219c8 -r f8cfba91e6cd Hid/HidEvent.cs
--- a/Hid/HidEvent.cs	Wed Mar 18 07:46:39 2015 +0100
+++ b/Hid/HidEvent.cs	Mon Mar 23 13:08:31 2015 +0100
@@ -529,9 +529,9 @@
 
                 UsagePage usagePage = (UsagePage)UsagePage;
                 string name = Enum.GetName(Utils.UsageType(usagePage), usage);
-                if (name == null)
+                if (name == null || Device.IsGamePad) //Gamepad buttons do not belong to Usage enumeration, they are just ordinal
                 {
-                    name += usage.ToString("X2");
+                    name = usage.ToString("X2");
                 }
                 usageText += name;
             }
diff -r 3429909219c8 -r f8cfba91e6cd Hid/HidUsageTables.cs
--- a/Hid/HidUsageTables.cs	Wed Mar 18 07:46:39 2015 +0100
+++ b/Hid/HidUsageTables.cs	Mon Mar 23 13:08:31 2015 +0100
@@ -698,7 +698,7 @@
         /// <summary>
         ///
         /// </summary>
-        enum GenericDesktop : ushort
+        public enum GenericDesktop : ushort
         {
             Null = 0x00,
             Pointer = 0x01,
@@ -773,7 +773,7 @@
         /// <summary>
         ///
         /// </summary>
-        enum SimulationControl : ushort
+        public enum SimulationControl : ushort
         {
             Null = 0x00,
             FlightSimulationDevice = 0x01,
@@ -832,7 +832,7 @@
         /// <summary>
         ///
         /// </summary>
-        enum GameControl : ushort
+        public enum GameControl : ushort
         {
             Null = 0x00,
             GameController3D = 0x01,
@@ -868,7 +868,7 @@
         /// <summary>
         ///
         /// </summary>
-        enum TelephonyDevice : ushort
+        public enum TelephonyDevice : ushort
         {
             Null = 0x00,
             Phone = 0x01,
diff -r 3429909219c8 -r f8cfba91e6cd SharpLibHid.csproj
--- a/SharpLibHid.csproj	Wed Mar 18 07:46:39 2015 +0100
+++ b/SharpLibHid.csproj	Mon Mar 23 13:08:31 2015 +0100
@@ -32,6 +32,26 @@
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff -r 3429909219c8 -r f8cfba91e6cd SharpLibHid.nuspec
--- a/SharpLibHid.nuspec	Wed Mar 18 07:46:39 2015 +0100
+++ b/SharpLibHid.nuspec	Mon Mar 23 13:08:31 2015 +0100
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>SharpLibHid</id>
-        <version>1.0.1</version>
+        <version>1.0.4</version>
         <title>C# HID Library</title>
         <authors>Stéphane Lenclud</authors>
         <owners>Stéphane Lenclud</owners>
@@ -10,8 +10,17 @@
         <projectUrl>http://hg.slions.net/SharpLibHid</projectUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>C# HID library designed to handle raw input. Most useful to support IR remote control and gamepad inputs.</description>
-        <releaseNotes>v1.0.1
-Adding ThinkPad specific usages.
+        <releaseNotes>v1.0.4
+Build configuration fix.
+
+v1.0.3
+x86 Build.
+
+v1.0.2
+Adding missing public keyword for some of our Usage enumerations.
+
+v1.0.1
+Adding ThinkPad specific usages.
 Adding support for optional event repeat.</releaseNotes>
         <copyright>Stéphane Lenclud</copyright>
         <language />
diff -r 3429909219c8 -r f8cfba91e6cd SharpLibHid.sln
--- a/SharpLibHid.sln	Wed Mar 18 07:46:39 2015 +0100
+++ b/SharpLibHid.sln	Mon Mar 23 13:08:31 2015 +0100
@@ -1,6 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
+VisualStudioVersion = 12.0.31101.0
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E70B5E73-7045-4EA7-968D-06BB68773DAB}"
 	ProjectSection(SolutionItems) = preProject
 		Rebracer.xml = Rebracer.xml
@@ -24,11 +26,12 @@
 		{4F3F96E6-668A-488E-BA0C-ED249AFACE9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4F3F96E6-668A-488E-BA0C-ED249AFACE9E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{4F3F96E6-668A-488E-BA0C-ED249AFACE9E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4F3F96E6-668A-488E-BA0C-ED249AFACE9E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4F3F96E6-668A-488E-BA0C-ED249AFACE9E}.Debug|x86.ActiveCfg = Debug|x86
+		{4F3F96E6-668A-488E-BA0C-ED249AFACE9E}.Debug|x86.Build.0 = Debug|x86
 		{4F3F96E6-668A-488E-BA0C-ED249AFACE9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4F3F96E6-668A-488E-BA0C-ED249AFACE9E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4F3F96E6-668A-488E-BA0C-ED249AFACE9E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{4F3F96E6-668A-488E-BA0C-ED249AFACE9E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{4F3F96E6-668A-488E-BA0C-ED249AFACE9E}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{4F3F96E6-668A-488E-BA0C-ED249AFACE9E}.Release|Mixed Platforms.Build.0 = Release|x86
 		{4F3F96E6-668A-488E-BA0C-ED249AFACE9E}.Release|x86.ActiveCfg = Release|Any CPU
 		{7435D21C-6A5C-4F57-8868-94A8D911980E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7435D21C-6A5C-4F57-8868-94A8D911980E}.Debug|Any CPU.Build.0 = Debug|Any CPU