diff --git a/examples/USBH_MIDI/USBH_MIDI_dump/USBH_MIDI_dump.ino b/examples/USBH_MIDI/USBH_MIDI_dump/USBH_MIDI_dump.ino index 689daf6f..3892d24d 100644 --- a/examples/USBH_MIDI/USBH_MIDI_dump/USBH_MIDI_dump.ino +++ b/examples/USBH_MIDI/USBH_MIDI_dump/USBH_MIDI_dump.ino @@ -24,14 +24,11 @@ USB Usb; USBH_MIDI Midi(&Usb); void MIDI_poll(); -void doDelay(uint32_t t1, uint32_t t2, uint32_t delayTime); -boolean bFirst; uint16_t pid, vid; void setup() { - bFirst = true; vid = pid = 0; Serial.begin(115200); @@ -45,12 +42,9 @@ void loop() { Usb.Task(); //uint32_t t1 = (uint32_t)micros(); - if ( Usb.getUsbTaskState() == USB_STATE_RUNNING ) - { + if ( Midi ) { MIDI_poll(); } - //delay(1ms) - //doDelay(t1, (uint32_t)micros(), 1000); } // Poll USB MIDI Controler and send to serial MIDI @@ -60,15 +54,14 @@ void MIDI_poll() uint8_t bufMidi[64]; uint16_t rcvd; - if (Midi.vid != vid || Midi.pid != pid) { - sprintf(buf, "VID:%04X, PID:%04X", Midi.vid, Midi.pid); + if (Midi.idVendor() != vid || Midi.idProduct() != pid) { + vid = Midi.idVendor(); + pid = Midi.idProduct(); + sprintf(buf, "VID:%04X, PID:%04X", vid, pid); Serial.println(buf); - vid = Midi.vid; - pid = Midi.pid; } if (Midi.RecvData( &rcvd, bufMidi) == 0 ) { - uint32_t time = (uint32_t)millis(); - sprintf(buf, "%04X%04X: ", (uint16_t)(time >> 16), (uint16_t)(time & 0xFFFF)); // Split variable to prevent warnings on the ESP8266 platform + sprintf(buf, "%08lX: ", (uint32_t)millis()); Serial.print(buf); Serial.print(rcvd); Serial.print(':'); @@ -79,19 +72,3 @@ void MIDI_poll() Serial.println(""); } } - -// Delay time (max 16383 us) -void doDelay(uint32_t t1, uint32_t t2, uint32_t delayTime) -{ - uint32_t t3; - - if ( t1 > t2 ) { - t3 = (0xFFFFFFFF - t1 + t2); - } else { - t3 = t2 - t1; - } - - if ( t3 < delayTime ) { - delayMicroseconds(delayTime - t3); - } -} diff --git a/examples/USBH_MIDI/USB_MIDI_converter/USB_MIDI_converter.ino b/examples/USBH_MIDI/USB_MIDI_converter/USB_MIDI_converter.ino index ddd86074..acd5fe10 100644 --- a/examples/USBH_MIDI/USB_MIDI_converter/USB_MIDI_converter.ino +++ b/examples/USBH_MIDI/USB_MIDI_converter/USB_MIDI_converter.ino @@ -51,8 +51,7 @@ void loop() { Usb.Task(); uint32_t t1 = (uint32_t)micros(); - if ( Usb.getUsbTaskState() == USB_STATE_RUNNING ) - { + if ( Midi ) { MIDI_poll(); } //delay(1ms) @@ -78,12 +77,7 @@ void doDelay(uint32_t t1, uint32_t t2, uint32_t delayTime) { uint32_t t3; - if ( t1 > t2 ) { - t3 = (0xFFFFFFFF - t1 + t2); - } else { - t3 = t2 - t1; - } - + t3 = t2 - t1; if ( t3 < delayTime ) { delayMicroseconds(delayTime - t3); } diff --git a/examples/USBH_MIDI/USB_MIDI_converter_multi/USB_MIDI_converter_multi.ino b/examples/USBH_MIDI/USB_MIDI_converter_multi/USB_MIDI_converter_multi.ino index af57b746..c6a72e23 100644 --- a/examples/USBH_MIDI/USB_MIDI_converter_multi/USB_MIDI_converter_multi.ino +++ b/examples/USBH_MIDI/USB_MIDI_converter_multi/USB_MIDI_converter_multi.ino @@ -53,28 +53,24 @@ void loop() { Usb.Task(); uint32_t t1 = (uint32_t)micros(); - if ( Usb.getUsbTaskState() == USB_STATE_RUNNING ) - { - MIDI_poll(); + if ( Midi1 ) { + MIDI_poll(Midi1); + } + if ( Midi2 ) { + MIDI_poll(Midi2); } //delay(1ms) doDelay(t1, (uint32_t)micros(), 1000); } // Poll USB MIDI Controler and send to serial MIDI -void MIDI_poll() +void MIDI_poll(USBH_MIDI &Midi) { uint8_t outBuf[ 3 ]; uint8_t size; do { - if ( (size = Midi1.RecvData(outBuf)) > 0 ) { - //MIDI Output - _MIDI_SERIAL_PORT.write(outBuf, size); - } - } while (size > 0); - do { - if ( (size = Midi2.RecvData(outBuf)) > 0 ) { + if ( (size = Midi.RecvData(outBuf)) > 0 ) { //MIDI Output _MIDI_SERIAL_PORT.write(outBuf, size); } @@ -86,12 +82,7 @@ void doDelay(uint32_t t1, uint32_t t2, uint32_t delayTime) { uint32_t t3; - if ( t1 > t2 ) { - t3 = (0xFFFFFFFF - t1 + t2); - } else { - t3 = t2 - t1; - } - + t3 = t2 - t1; if ( t3 < delayTime ) { delayMicroseconds(delayTime - t3); } diff --git a/examples/USBH_MIDI/bidirectional_converter/bidirectional_converter.ino b/examples/USBH_MIDI/bidirectional_converter/bidirectional_converter.ino index 6923d78d..552cadf6 100644 --- a/examples/USBH_MIDI/bidirectional_converter/bidirectional_converter.ino +++ b/examples/USBH_MIDI/bidirectional_converter/bidirectional_converter.ino @@ -43,7 +43,6 @@ USB Usb; USBH_MIDI Midi(&Usb); void MIDI_poll(); -void doDelay(uint32_t t1, uint32_t t2, uint32_t delayTime); //If you want handle System Exclusive message, enable this #define otherwise comment out it. #define USBH_MIDI_SYSEX_ENABLE @@ -58,6 +57,7 @@ void handle_sysex( byte* sysexmsg, unsigned sizeofsysex) { void setup() { MIDI.begin(MIDI_CHANNEL_OMNI); + MIDI.turnThruOff(); #ifdef USBH_MIDI_SYSEX_ENABLE MIDI.setHandleSystemExclusive(handle_sysex); #endif @@ -72,9 +72,7 @@ void loop() uint8_t msg[4]; Usb.Task(); - uint32_t t1 = (uint32_t)micros(); - if ( Usb.getUsbTaskState() == USB_STATE_RUNNING ) - { + if ( Midi ) { MIDI_poll(); if (MIDI.read()) { msg[0] = MIDI.getType(); @@ -92,8 +90,6 @@ void loop() } } } - //delay(1ms) - doDelay(t1, (uint32_t)micros(), 1000); } // Poll USB MIDI Controler and send to serial MIDI @@ -141,19 +137,3 @@ void MIDI_poll() } while (size > 0); #endif } - -// Delay time (max 16383 us) -void doDelay(uint32_t t1, uint32_t t2, uint32_t delayTime) -{ - uint32_t t3; - - if ( t1 > t2 ) { - t3 = (0xFFFFFFFF - t1 + t2); - } else { - t3 = t2 - t1; - } - - if ( t3 < delayTime ) { - delayMicroseconds(delayTime - t3); - } -} diff --git a/examples/USBH_MIDI/eVY1_sample/eVY1_sample.ino b/examples/USBH_MIDI/eVY1_sample/eVY1_sample.ino index eb2a6262..c0e2afab 100644 --- a/examples/USBH_MIDI/eVY1_sample/eVY1_sample.ino +++ b/examples/USBH_MIDI/eVY1_sample/eVY1_sample.ino @@ -48,8 +48,7 @@ void setup() void loop() { Usb.Task(); - if ( Usb.getUsbTaskState() == USB_STATE_RUNNING ) - { + if( Midi ) { MIDI_poll(); noteOn(0x3f); delay(400); @@ -64,8 +63,8 @@ void MIDI_poll() uint8_t inBuf[ 3 ]; //first call? - if (Midi.vid != vid || Midi.pid != pid) { - vid = Midi.vid; pid = Midi.pid; + if (Midi.idVendor() != vid || Midi.idProduct() != pid) { + vid = Midi.idVendor(); pid = Midi.idProduct(); Midi.SendSysEx(exdata, sizeof(exdata)); delay(500); } diff --git a/usbh_midi.cpp b/usbh_midi.cpp index 8bc4fd31..b1ad3fbd 100644 --- a/usbh_midi.cpp +++ b/usbh_midi.cpp @@ -1,7 +1,7 @@ /* ******************************************************************************* * USB-MIDI class driver for USB Host Shield 2.0 Library - * Copyright (c) 2012-2017 Yuuichi Akagawa + * Copyright (c) 2012-2018 Yuuichi Akagawa * * Idea from LPK25 USB-MIDI to Serial MIDI converter * by Collin Cunningham - makezine.com, narbotic.com @@ -199,6 +199,10 @@ uint8_t USBH_MIDI::Init(uint8_t parent, uint8_t port, bool lowspeed) USBTRACE(" PID:"), D_PrintHex(pid, 0x80); USBTRACE2(" #Conf:", num_of_conf); + //Setup for well known vendor/device specific configuration + bTransferTypeMask = bmUSB_TRANSFER_TYPE; + setupDeviceSpecific(); + isMidiFound = false; for (uint8_t i=0; ibEndpointAddress, 0x80); USBTRACE(" bmAttr:"), D_PrintHex(epDesc->bmAttributes, 0x80); USBTRACE2(" MaxPktSz:", (uint8_t)epDesc->wMaxPacketSize); - if ((epDesc->bmAttributes & bmUSB_TRANSFER_TYPE) == USB_TRANSFER_TYPE_BULK) {//bulk + if ((epDesc->bmAttributes & bTransferTypeMask) == USB_TRANSFER_TYPE_BULK) {//bulk uint8_t index; if( isMidi ) index = ((epDesc->bEndpointAddress & 0x80) == 0x80) ? epDataInIndex : epDataOutIndex; @@ -337,6 +341,18 @@ uint8_t USBH_MIDI::Release() return 0; } +/* Setup for well known vendor/device specific configuration */ +void USBH_MIDI::setupDeviceSpecific() +{ + // Novation + if( vid == 0x1235 ) { + // LaunchPad's endpoint attirbute is interrupt (0x20:S, 0x36:Mini, 0x51:Pro, 0x69:MK2) + if(pid == 0x20 || pid == 0x36 || pid == 0x51 || pid == 0x69 ) { + bTransferTypeMask = 2; + } + } +} + /* Receive data from MIDI device */ uint8_t USBH_MIDI::RecvData(uint16_t *bytes_rcvd, uint8_t *dataptr) { diff --git a/usbh_midi.h b/usbh_midi.h index 02073502..4f1c4494 100644 --- a/usbh_midi.h +++ b/usbh_midi.h @@ -1,7 +1,7 @@ /* ******************************************************************************* * USB-MIDI class driver for USB Host Shield 2.0 Library - * Copyright (c) 2012-2017 Yuuichi Akagawa + * Copyright (c) 2012-2018 Yuuichi Akagawa * * Idea from LPK25 USB-MIDI to Serial MIDI converter * by Collin Cunningham - makezine.com, narbotic.com @@ -50,8 +50,9 @@ protected: uint8_t bConfNum; // configuration number uint8_t bNumEP; // total number of EP in the configuration bool bPollEnable; - - bool isMidiFound; + bool isMidiFound; + uint16_t pid, vid; // ProductID, VendorID + uint8_t bTransferTypeMask; /* Endpoint data structure */ EpInfo epInfo[MIDI_MAX_ENDPOINTS]; /* MIDI Event packet buffer */ @@ -60,13 +61,14 @@ protected: uint8_t parseConfigDescr(uint8_t addr, uint8_t conf); uint16_t countSysExDataSize(uint8_t *dataptr); + void setupDeviceSpecific(); #ifdef DEBUG_USB_HOST void PrintEndpointDescriptor( const USB_ENDPOINT_DESCRIPTOR* ep_ptr ); #endif public: - uint16_t pid, vid; USBH_MIDI(USB *p); - operator bool() { return (pUsb->getUsbTaskState()==USB_STATE_RUNNING && isMidiFound); } + // Misc functions + operator bool() { return (pUsb->getUsbTaskState()==USB_STATE_RUNNING); } uint16_t idVendor() { return vid; } uint16_t idProduct() { return pid; } // Methods for recieving and sending data