# HG changeset patch
# User sl
# Date 1416843986 -3600
# Node ID 0d9f479cbbf74a66e0002a755a978ebe87ea85bc
# Parent  6e4d62a4fed3d40ee41522eb7dfc089b46582953
Fixing HID page and usage test.

diff -r 6e4d62a4fed3 -r 0d9f479cbbf7 RemoteControlDevice.cs
--- a/RemoteControlDevice.cs	Sat Nov 08 21:03:51 2014 +0100
+++ b/RemoteControlDevice.cs	Mon Nov 24 16:46:26 2014 +0100
@@ -445,19 +445,20 @@
                     //
                     HidUsageHandler usagePageHandler=null;
 
-                    //Make sure both usage page and usage are matching MCE remote
-                    //TODO: handle more that just MCE usage page.
-                    if (deviceInfo.hid.usUsagePage == (ushort)Hid.UsagePage.MceRemote || deviceInfo.hid.usUsage == (ushort)Hid.UsageId.MceRemoteUsage)
+                    //Check if this an MCE remote HID message
+                    if (deviceInfo.hid.usUsagePage == (ushort)Hid.UsagePage.MceRemote && deviceInfo.hid.usUsage == (ushort)Hid.UsageId.MceRemoteUsage)
                     {                        
                         usagePageHandler = HidMceRemoteHandler;
                     }
-                    else if (deviceInfo.hid.usUsagePage == (ushort)Hid.UsagePage.Consumer || deviceInfo.hid.usUsage == (ushort)Hid.UsageId.ConsumerControl)
+                    //Check if this is a consumer control HID message
+                    else if (deviceInfo.hid.usUsagePage == (ushort)Hid.UsagePage.Consumer && deviceInfo.hid.usUsage == (ushort)Hid.UsageId.ConsumerControl)
                     {
                         usagePageHandler = HidConsumerDeviceHandler;
                     }
+                    //Unknown HID message
                     else
                     {
-                        Debug.WriteLine("Not MCE remote page and usage.");
+                        Debug.WriteLine("Unknown HID message.");
                         return;
                     }