1.1 --- a/HidUsageTables.cs	Sun Feb 15 22:57:38 2015 +0100
     1.2 +++ b/HidUsageTables.cs	Sun Feb 15 23:06:54 2015 +0100
     1.3 @@ -49,62 +49,70 @@
     1.4      }
     1.5  
     1.6      /// <summary>
     1.7 -    /// Usage Collection for usage page GenericDesktopControls.
     1.8 +    /// Usage Collections are special values from our Usage enumeration.
     1.9 +    /// Thus they are also part of the corresponding Usage enumeration.
    1.10      /// </summary>
    1.11 -    public enum UsageCollectionGenericDesktop : ushort
    1.12 +    namespace UsageCollection
    1.13      {
    1.14 -        Pointer = 0x01,
    1.15 -        Mouse = 0x02,
    1.16 -        Joystick = 0x04,
    1.17 -        GamePad = 0x05,
    1.18 -        Keyboard = 0x06,
    1.19 -        KeyPad = 0x07,
    1.20 -        MultiAxisController = 0x08,
    1.21 -        TabletPCSystemControls = 0x09,
    1.22 -        SystemControl = 0x80
    1.23 +        /// <summary>
    1.24 +        /// Usage Collection for usage page GenericDesktopControls.
    1.25 +        /// </summary>
    1.26 +        public enum GenericDesktop : ushort
    1.27 +        {
    1.28 +            Pointer = 0x01,
    1.29 +            Mouse = 0x02,
    1.30 +            Joystick = 0x04,
    1.31 +            GamePad = 0x05,
    1.32 +            Keyboard = 0x06,
    1.33 +            KeyPad = 0x07,
    1.34 +            MultiAxisController = 0x08,
    1.35 +            TabletPCSystemControls = 0x09,
    1.36 +            SystemControl = 0x80
    1.37 +        }
    1.38 +
    1.39 +        /// <summary>
    1.40 +        /// Usage Collection for usage page Consumer.
    1.41 +        /// </summary>
    1.42 +        public enum Consumer : ushort
    1.43 +        {
    1.44 +            ConsumerControl = 0x01,
    1.45 +            NumericKeyPad = 0x02,
    1.46 +            ProgrammableButtons = 0x03,
    1.47 +            Microphone = 0x04,
    1.48 +            Headphone = 0x05,
    1.49 +            GraphicEqualizer = 0x06,
    1.50 +            FunctionButtons = 0x36,
    1.51 +            Selection = 0x80,
    1.52 +            MediaSelection = 0x0087,
    1.53 +            SelectDisc = 0x00BA,
    1.54 +            PlaybackSpeed = 0x00F1,
    1.55 +            Proximity = 0x0109,
    1.56 +            SpeakerSystem = 0x0160,
    1.57 +            ChannelLeft = 0x0161,
    1.58 +            ChannelRight = 0x0162,
    1.59 +            ChannelCenter = 0x0163,
    1.60 +            ChannelFront = 0x0164,
    1.61 +            ChannelCenterFront = 0x0165,
    1.62 +            ChannelSide = 0x0166,
    1.63 +            ChannelSurrond = 0x0167,
    1.64 +            ChannelLowFrequencyEnhancement = 0x0168,
    1.65 +            ChannelTop = 0x0169,
    1.66 +            ChannelUnknown = 0x016A,
    1.67 +            ApplicationLaunchButtons = 0x016A,
    1.68 +            GenericGuiApplicationControls = 0x0200,
    1.69 +        }
    1.70 +
    1.71 +
    1.72 +        public enum WindowsMediaCenter : ushort
    1.73 +        {
    1.74 +            WindowsMediaCenterRemoteControl = 0x88
    1.75 +        }
    1.76 +
    1.77      }
    1.78  
    1.79 -    /// <summary>
    1.80 -    /// Usage Collection for usage page Consumer.
    1.81 -    /// </summary>
    1.82 -    public enum UsageCollectionConsumer : ushort
    1.83 -    {
    1.84 -        ConsumerControl = 0x01,
    1.85 -        NumericKeyPad = 0x02,
    1.86 -        ProgrammableButtons = 0x03,
    1.87 -        Microphone = 0x04,
    1.88 -        Headphone = 0x05,
    1.89 -        GraphicEqualizer = 0x06,
    1.90 -        FunctionButtons = 0x36,
    1.91 -        Selection = 0x80,
    1.92 -        MediaSelection = 0x0087,
    1.93 -        SelectDisc = 0x00BA,
    1.94 -        PlaybackSpeed = 0x00F1,
    1.95 -        Proximity = 0x0109,
    1.96 -        SpeakerSystem = 0x0160,
    1.97 -        ChannelLeft = 0x0161,
    1.98 -        ChannelRight = 0x0162,
    1.99 -        ChannelCenter = 0x0163,
   1.100 -        ChannelFront = 0x0164,
   1.101 -        ChannelCenterFront = 0x0165,
   1.102 -        ChannelSide = 0x0166,
   1.103 -        ChannelSurrond = 0x0167,
   1.104 -        ChannelLowFrequencyEnhancement = 0x0168,
   1.105 -        ChannelTop = 0x0169,
   1.106 -        ChannelUnknown = 0x016A,
   1.107 -        ApplicationLaunchButtons = 0x016A,
   1.108 -        GenericGuiApplicationControls = 0x0200,
   1.109 -    }
   1.110  
   1.111  
   1.112 -    public enum UsageCollectionWindowsMediaCenter : ushort
   1.113 -    {
   1.114 -        WindowsMediaCenterRemoteControl = 0x88
   1.115 -    }
   1.116 -
   1.117 -
   1.118 -
   1.119 -    namespace UsageTables
   1.120 +    namespace Usage
   1.121      {
   1.122          /// <summary>
   1.123          ///