Update MediaController project to remove the Record usage (not often needed) and...

diff --git a/Demos/Device/ClassDriver/KeyboardMouseMultiReport/Descriptors.h b/Demos/Device/ClassDriver/KeyboardMouseMultiReport/Descriptors.h
index 0a9d729..7dbb331 100644 (file)
--- a/Demos/Device/ClassDriver/KeyboardMouseMultiReport/Descriptors.h
+++ b/Demos/Device/ClassDriver/KeyboardMouseMultiReport/Descriptors.h
@@ -60,11 +60,13 @@
 
                /** Size in bytes of each of the HID reporting IN. */
                #define HID_EPSIZE                16
 
                /** Size in bytes of each of the HID reporting IN. */
                #define HID_EPSIZE                16

-               
+       
+       /* Enums: */
+               /** Enum for the HID report IDs used in the device. */

                enum
                {
                enum
                {

-                       HID_REPORTID_MouseReport    = 0x01,
-                       HID_REPORTID_KeyboardReport = 0x02,
+                       HID_REPORTID_MouseReport    = 0x01, /**< Report ID for the Mouse report within the device. */
+                       HID_REPORTID_KeyboardReport = 0x02, /**< Report ID for the Keyboard report within the device. */

                } HID_Report_IDs;
 
        /* Function Prototypes: */
                } HID_Report_IDs;
 
        /* Function Prototypes: */

diff --git a/LUFA/ManPages/LibraryApps.txt b/LUFA/ManPages/LibraryApps.txt
index fa8256d..2032edf 100644 (file)
--- a/LUFA/ManPages/LibraryApps.txt
+++ b/LUFA/ManPages/LibraryApps.txt
@@ -105,6 +105,7 @@
  *    - <b>Benito</b> - Benito Board Arduino Programmer project
  *    - <b>LEDNotifier</b> - USB LED Notification project
  *    - <b>Magstripe</b> - Magnetic Stripe Card Reader project
  *    - <b>Benito</b> - Benito Board Arduino Programmer project
  *    - <b>LEDNotifier</b> - USB LED Notification project
  *    - <b>Magstripe</b> - Magnetic Stripe Card Reader project

+ *    - <b>MediaController</b> - Media Playback Controller project

  *    - <b>MIDIToneGenerator</b> - MIDI Note Tone Generator project
  *    - <b>MissileLaucher</b> - Toy Missile Launcher Host project
  *    - <b>RelayBoard</b> - Relay board controller, controllable via the "sismpctl" Linux application
  *    - <b>MIDIToneGenerator</b> - MIDI Note Tone Generator project
  *    - <b>MissileLaucher</b> - Toy Missile Launcher Host project
  *    - <b>RelayBoard</b> - Relay board controller, controllable via the "sismpctl" Linux application

diff --git a/Projects/MediaController/Descriptors.c b/Projects/MediaController/Descriptors.c
index 8ad3b0a..54136ce 100644 (file)
--- a/Projects/MediaController/Descriptors.c
+++ b/Projects/MediaController/Descriptors.c
@@ -48,20 +48,23 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM MediaControlReport[] =
        HID_RI_USAGE_PAGE(8, 0x0C), /* Consumer Page */\r
        HID_RI_USAGE(8, 0x01), /* Consumer Controls */\r
        HID_RI_COLLECTION(8, 0x01), /* Application */\r
        HID_RI_USAGE_PAGE(8, 0x0C), /* Consumer Page */\r
        HID_RI_USAGE(8, 0x01), /* Consumer Controls */\r
        HID_RI_COLLECTION(8, 0x01), /* Application */\r

-               HID_RI_USAGE_MINIMUM(8, 0xB0),\r
-               HID_RI_USAGE_MAXIMUM(8, 0xB7),\r
+               HID_RI_USAGE(8, 0xB0), /* Play */\r
+               HID_RI_USAGE(8, 0xB1), /* Pause */\r
+               HID_RI_USAGE(8, 0xB3), /* Fast Forward */\r
+               HID_RI_USAGE(8, 0xB4), /* Rewind */\r
+               HID_RI_USAGE(8, 0xB5), /* Next Track */\r
+               HID_RI_USAGE(8, 0xB6), /* Previous Track */\r
+               HID_RI_USAGE(8, 0xB7), /* Stop */\r
+               HID_RI_USAGE(8, 0xCD), /* Play/Pause (toggle) */\r
+               HID_RI_USAGE(8, 0xE2), /* Mute */\r
+               HID_RI_USAGE(8, 0xE9), /* Volume Up */\r
+               HID_RI_USAGE(8, 0xEA), /* Volume Down */\r
+               HID_RI_REPORT_SIZE(8, 0x01),\r
+               HID_RI_REPORT_COUNT(8, 0x0B),\r

                HID_RI_LOGICAL_MINIMUM(8, 0),\r
                HID_RI_LOGICAL_MAXIMUM(8, 1),\r
                HID_RI_LOGICAL_MINIMUM(8, 0),\r
                HID_RI_LOGICAL_MAXIMUM(8, 1),\r

-               HID_RI_REPORT_SIZE(8, 0x01),\r
-               HID_RI_REPORT_COUNT(8, 0x08),\r
-               HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_RELATIVE),\r
-               HID_RI_USAGE(8, 0xCD),\r
-               HID_RI_USAGE(8, 0xE2),\r
-               HID_RI_USAGE(8, 0xE9),\r
-               HID_RI_USAGE(8, 0xEA),\r
-               HID_RI_REPORT_COUNT(8, 0x04),\r

                HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_RELATIVE),\r
                HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_RELATIVE),\r

-               HID_RI_REPORT_COUNT(8, 0x04),\r
+               HID_RI_REPORT_COUNT(8, 0x05),\r

                HID_RI_INPUT(8, HID_IOF_CONSTANT),\r
        HID_RI_END_COLLECTION(0),\r
 };\r
                HID_RI_INPUT(8, HID_IOF_CONSTANT),\r
        HID_RI_END_COLLECTION(0),\r
 };\r

diff --git a/Projects/MediaController/MediaController.h b/Projects/MediaController/MediaController.h
index fd4c557..71281e9 100644 (file)
--- a/Projects/MediaController/MediaController.h
+++ b/Projects/MediaController/MediaController.h
@@ -74,7 +74,6 @@
                {\r
                        unsigned Play           : 1;\r
                        unsigned Pause          : 1;\r
                {\r
                        unsigned Play           : 1;\r
                        unsigned Pause          : 1;\r

-                       unsigned Record         : 1;\r

                        unsigned FForward       : 1;\r
                        unsigned Rewind         : 1;\r
                        unsigned NextTrack      : 1;\r
                        unsigned FForward       : 1;\r
                        unsigned Rewind         : 1;\r
                        unsigned NextTrack      : 1;\r


@@ -84,7 +83,7 @@
                        unsigned Mute           : 1;\r
                        unsigned VolumeUp       : 1;\r
                        unsigned VolumeDown     : 1;\r
                        unsigned Mute           : 1;\r
                        unsigned VolumeUp       : 1;\r
                        unsigned VolumeDown     : 1;\r

-                       unsigned PADDING        : 4;\r
+                       unsigned RESERVED       : 5;\r

                } ATTR_PACKED USB_MediaReport_Data_t;\r
 \r
        /* Function Prototypes: */\r
                } ATTR_PACKED USB_MediaReport_Data_t;\r
 \r
        /* Function Prototypes: */\r