# HG changeset patch
# User StephaneLenclud
# Date 1424034813 -3600
# Node ID 8c2380995bb7650bbf14d9bbadbd1bc5f1972c9e
# Parent 4b8b058de2152866d5fc6a178593726ee84b63f8
Adding input capabilities description to device list.
diff -r 4b8b058de215 -r 8c2380995bb7 HidDevice.cs
--- a/HidDevice.cs Sun Feb 15 21:48:07 2015 +0100
+++ b/HidDevice.cs Sun Feb 15 22:13:33 2015 +0100
@@ -39,6 +39,7 @@
//Capabilities
public HIDP_CAPS Capabilities { get { return iCapabilities; } }
private HIDP_CAPS iCapabilities;
+ public string InputCapabilitiesDescription { get; private set; }
//Input Button Capabilities
public HIDP_BUTTON_CAPS[] InputButtonCapabilities { get { return iInputButtonCapabilities; } }
private HIDP_BUTTON_CAPS[] iInputButtonCapabilities;
@@ -138,7 +139,7 @@
handle.Close();
- SetFriendlyName();
+ SetFriendlyName();
//Get our HID descriptor pre-parsed data
PreParsedData = Win32.RawInput.GetPreParsedData(hRawInputDevice);
@@ -157,6 +158,8 @@
throw new Exception("HidDevice: HidP_GetCaps failed: " + status.ToString());
}
+ SetInputCapabilitiesDescription();
+
//Get input button caps if needed
if (Capabilities.NumberInputButtonCaps > 0)
{
@@ -180,10 +183,14 @@
throw new Exception("HidDevice: HidP_GetValueCaps failed: " + status.ToString());
}
}
+ }
-
-
-
+ ///
+ ///
+ ///
+ void SetInputCapabilitiesDescription()
+ {
+ InputCapabilitiesDescription = "[ Input Capabilities ] Button: " + Capabilities.NumberInputButtonCaps + " - Value: " + Capabilities.NumberInputValueCaps + " - Data indices: " + Capabilities.NumberInputDataIndices;
}
///
diff -r 4b8b058de215 -r 8c2380995bb7 RawInput.cs
--- a/RawInput.cs Sun Feb 15 21:48:07 2015 +0100
+++ b/RawInput.cs Sun Feb 15 22:13:33 2015 +0100
@@ -202,6 +202,11 @@
node.Nodes.Add("UsagePage / UsageCollection: 0x" + hidDevice.Info.hid.usUsagePage.ToString("X4") + " / 0x" + hidDevice.Info.hid.usUsage.ToString("X4"));
}
+ if (hidDevice.InputCapabilitiesDescription != null)
+ {
+ node.Nodes.Add(hidDevice.InputCapabilitiesDescription);
+ }
+
node.Nodes.Add(hidDevice.Name);
}
}
diff -r 4b8b058de215 -r 8c2380995bb7 Win32Hid.cs
--- a/Win32Hid.cs Sun Feb 15 21:48:07 2015 +0100
+++ b/Win32Hid.cs Sun Feb 15 22:13:33 2015 +0100
@@ -112,7 +112,6 @@
[System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
public struct HIDP_CAPS
{
-
/// USAGE->USHORT->unsigned short
public ushort Usage;