Mercurial > louis > kiibohd-controller

comparison Output/pjrcUSB/arm/usb_keyboard.c @ 449:45feb80a2ad1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Major USB update, fixes most (if not all) known issues USB - General - Refactored descriptors - Enabled/Disable USB endpoints - Added debug flags for special features - Code cleanup - Interface count calculation based off of enabled endpoints - Delayed wTotalLength calculation to simplify descriptor offsets - Re-ordered endpoints and interfaces - Added more debug output - Added usbInitTime to show how long keyboard initialization took (Useful when debugging bad init sequences) - Added function for usb_resume() which takes care of the resume sequence * Resume is now only called if packets are starting to timeout USB - Special Options - Added enableDeviceRestartOnUSBTimeout * A last resort hammer for bad USB Chipsets/OSs, don't use if you can help it * Disabled - Added enableUSBResume * Enables host resume wake-up signalling, required to wake a computer from sleep * Enabled - Added enableUSBLowPowerNegotiation * Enables power negotiation hack * Required to use firmware with an IPad and other hard-limit low-power USB hosts * Hasn't been tested with the recent changes * Disabled - Added enableUSBSuspend * Enables power down events on host USB bus suspend * Enabled USB - Keyboard - Attempted to cleanup HID SET_REPORT * Works much better * Still has an issue under Linux which generates *a lot* of NAKs (initializes quickly regardless) + Not present on other keyboards + SETUP -> OUT -> IN : This sequence is the problem + Specifically during the OUT phase - Enabled USB - CDC Virtual Serial Port - Code cleanup - Added convenience struct USBCDCLineCoding for easier debugging - Attempted to cleanup CDC_SET_LING_CODING * Works much better * Still has an issue under Linux which generates *a lot* of NAKs (initializes quickly regardless) + SETUP -> OUT -> IN : This sequence is the problem + Specifically during the OUT phase + Likely the same issues as HID SET_REPORT - Enabled USB - Mouse - Enabled USB - Joystick - Disabled USB - RawIO - Initial code, API not used yet - Disabled DFU - Updated load script, now faster
author Jacob Alexander <haata@kiibohd.com>
date Tue, 31 May 2016 00:19:45 -0700
parents 56237ba5da6f
children
comparison
equal deleted inserted replaced
448:077a1dfd8529 449:45feb80a2ad1
1 /* Teensyduino Core Library 1 /* Teensyduino Core Library
2 * http://www.pjrc.com/teensy/ 2 * http://www.pjrc.com/teensy/
3 * Copyright (c) 2013 PJRC.COM, LLC. 3 * Copyright (c) 2013 PJRC.COM, LLC.
4 * Modifications by Jacob Alexander 2013-2015 4 * Modifications by Jacob Alexander 2013-2016
5 * 5 *
6 * Permission is hereby granted, free of charge, to any person obtaining 6 * Permission is hereby granted, free of charge, to any person obtaining
7 * a copy of this software and associated documentation files (the 7 * a copy of this software and associated documentation files (the
8 * "Software"), to deal in the Software without restriction, including 8 * "Software"), to deal in the Software without restriction, including
9 * without limitation the rights to use, copy, modify, merge, publish, 9 * without limitation the rights to use, copy, modify, merge, publish,
26 * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 26 * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
27 * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 27 * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
28 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 28 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
29 * SOFTWARE. 29 * SOFTWARE.
30 */ 30 */
31
32 #include <kll_defs.h>
33 #if enableKeyboard_define == 1
31 34
32 // ----- Includes ----- 35 // ----- Includes -----
33 36
34 // Compiler Includes 37 // Compiler Includes
35 #include <string.h> // for memcpy() 38 #include <string.h> // for memcpy()
121 if ( tx_packet ) 124 if ( tx_packet )
122 break; 125 break;
123 } 126 }
124 } 127 }
125 128
129 // USB Timeout, drop the packet, and potentially try something more drastic to re-enable the bus
126 if ( ++wait_count > TX_TIMEOUT || transmit_previous_timeout ) 130 if ( ++wait_count > TX_TIMEOUT || transmit_previous_timeout )
127 { 131 {
128 transmit_previous_timeout = 1; 132 transmit_previous_timeout = 1;
133 USBKeys_Changed = USBKeyChangeState_None; // Indicate packet lost
134 #if enableDeviceRestartOnUSBTimeout == 1
129 warn_print("USB Transmit Timeout...restarting device"); 135 warn_print("USB Transmit Timeout...restarting device");
130 USBKeys_Changed = USBKeyChangeState_None; // Indicate packet lost
131 usb_device_software_reset(); 136 usb_device_software_reset();
137 #else
138 warn_print("USB Transmit Timeout...auto-restart disabled");
139 #endif
140 // Try to wakeup
132 return; 141 return;
133 } 142 }
143
144 // Try to wake up the device if we can't allocate a packet for some reason
145 // XXX This is a bit aggressive, but seems to work well. Unfortunately, not as quick as I'd like it -HaaTa
146 usb_resume();
147
134 yield(); 148 yield();
135 } 149 }
136 150
137 transmit_previous_timeout = 0; 151 transmit_previous_timeout = 0;
138 152
275 } 289 }
276 290
277 return; 291 return;
278 } 292 }
279 293
294 #endif
295