Dwayne Dilbeck / USBDevice

Forked to make modifications to bring the USBHID into USB compliance and add additional features.

Dependents:   HW4_AudioControl

Fork of USBDevice by mbed official

As of Revision 18 everything in the USBHID specification is now implemented, except Multi-reports.

Revision comments for changelist 18

USBHID.cpp

  • Added SET_PROTOCOL support
  • Added GET_PROTOCOL support
  • protocolSate is set to 1 by default to match USB HID specification. This variable should be checked to determine which format theinput report should have. 1 - Use the user specified report format. 0 - Use the BOOT protocol report format.

Revision comments for changelist 16

  • HID_REPORT transformed from structure to class. This was done for several reasons.
  1. When multiple reports are used the 64 byte size for every report becomes a problem.
  2. The length value should always remain the same for a report, Make the constructor set the vale at the same time it allocates memory for the DATA area.
  • By default the data will be an array of MAX_HID_REPORT_SIZE like the structure,
  • When given a length argument, the hid_report.length will be set, and hid_report.data will be an array of the size given.
  • Length zero causes data to be NULL
  • Mostly backwards compatible. The definition of a destructor caused a compiler error in USBMouse::update and USBMousekeyboard::update. This error was caused by instatiation of HID_REPORT in the middle of an IF logic statement. These files have been modified. The error complained that the logic skipped object initialization. The HID_REPORT has been moved to the class definition. Since both ABSOLUTE and RELATIVE modes used the HID_REPORT, this seems to make more sense. Previously the hid_report would be instatiated in <class>::mousesend and <class>::update.

Revision comments for changelist 14

USBdevice.cpp

  • Modified USB device state to change from Configure when disconnect is called.
  • Modified the call back function for when the suspend state changes. This should be used to turn off peripherals to conserve power.

Revision comments for changelist 13

USBdevice.cpp

  • ) Changed DEBUG messages to be more descriptive for string descriptor
  • ) Bug fix: Control Transfers did not actually transfer the data from Buffer to transfer->ptr

USBHIDTypes.h

  • ) Added ALL CLASS request to KEYWORD list
  • ) Added KEYWORDS for report type

USBHID.h

  • ) Added a new constructor to specify size of feature report
  • ) Added HID_REPORT inputReport and featureReport
  • ) Added data structures to support IDLE rate
  • ) Added data structures to support callback functions

USBHID.cpp

  • ) Changed constructor to initialize new feature data structures
  • ) Implemented Set_IDLE/GET_IDLE and the periodic resend of non-changed data
  • ) Implemented HID specification required control transfer GET_REPORT
  • ) Fixed issue where Intreput transfers and control transfers did not access the same data structures.
  • ) Implemented Feature reports
  • ) Implemented Callback Hooks for get_report/set_report actions.
  • ) Added callback hooks for interupt actions in the new functions.
  • ) interupt transfer can now write to outputReport
  • ) Modified SET_REPORT code to function for multiple types.
  • ) Refactored some code in preperation to add multi report support
Test NumberTest DescriptionTest ResultNotes
1Use USBmouse to verify backward compatibility of constructor and methodsPass
2Test SET_REPORT can set a feature reportPass
3Test GET_REPORT can retrieve a feature reportPass
4Test SET_IDLE sets up a reoccuring triggerPassIOCTL_SET_POLL_FREQUENCY_MSEC does not function for the windows HID driver. A Special test program is used to rearm the IDLE rate after windows sets it to zero
5Test SET_IDLE disables a triggerPassWindows automatically sends this command to a HID device when it is inserted.
6Enabled DEBUG in USBDevice.cpp and generated str descriptor requests.Pass
7Test SET_REPORT can set an output reportPass
8Test GET_REPORT can retrieve an output reportPass
9ReadFile, accesses the input_reportPass
10WriteFile accesses the output_report, via interupt transfer when ep1_out is used.Pass
11WriteFile accesses the output_report, via control transfer when ep1_out is NOT used.Not Tested
12Callback hooks trigger independently for each type of set_report/get_reportPass
13New constructor sets feature_report sizePass
14Control transfer SET_REPORT and writeFile access the same data structureBUGThe same data structure is accessed, but the data transfer size is different. The writeFile strips the leading byte which is the report ID, The Control transfer keeps the byte.
15Control transfer GET_REPORT and readFile access the same data structureBUGThe same dtat structure is accessed, but the data transfer size is different. The readFile strips the leading byte which is the report ID, The Control transfer keeps the byte.
16Test GET_IDLE retrieves the IDLE rateUnknownWindows HID driver does not implement IOCTL_HID_GET_POLL_FREQUENCY_MSEC

USBHID/USBMouse.h@1:80ab0d068708, 2012-07-17 (annotated)

Committer:
samux
Date:
Tue Jul 17 14:30:29 2012 +0000
Revision:
1:80ab0d068708
Child:
16:49a551d94ad1
Update USBDevice lib

Who changed what in which revision?

UserRevisionLine numberNew contents of line
samux 1:80ab0d068708 1 /* Copyright (c) 2010-2011 mbed.org, MIT License
samux 1:80ab0d068708 2 *
samux 1:80ab0d068708 3 * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
samux 1:80ab0d068708 4 * and associated documentation files (the "Software"), to deal in the Software without
samux 1:80ab0d068708 5 * restriction, including without limitation the rights to use, copy, modify, merge, publish,
samux 1:80ab0d068708 6 * distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
samux 1:80ab0d068708 7 * Software is furnished to do so, subject to the following conditions:
samux 1:80ab0d068708 8 *
samux 1:80ab0d068708 9 * The above copyright notice and this permission notice shall be included in all copies or
samux 1:80ab0d068708 10 * substantial portions of the Software.
samux 1:80ab0d068708 11 *
samux 1:80ab0d068708 12 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
samux 1:80ab0d068708 13 * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
samux 1:80ab0d068708 14 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
samux 1:80ab0d068708 15 * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
samux 1:80ab0d068708 16 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
samux 1:80ab0d068708 17 */
samux 1:80ab0d068708 18
samux 1:80ab0d068708 19 #ifndef USBMOUSE_H
samux 1:80ab0d068708 20 #define USBMOUSE_H
samux 1:80ab0d068708 21
samux 1:80ab0d068708 22 #include "USBHID.h"
samux 1:80ab0d068708 23
samux 1:80ab0d068708 24 #define REPORT_ID_MOUSE 2
samux 1:80ab0d068708 25
samux 1:80ab0d068708 26 /* Common usage */
samux 1:80ab0d068708 27
samux 1:80ab0d068708 28 enum MOUSE_BUTTON
samux 1:80ab0d068708 29 {
samux 1:80ab0d068708 30 MOUSE_LEFT = 1,
samux 1:80ab0d068708 31 MOUSE_RIGHT = 2,
samux 1:80ab0d068708 32 MOUSE_MIDDLE = 4,
samux 1:80ab0d068708 33 };
samux 1:80ab0d068708 34
samux 1:80ab0d068708 35 /* X and Y limits */
samux 1:80ab0d068708 36 /* These values do not directly map to screen pixels */
samux 1:80ab0d068708 37 /* Zero may be interpreted as meaning 'no movement' */
samux 1:80ab0d068708 38 #define X_MIN_ABS (1) /*!< Minimum value on x-axis */
samux 1:80ab0d068708 39 #define Y_MIN_ABS (1) /*!< Minimum value on y-axis */
samux 1:80ab0d068708 40 #define X_MAX_ABS (0x7fff) /*!< Maximum value on x-axis */
samux 1:80ab0d068708 41 #define Y_MAX_ABS (0x7fff) /*!< Maximum value on y-axis */
samux 1:80ab0d068708 42
samux 1:80ab0d068708 43 #define X_MIN_REL (-127) /*!< The maximum value that we can move to the left on the x-axis */
samux 1:80ab0d068708 44 #define Y_MIN_REL (-127) /*!< The maximum value that we can move up on the y-axis */
samux 1:80ab0d068708 45 #define X_MAX_REL (127) /*!< The maximum value that we can move to the right on the x-axis */
samux 1:80ab0d068708 46 #define Y_MAX_REL (127) /*!< The maximum value that we can move down on the y-axis */
samux 1:80ab0d068708 47
samux 1:80ab0d068708 48 enum MOUSE_TYPE
samux 1:80ab0d068708 49 {
samux 1:80ab0d068708 50 ABS_MOUSE,
samux 1:80ab0d068708 51 REL_MOUSE,
samux 1:80ab0d068708 52 };
samux 1:80ab0d068708 53
samux 1:80ab0d068708 54 /**
samux 1:80ab0d068708 55 *
samux 1:80ab0d068708 56 * USBMouse example
samux 1:80ab0d068708 57 * @code
samux 1:80ab0d068708 58 * #include "mbed.h"
samux 1:80ab0d068708 59 * #include "USBMouse.h"
samux 1:80ab0d068708 60 *
samux 1:80ab0d068708 61 * USBMouse mouse;
samux 1:80ab0d068708 62 *
samux 1:80ab0d068708 63 * int main(void)
samux 1:80ab0d068708 64 * {
samux 1:80ab0d068708 65 * while (1)
samux 1:80ab0d068708 66 * {
samux 1:80ab0d068708 67 * mouse.move(20, 0);
samux 1:80ab0d068708 68 * wait(0.5);
samux 1:80ab0d068708 69 * }
samux 1:80ab0d068708 70 * }
samux 1:80ab0d068708 71 *
samux 1:80ab0d068708 72 * @endcode
samux 1:80ab0d068708 73 *
samux 1:80ab0d068708 74 *
samux 1:80ab0d068708 75 * @code
samux 1:80ab0d068708 76 * #include "mbed.h"
samux 1:80ab0d068708 77 * #include "USBMouse.h"
samux 1:80ab0d068708 78 * #include <math.h>
samux 1:80ab0d068708 79 *
samux 1:80ab0d068708 80 * USBMouse mouse(ABS_MOUSE);
samux 1:80ab0d068708 81 *
samux 1:80ab0d068708 82 * int main(void)
samux 1:80ab0d068708 83 * {
samux 1:80ab0d068708 84 * uint16_t x_center = (X_MAX_ABS - X_MIN_ABS)/2;
samux 1:80ab0d068708 85 * uint16_t y_center = (Y_MAX_ABS - Y_MIN_ABS)/2;
samux 1:80ab0d068708 86 * uint16_t x_screen = 0;
samux 1:80ab0d068708 87 * uint16_t y_screen = 0;
samux 1:80ab0d068708 88 *
samux 1:80ab0d068708 89 * uint32_t x_origin = x_center;
samux 1:80ab0d068708 90 * uint32_t y_origin = y_center;
samux 1:80ab0d068708 91 * uint32_t radius = 5000;
samux 1:80ab0d068708 92 * uint32_t angle = 0;
samux 1:80ab0d068708 93 *
samux 1:80ab0d068708 94 * while (1)
samux 1:80ab0d068708 95 * {
samux 1:80ab0d068708 96 * x_screen = x_origin + cos((double)angle*3.14/180.0)*radius;
samux 1:80ab0d068708 97 * y_screen = y_origin + sin((double)angle*3.14/180.0)*radius;
samux 1:80ab0d068708 98 *
samux 1:80ab0d068708 99 * mouse.move(x_screen, y_screen);
samux 1:80ab0d068708 100 * angle += 3;
samux 1:80ab0d068708 101 * wait(0.01);
samux 1:80ab0d068708 102 * }
samux 1:80ab0d068708 103 * }
samux 1:80ab0d068708 104 *
samux 1:80ab0d068708 105 * @endcode
samux 1:80ab0d068708 106 */
samux 1:80ab0d068708 107 class USBMouse: public USBHID
samux 1:80ab0d068708 108 {
samux 1:80ab0d068708 109 public:
samux 1:80ab0d068708 110
samux 1:80ab0d068708 111 /**
samux 1:80ab0d068708 112 * Constructor
samux 1:80ab0d068708 113 *
samux 1:80ab0d068708 114 * @param mouse_type Mouse type: ABS_MOUSE (absolute mouse) or REL_MOUSE (relative mouse) (default: REL_MOUSE)
samux 1:80ab0d068708 115 * @param vendor_id Your vendor_id (default: 0x1234)
samux 1:80ab0d068708 116 * @param product_id Your product_id (default: 0x0001)
samux 1:80ab0d068708 117 * @param product_release Your preoduct_release (default: 0x0001)
samux 1:80ab0d068708 118 *
samux 1:80ab0d068708 119 */
samux 1:80ab0d068708 120 USBMouse(MOUSE_TYPE mouse_type = REL_MOUSE, uint16_t vendor_id = 0x1234, uint16_t product_id = 0x0001, uint16_t product_release = 0x0001):
samux 1:80ab0d068708 121 USBHID(0, 0, vendor_id, product_id, product_release, false)
samux 1:80ab0d068708 122 {
samux 1:80ab0d068708 123 button = 0;
samux 1:80ab0d068708 124 this->mouse_type = mouse_type;
samux 1:80ab0d068708 125 connect();
samux 1:80ab0d068708 126 };
samux 1:80ab0d068708 127
samux 1:80ab0d068708 128 /**
samux 1:80ab0d068708 129 * Write a state of the mouse
samux 1:80ab0d068708 130 *
samux 1:80ab0d068708 131 * @param x x-axis position
samux 1:80ab0d068708 132 * @param y y-axis position
samux 1:80ab0d068708 133 * @param buttons buttons state (first bit represents MOUSE_LEFT, second bit MOUSE_RIGHT and third bit MOUSE_MIDDLE)
samux 1:80ab0d068708 134 * @param z wheel state (>0 to scroll down, <0 to scroll up)
samux 1:80ab0d068708 135 * @returns true if there is no error, false otherwise
samux 1:80ab0d068708 136 */
samux 1:80ab0d068708 137 bool update(int16_t x, int16_t y, uint8_t buttons, int8_t z);
samux 1:80ab0d068708 138
samux 1:80ab0d068708 139
samux 1:80ab0d068708 140 /**
samux 1:80ab0d068708 141 * Move the cursor to (x, y)
samux 1:80ab0d068708 142 *
samux 1:80ab0d068708 143 * @param x-axis position
samux 1:80ab0d068708 144 * @param y-axis position
samux 1:80ab0d068708 145 * @returns true if there is no error, false otherwise
samux 1:80ab0d068708 146 */
samux 1:80ab0d068708 147 bool move(int16_t x, int16_t y);
samux 1:80ab0d068708 148
samux 1:80ab0d068708 149 /**
samux 1:80ab0d068708 150 * Press one or several buttons
samux 1:80ab0d068708 151 *
samux 1:80ab0d068708 152 * @param button button state (ex: press(MOUSE_LEFT))
samux 1:80ab0d068708 153 * @returns true if there is no error, false otherwise
samux 1:80ab0d068708 154 */
samux 1:80ab0d068708 155 bool press(uint8_t button);
samux 1:80ab0d068708 156
samux 1:80ab0d068708 157 /**
samux 1:80ab0d068708 158 * Release one or several buttons
samux 1:80ab0d068708 159 *
samux 1:80ab0d068708 160 * @param button button state (ex: release(MOUSE_LEFT))
samux 1:80ab0d068708 161 * @returns true if there is no error, false otherwise
samux 1:80ab0d068708 162 */
samux 1:80ab0d068708 163 bool release(uint8_t button);
samux 1:80ab0d068708 164
samux 1:80ab0d068708 165 /**
samux 1:80ab0d068708 166 * Double click (MOUSE_LEFT)
samux 1:80ab0d068708 167 *
samux 1:80ab0d068708 168 * @returns true if there is no error, false otherwise
samux 1:80ab0d068708 169 */
samux 1:80ab0d068708 170 bool doubleClick();
samux 1:80ab0d068708 171
samux 1:80ab0d068708 172 /**
samux 1:80ab0d068708 173 * Click
samux 1:80ab0d068708 174 *
samux 1:80ab0d068708 175 * @param button state of the buttons ( ex: clic(MOUSE_LEFT))
samux 1:80ab0d068708 176 * @returns true if there is no error, false otherwise
samux 1:80ab0d068708 177 */
samux 1:80ab0d068708 178 bool click(uint8_t button);
samux 1:80ab0d068708 179
samux 1:80ab0d068708 180 /**
samux 1:80ab0d068708 181 * Scrolling
samux 1:80ab0d068708 182 *
samux 1:80ab0d068708 183 * @param z value of the wheel (>0 to go down, <0 to go up)
samux 1:80ab0d068708 184 * @returns true if there is no error, false otherwise
samux 1:80ab0d068708 185 */
samux 1:80ab0d068708 186 bool scroll(int8_t z);
samux 1:80ab0d068708 187
samux 1:80ab0d068708 188 /*
samux 1:80ab0d068708 189 * To define the report descriptor. Warning: this method has to store the length of the report descriptor in reportLength.
samux 1:80ab0d068708 190 *
samux 1:80ab0d068708 191 * @returns pointer to the report descriptor
samux 1:80ab0d068708 192 */
samux 1:80ab0d068708 193 virtual uint8_t * reportDesc();
samux 1:80ab0d068708 194
samux 1:80ab0d068708 195 protected:
samux 1:80ab0d068708 196 /*
samux 1:80ab0d068708 197 * Get configuration descriptor
samux 1:80ab0d068708 198 *
samux 1:80ab0d068708 199 * @returns pointer to the configuration descriptor
samux 1:80ab0d068708 200 */
samux 1:80ab0d068708 201 virtual uint8_t * configurationDesc();
samux 1:80ab0d068708 202
samux 1:80ab0d068708 203 private:
samux 1:80ab0d068708 204 MOUSE_TYPE mouse_type;
samux 1:80ab0d068708 205 uint8_t button;
samux 1:80ab0d068708 206 bool mouseSend(int8_t x, int8_t y, uint8_t buttons, int8_t z);
samux 1:80ab0d068708 207 };
samux 1:80ab0d068708 208
samux 1:80ab0d068708 209 #endif