Mercurial > louis > kiibohd-controller
diff Output/pjrcUSB/arm/usb_keyboard.c @ 449:45feb80a2ad1
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 |
line wrap: on
line diff
--- a/Output/pjrcUSB/arm/usb_keyboard.c Sun May 29 10:27:21 2016 -0700 +++ b/Output/pjrcUSB/arm/usb_keyboard.c Tue May 31 00:19:45 2016 -0700 @@ -1,7 +1,7 @@ /* Teensyduino Core Library * http://www.pjrc.com/teensy/ * Copyright (c) 2013 PJRC.COM, LLC. - * Modifications by Jacob Alexander 2013-2015 + * Modifications by Jacob Alexander 2013-2016 * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the @@ -29,6 +29,9 @@ * SOFTWARE. */ +#include <kll_defs.h> +#if enableKeyboard_define == 1 + // ----- Includes ----- // Compiler Includes @@ -123,14 +126,25 @@ } } + // USB Timeout, drop the packet, and potentially try something more drastic to re-enable the bus if ( ++wait_count > TX_TIMEOUT || transmit_previous_timeout ) { transmit_previous_timeout = 1; + USBKeys_Changed = USBKeyChangeState_None; // Indicate packet lost + #if enableDeviceRestartOnUSBTimeout == 1 warn_print("USB Transmit Timeout...restarting device"); - USBKeys_Changed = USBKeyChangeState_None; // Indicate packet lost usb_device_software_reset(); + #else + warn_print("USB Transmit Timeout...auto-restart disabled"); + #endif + // Try to wakeup return; } + + // Try to wake up the device if we can't allocate a packet for some reason + // XXX This is a bit aggressive, but seems to work well. Unfortunately, not as quick as I'd like it -HaaTa + usb_resume(); + yield(); } @@ -277,3 +291,5 @@ return; } +#endif +