# HG changeset patch
# User sl
# Date 1418939012 -3600
# Node ID 958ed29f977c6e29ba158895436780f604a325d5
# Parent  8ce9bdc9c5b54b80efbc964b9da972b54e0bac2a
Minor usage table renaming.

diff -r 8ce9bdc9c5b5 -r 958ed29f977c Form1.cs
--- a/Form1.cs	Sun Dec 14 18:17:40 2014 +0100
+++ b/Form1.cs	Thu Dec 18 22:43:32 2014 +0100
@@ -136,10 +136,10 @@
                 //Display MCE button name
                 label1.Text = e.MceButton.ToString();
                 //Check if this is an HP extension
-                if (Enum.IsDefined(typeof(Hid.UsageTables.HpMceButton), (ushort)e.MceButton))
+                if (Enum.IsDefined(typeof(Hid.UsageTables.HpWindowsMediaCenterRemoteControl), (ushort)e.MceButton))
                 {
                     //Also display HP button name
-                    label1.Text += " / HP:" + ((Hid.UsageTables.HpMceButton)e.MceButton).ToString();
+                    label1.Text += " / HP:" + ((Hid.UsageTables.HpWindowsMediaCenterRemoteControl)e.MceButton).ToString();
                 }
 
                 processed = true;
diff -r 8ce9bdc9c5b5 -r 958ed29f977c HidEvent.cs
--- a/HidEvent.cs	Sun Dec 14 18:17:40 2014 +0100
+++ b/HidEvent.cs	Thu Dec 18 22:43:32 2014 +0100
@@ -28,6 +28,7 @@
 
         public ushort UsagePage { get; private set; }
         public ushort UsageCollection { get; private set; }
+        public uint UsageId { get { return ((uint)UsagePage << 16 | (uint)UsageCollection); } }
         public List<ushort> Usages { get; private set; }
 
 
diff -r 8ce9bdc9c5b5 -r 958ed29f977c HidUsageTables.cs
--- a/HidUsageTables.cs	Sun Dec 14 18:17:40 2014 +0100
+++ b/HidUsageTables.cs	Thu Dec 18 22:43:32 2014 +0100
@@ -230,7 +230,7 @@
         /// <summary>
         /// Those codes come from experimenting with HP remotes.
         /// </summary>
-        public enum HpMceButton: ushort
+        public enum HpWindowsMediaCenterRemoteControl : ushort
         {
             /// <summary>
             /// Displays visual imagery that is synchronized to the sound of your music tracks.
@@ -266,7 +266,7 @@
             /// Notably sent by the 'Eject' button of HP Windows Media Center Remote (TSGH-IR08).
             /// Also interpreted as 'Eject' action by SoundGraph iMON Manager in MCE mode (OrigenAE VF310).
             /// </summary>
-            Eject = WindowsMediaCenterRemoteControl.Ext2,
+            HpEject = WindowsMediaCenterRemoteControl.Ext2,
             /// <summary>
             /// Not sure what this should do.
             /// <para />