Max/mon_PocketVoltex
1
0
Fork 0
mirror of https://github.com/mon/PocketVoltex.git synced 2026-09-30 18:57:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

Actually, properly fix stalls

Browse Source
This commit is contained in:
William Toohey
2017-02-17 01:02:48 +10:00
parent 4252eccaf9
commit 771b32b88a
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Firmware/PocketVoltex/Config/LUFAConfig.h
+1 -1
View File
@@ -67,7 +67,7 @@
#define USE_FLASH_DESCRIPTORS
// #define USE_EEPROM_DESCRIPTORS
// #define NO_INTERNAL_SERIAL
#define FIXED_CONTROL_ENDPOINT_SIZE 64
#define FIXED_CONTROL_ENDPOINT_SIZE 16
// #define DEVICE_STATE_AS_GPIOR {Insert Value Here}
#define FIXED_NUM_CONFIGURATIONS 1
// #define CONTROL_ONLY_DEVICE
Firmware/PocketVoltex/Descriptors.h
+12 -13
View File
@@ -75,21 +75,20 @@
#define CONFIG_IN_EPADDR (ENDPOINT_DIR_IN | 2)
#define INPUTS_EPADDR (ENDPOINT_DIR_IN | 3)
#define LED_EPADDR (ENDPOINT_DIR_IN | 4)
// the board only supports endpoints of 8, 16, 32 or 64 bytes
#define ROUND_UP(bytes) ((bytes) <= 8 ? 8 : \
(bytes) <= 16 ? 16 : \
(bytes) <= 32 ? 32 : 64) // if it's larger than 64 bytes, you're out of luck
/* acts like a union
* keyboard is switches + modifiers and reserved byte
* mouse is 8 bytes
* joystick is 2 axis + buttons as bitmask
* add 1 for report ID */
#define INPUTS_EPSIZE ROUND_UP(1+MAX(MAX(SWITCH_COUNT + 2, 8), 3 + SWITCH_COUNT/8))
#define LED_EPSIZE ROUND_UP(LED_TOTAL_COUNT)
/* Contrary to my incorrect earlier assumptions, this is NOT the size
* of reports that can go out to the host - that's defined by the HID
* report descriptor. Instead, it's the maximum packet size for the transfer,
* which will be split up as needed to fit all the bytes in the report.
* For ease of use, I've set this to the control endpoint size.
*
* I can only hope this is finally correct - buffer overflow could also
* cause this I think, but I have so much free RAM I don't think so */
#define INPUTS_EPSIZE FIXED_CONTROL_ENDPOINT_SIZE
#define LED_EPSIZE FIXED_CONTROL_ENDPOINT_SIZE
// ignoring board limits, bulk endpoints MUST be 8, 16, 32 or 64 bytes
#define CONFIG_EPSIZE ROUND_UP(COMMAND_BYTES+1)
// set to max EP size of the atmega16u2, to give room to grow and not eat frames
#define CONFIG_EPSIZE 64
/* Function Prototypes: */
uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,