Mercurial > louis > kiibohd-controller
comparison Output/pjrcUSB/arm/usb_keyboard.c @ 346:1beec5f17e64
Revert "Merge pull request #27 from smasher816/wakeup-devel"
This reverts commit 622ea5d85f94be4b1694fdf08e30fa76eeb18fe4, reversing
changes made to c21439cb48daec7514da4250c41962205fa96624.
| author | Jacob Alexander <haata@kiibohd.com> |
|---|---|
| date | Tue, 23 Jun 2015 08:00:16 -0700 |
| parents | 9ac304aa1ab5 |
| children | 06a54d582bf8 |
comparison
equal
deleted
inserted
replaced
| 345:2bcf6800b851 | 346:1beec5f17e64 |
|---|---|
| 75 // send the contents of keyboard_keys and keyboard_modifier_keys | 75 // send the contents of keyboard_keys and keyboard_modifier_keys |
| 76 void usb_keyboard_send() | 76 void usb_keyboard_send() |
| 77 { | 77 { |
| 78 uint32_t wait_count = 0; | 78 uint32_t wait_count = 0; |
| 79 usb_packet_t *tx_packet; | 79 usb_packet_t *tx_packet; |
| 80 | |
| 81 if (remote_wakeup_enabled) { | |
| 82 USB0_CTL |= USB_CTL_RESUME; | |
| 83 _delay_ms(5); //wait 1 to 15ms | |
| 84 USB0_CTL &= ~USB_CTL_RESUME; | |
| 85 _delay_ms(5); | |
| 86 } | |
| 87 | 80 |
| 88 // Wait till ready | 81 // Wait till ready |
| 89 while ( 1 ) | 82 while ( 1 ) |
| 90 { | 83 { |
| 91 if ( !usb_configuration ) | 84 if ( !usb_configuration ) |