mirror of
https://github.com/qmk/qmk_firmware.git
synced 2025-02-23 15:27:44 +00:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
commit
b7285db208
@ -70,10 +70,6 @@ host_driver_t chibios_driver = {keyboard_leds, send_keyboard, send_nkro, send_mo
|
|||||||
void virtser_task(void);
|
void virtser_task(void);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef MIDI_ENABLE
|
|
||||||
void midi_ep_task(void);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* TESTING
|
/* TESTING
|
||||||
* Amber LED blinker thread, times are in milliseconds.
|
* Amber LED blinker thread, times are in milliseconds.
|
||||||
*/
|
*/
|
||||||
@ -202,9 +198,6 @@ void protocol_pre_task(void) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void protocol_post_task(void) {
|
void protocol_post_task(void) {
|
||||||
#ifdef MIDI_ENABLE
|
|
||||||
midi_ep_task();
|
|
||||||
#endif
|
|
||||||
#ifdef VIRTSER_ENABLE
|
#ifdef VIRTSER_ENABLE
|
||||||
virtser_task();
|
virtser_task();
|
||||||
#endif
|
#endif
|
||||||
|
@ -624,15 +624,6 @@ bool recv_midi_packet(MIDI_EventPacket_t *const event) {
|
|||||||
return receive_report(USB_ENDPOINT_OUT_MIDI, (uint8_t *)event, sizeof(MIDI_EventPacket_t));
|
return receive_report(USB_ENDPOINT_OUT_MIDI, (uint8_t *)event, sizeof(MIDI_EventPacket_t));
|
||||||
}
|
}
|
||||||
|
|
||||||
void midi_ep_task(void) {
|
|
||||||
uint8_t buffer[MIDI_STREAM_EPSIZE];
|
|
||||||
while (receive_report(USB_ENDPOINT_OUT_MIDI, buffer, sizeof(buffer))) {
|
|
||||||
MIDI_EventPacket_t event;
|
|
||||||
// TODO: this seems totally wrong? The midi task will never see any
|
|
||||||
// packets if we consume them here
|
|
||||||
recv_midi_packet(&event);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef VIRTSER_ENABLE
|
#ifdef VIRTSER_ENABLE
|
||||||
|
Loading…
Reference in New Issue
Block a user