diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2018-07-16 11:48:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-16 11:48:31 -0400 |
| commit | ade22f8e2c272044ea2f80ff6fe5ca9576858939 (patch) | |
| tree | 03c0131fa5982afc10a60e1fdd38a60be750291b /tmk_core/protocol | |
| parent | 96cb9f4661faa80e795b1e6731b7a8e8a50bd0cb (diff) | |
| download | qmk_firmware-ade22f8e2c272044ea2f80ff6fe5ca9576858939.tar.gz qmk_firmware-ade22f8e2c272044ea2f80ff6fe5ca9576858939.zip | |
Adds support for Planck Rev 6 (#2666)
* initial files for rev 6 with encoder
* music map init, dip scan added
* adds ws2812 driver for arm
* flesh out dip and encoder support
* adds default encoder res
* adds default encoder res
* start muse implementation
* muse working with encoder as control
* flip direction
* try mouse wheel again
* dont break other revs
* dont break other revs
* conditional autio
* pwm ws driver (not working)
* update build includes for chibios
* update ws2812 driver/config
* last commit for glasser code
* working example
* remove rgb for now
* finish up rev6
* working encoder keycodes
* add warnings to planck keymaps about the LAYOUT
Diffstat (limited to 'tmk_core/protocol')
| -rw-r--r-- | tmk_core/protocol/chibios/usb_main.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c index cbe257194..e79ff15e8 100644 --- a/tmk_core/protocol/chibios/usb_main.c +++ b/tmk_core/protocol/chibios/usb_main.c | |||
| @@ -717,12 +717,14 @@ void send_mouse(report_mouse_t *report) { | |||
| 717 | } | 717 | } |
| 718 | osalSysUnlock(); | 718 | osalSysUnlock(); |
| 719 | 719 | ||
| 720 | /* TODO: LUFA manually waits for the endpoint to become ready | ||
| 721 | * for about 10ms for mouse, kbd, system; 1ms for nkro | ||
| 722 | * is this really needed? | ||
| 723 | */ | ||
| 724 | |||
| 725 | osalSysLock(); | 720 | osalSysLock(); |
| 721 | if(usbGetTransmitStatusI(&USB_DRIVER, MOUSE_IN_EPNUM)) { | ||
| 722 | /* Need to either suspend, or loop and call unlock/lock during | ||
| 723 | * every iteration - otherwise the system will remain locked, | ||
| 724 | * no interrupts served, so USB not going through as well. | ||
| 725 | * Note: for suspend, need USB_USE_WAIT == TRUE in halconf.h */ | ||
| 726 | osalThreadSuspendS(&(&USB_DRIVER)->epc[MOUSE_IN_EPNUM]->in_state->thread); | ||
| 727 | } | ||
| 726 | usbStartTransmitI(&USB_DRIVER, MOUSE_IN_EPNUM, (uint8_t *)report, sizeof(report_mouse_t)); | 728 | usbStartTransmitI(&USB_DRIVER, MOUSE_IN_EPNUM, (uint8_t *)report, sizeof(report_mouse_t)); |
| 727 | osalSysUnlock(); | 729 | osalSysUnlock(); |
| 728 | } | 730 | } |
