di0ib/controller
Archived
1
0
Fork 0
Code Releases Activity

Adding timeout to virtual serial port writes

Browse Source 
- Was causing lock-ups until the serial port was read
- Also checking each of the NKRO key types in each send loop
This commit is contained in:
Jacob Alexander 2014-10-04 14:50:42 -07:00
parent 6e4c28ef84
commit 358b1f33bb
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Output/pjrcUSB/avr/usb_keyboard_serial.c
View File

@ -114,7 +114,7 @@ inline void usb_keyboard_send()
USBKeys_Changed &= ~USBKeyChangeState_Modifiers; // Mark sent USBKeys_Changed &= ~USBKeyChangeState_Modifiers; // Mark sent
} }
// Check main key section // Check main key section
else if ( USBKeys_Changed & USBKeyChangeState_MainKeys ) if ( USBKeys_Changed & USBKeyChangeState_MainKeys )
{ {
UEDATX = 0x03; // ID UEDATX = 0x03; // ID
@ -127,7 +127,7 @@ inline void usb_keyboard_send()
USBKeys_Changed &= ~USBKeyChangeState_MainKeys; // Mark sent USBKeys_Changed &= ~USBKeyChangeState_MainKeys; // Mark sent
} }
// Check secondary key section // Check secondary key section
else if ( USBKeys_Changed & USBKeyChangeState_SecondaryKeys ) if ( USBKeys_Changed & USBKeyChangeState_SecondaryKeys )
{ {
UEDATX = 0x04; // ID UEDATX = 0x04; // ID
@ -140,7 +140,7 @@ inline void usb_keyboard_send()
USBKeys_Changed &= ~USBKeyChangeState_SecondaryKeys; // Mark sent USBKeys_Changed &= ~USBKeyChangeState_SecondaryKeys; // Mark sent
} }
// Check tertiary key section // Check tertiary key section
else if ( USBKeys_Changed & USBKeyChangeState_TertiaryKeys ) if ( USBKeys_Changed & USBKeyChangeState_TertiaryKeys )
{ {
UEDATX = 0x05; // ID UEDATX = 0x05; // ID
@ -153,7 +153,7 @@ inline void usb_keyboard_send()
USBKeys_Changed &= ~USBKeyChangeState_TertiaryKeys; // Mark sent USBKeys_Changed &= ~USBKeyChangeState_TertiaryKeys; // Mark sent
} }
// Check system control keys // Check system control keys
else if ( USBKeys_Changed & USBKeyChangeState_System ) if ( USBKeys_Changed & USBKeyChangeState_System )
{ {
UEDATX = 0x06; // ID UEDATX = 0x06; // ID
UEDATX = USBKeys_SysCtrl; UEDATX = USBKeys_SysCtrl;
@ -162,7 +162,7 @@ inline void usb_keyboard_send()
USBKeys_Changed &= ~USBKeyChangeState_System; // Mark sent USBKeys_Changed &= ~USBKeyChangeState_System; // Mark sent
} }
// Check consumer control keys // Check consumer control keys
else if ( USBKeys_Changed & USBKeyChangeState_Consumer ) if ( USBKeys_Changed & USBKeyChangeState_Consumer )
{ {
UEDATX = 0x07; // ID UEDATX = 0x07; // ID
UEDATX = (uint8_t)(USBKeys_ConsCtrl & 0x00FF); UEDATX = (uint8_t)(USBKeys_ConsCtrl & 0x00FF);
@ -351,7 +351,7 @@ int8_t usb_serial_write(const char *buffer, uint16_t size)
cli(); cli();
UENUM = CDC_TX_ENDPOINT; UENUM = CDC_TX_ENDPOINT;
// if we gave up due to timeout before, don't wait again // if we gave up due to timeout before, don't wait again
/*
if (transmit_previous_timeout) { if (transmit_previous_timeout) {
if (!(UEINTX & (1<<RWAL))) { if (!(UEINTX & (1<<RWAL))) {
SREG = intr_state; SREG = intr_state;
@ -359,7 +359,7 @@ int8_t usb_serial_write(const char *buffer, uint16_t size)
} }
transmit_previous_timeout = 0; transmit_previous_timeout = 0;
} }
*/
// each iteration of this loop transmits a packet // each iteration of this loop transmits a packet
while (size) { while (size) {
// wait for the FIFO to be ready to accept data // wait for the FIFO to be ready to accept data
@ -474,7 +474,7 @@ int8_t usb_serial_write(const char *buffer, uint16_t size)
// This doesn't actually transmit the data - that is impossible! // This doesn't actually transmit the data - that is impossible!
// USB devices only transmit when the host allows, so the best // USB devices only transmit when the host allows, so the best
// we can do is release the FIFO buffer for when the host wants it // we can do is release the FIFO buffer for when the host wants it
void usb_serial_flush_output(void) void usb_serial_flush_output()
{ {
uint8_t intr_state; uint8_t intr_state;