358d480ea9
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
119 lines
3.5 KiB
C
119 lines
3.5 KiB
C
/* Teensyduino Core Library
|
|
* http://www.pjrc.com/teensy/
|
|
* Copyright (c) 2013 PJRC.COM, LLC.
|
|
* Modified by Jacob Alexander (2015-2016)
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining
|
|
* a copy of this software and associated documentation files (the
|
|
* "Software"), to deal in the Software without restriction, including
|
|
* without limitation the rights to use, copy, modify, merge, publish,
|
|
* distribute, sublicense, and/or sell copies of the Software, and to
|
|
* permit persons to whom the Software is furnished to do so, subject to
|
|
* the following conditions:
|
|
*
|
|
* 1. The above copyright notice and this permission notice shall be
|
|
* included in all copies or substantial portions of the Software.
|
|
*
|
|
* 2. If the Software is incorporated into a build system that allows
|
|
* selection among a list of target devices, then similar target
|
|
* devices manufactured by PJRC.COM must be included in the list of
|
|
* target devices and selectable in the same manner.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
|
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
* SOFTWARE.
|
|
*/
|
|
|
|
#if enableJoystick_define == 1
|
|
|
|
// ----- Includes -----
|
|
|
|
// Compiler Includes
|
|
#include <string.h> // for memcpy()
|
|
|
|
// Project Includes
|
|
#include <Lib/OutputLib.h>
|
|
#include <print.h>
|
|
|
|
// Local Includes
|
|
#include "usb_dev.h"
|
|
#include "usb_joystick.h"
|
|
|
|
|
|
|
|
// ----- Defines -----
|
|
|
|
// Maximum number of transmit packets to queue so we don't starve other endpoints for memory
|
|
#define TX_PACKET_LIMIT 3
|
|
|
|
// When the PC isn't listening, how long do we wait before discarding data?
|
|
#define TX_TIMEOUT_MSEC 30
|
|
|
|
#if F_CPU == 168000000
|
|
#define TX_TIMEOUT (TX_TIMEOUT_MSEC * 1100)
|
|
#elif F_CPU == 144000000
|
|
#define TX_TIMEOUT (TX_TIMEOUT_MSEC * 932)
|
|
#elif F_CPU == 120000000
|
|
#define TX_TIMEOUT (TX_TIMEOUT_MSEC * 764)
|
|
#elif F_CPU == 96000000
|
|
#define TX_TIMEOUT (TX_TIMEOUT_MSEC * 596)
|
|
#elif F_CPU == 72000000
|
|
#define TX_TIMEOUT (TX_TIMEOUT_MSEC * 512)
|
|
#elif F_CPU == 48000000
|
|
#define TX_TIMEOUT (TX_TIMEOUT_MSEC * 428)
|
|
#elif F_CPU == 24000000
|
|
#define TX_TIMEOUT (TX_TIMEOUT_MSEC * 262)
|
|
#endif
|
|
|
|
|
|
|
|
// ----- Variables -----
|
|
|
|
uint32_t usb_joystick_data[3];
|
|
|
|
|
|
static uint8_t transmit_previous_timeout = 0;
|
|
|
|
|
|
|
|
// ----- Functions -----
|
|
|
|
int usb_joystick_send()
|
|
{
|
|
uint32_t wait_count=0;
|
|
usb_packet_t *tx_packet;
|
|
|
|
//serial_print("send");
|
|
//serial_print("\n");
|
|
while (1) {
|
|
if (!usb_configuration) {
|
|
//serial_print("error1\n");
|
|
return -1;
|
|
}
|
|
if (usb_tx_packet_count(JOYSTICK_ENDPOINT) < TX_PACKET_LIMIT) {
|
|
tx_packet = usb_malloc();
|
|
if (tx_packet) break;
|
|
}
|
|
if (++wait_count > TX_TIMEOUT || transmit_previous_timeout) {
|
|
transmit_previous_timeout = 1;
|
|
//serial_print("error2\n");
|
|
return -1;
|
|
}
|
|
yield();
|
|
}
|
|
transmit_previous_timeout = 0;
|
|
memcpy(tx_packet->buf, usb_joystick_data, 12);
|
|
tx_packet->len = 12;
|
|
usb_tx(JOYSTICK_ENDPOINT, tx_packet);
|
|
//serial_print("ok\n");
|
|
return 0;
|
|
}
|
|
|
|
#endif
|
|
|