specchioriflesso/USB_Host_Shield_2.0
1
Fork 0
mirror of https://github.com/felis/USB_Host_Shield_2.0.git synced 2024-03-22 11:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #571 from YuuichiAkagawa/pr_midi_serial_flush

Browse source 
Add Serial.flush() option for MIDI examples
This commit is contained in:
Kristian Sloth Lauszus 2020-12-03 17:20:16 +01:00 committed by GitHub
parent 1ee088bcad c43e08b445
commit 9d41161c12
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
examples/USBH_MIDI/USB_MIDI_converter/USB_MIDI_converter.ino
View file

@ -1,7 +1,7 @@
/* /*
******************************************************************************* *******************************************************************************
* USB-MIDI to Legacy Serial MIDI converter * USB-MIDI to Legacy Serial MIDI converter
* Copyright (C) 2012-2017 Yuuichi Akagawa * Copyright (C) 2012-2020 Yuuichi Akagawa
* *
* Idea from LPK25 USB-MIDI to Serial MIDI converter * Idea from LPK25 USB-MIDI to Serial MIDI converter
* by Collin Cunningham - makezine.com, narbotic.com * by Collin Cunningham - makezine.com, narbotic.com
@ -24,6 +24,11 @@
#else #else
#define _MIDI_SERIAL_PORT Serial #define _MIDI_SERIAL_PORT Serial
#endif #endif
// Set to 1 if you want to wait for the Serial MIDI transmission to complete.
// For more information, see https://github.com/felis/USB_Host_Shield_2.0/issues/570
#define ENABLE_MIDI_SERIAL_FLUSH 0
////////////////////////// //////////////////////////
// MIDI Pin assign // MIDI Pin assign
// 2 : GND // 2 : GND
@ -68,6 +73,9 @@ void MIDI_poll()
if ( (size = Midi.RecvData(outBuf)) > 0 ) { if ( (size = Midi.RecvData(outBuf)) > 0 ) {
//MIDI Output //MIDI Output
_MIDI_SERIAL_PORT.write(outBuf, size); _MIDI_SERIAL_PORT.write(outBuf, size);
#if ENABLE_MIDI_SERIAL_FLUSH
_MIDI_SERIAL_PORT.flush();
#endif
} }
} while (size > 0); } while (size > 0);
} }

10
examples/USBH_MIDI/USB_MIDI_converter_multi/USB_MIDI_converter_multi.ino
View file

@ -1,7 +1,7 @@
/* /*
******************************************************************************* *******************************************************************************
* USB-MIDI to Legacy Serial MIDI converter * USB-MIDI to Legacy Serial MIDI converter
* Copyright (C) 2012-2017 Yuuichi Akagawa * Copyright (C) 2012-2020 Yuuichi Akagawa
* *
* Idea from LPK25 USB-MIDI to Serial MIDI converter * Idea from LPK25 USB-MIDI to Serial MIDI converter
* by Collin Cunningham - makezine.com, narbotic.com * by Collin Cunningham - makezine.com, narbotic.com
@ -24,6 +24,11 @@
#else #else
#define _MIDI_SERIAL_PORT Serial #define _MIDI_SERIAL_PORT Serial
#endif #endif
// Set to 1 if you want to wait for the Serial MIDI transmission to complete.
// For more information, see https://github.com/felis/USB_Host_Shield_2.0/issues/570
#define ENABLE_MIDI_SERIAL_FLUSH 0
////////////////////////// //////////////////////////
// MIDI Pin assign // MIDI Pin assign
// 2 : GND // 2 : GND
@ -73,6 +78,9 @@ void MIDI_poll(USBH_MIDI &Midi)
if ( (size = Midi.RecvData(outBuf)) > 0 ) { if ( (size = Midi.RecvData(outBuf)) > 0 ) {
//MIDI Output //MIDI Output
_MIDI_SERIAL_PORT.write(outBuf, size); _MIDI_SERIAL_PORT.write(outBuf, size);
#if ENABLE_MIDI_SERIAL_FLUSH
_MIDI_SERIAL_PORT.flush();
#endif
} }
} while (size > 0); } while (size > 0);
} }

12
examples/USBH_MIDI/bidirectional_converter/bidirectional_converter.ino
View file

@ -1,7 +1,7 @@
/* /*
******************************************************************************* *******************************************************************************
* Legacy Serial MIDI and USB Host bidirectional converter * Legacy Serial MIDI and USB Host bidirectional converter
* Copyright (C) 2013-2017 Yuuichi Akagawa * Copyright (C) 2013-2020 Yuuichi Akagawa
* *
* for use with Arduino MIDI library * for use with Arduino MIDI library
* https://github.com/FortySevenEffects/arduino_midi_library/ * https://github.com/FortySevenEffects/arduino_midi_library/
@ -32,6 +32,10 @@ MIDI_CREATE_DEFAULT_INSTANCE();
#define _MIDI_SERIAL_PORT Serial #define _MIDI_SERIAL_PORT Serial
#endif #endif
// Set to 1 if you want to wait for the Serial MIDI transmission to complete.
// For more information, see https://github.com/felis/USB_Host_Shield_2.0/issues/570
#define ENABLE_MIDI_SERIAL_FLUSH 0
////////////////////////// //////////////////////////
// MIDI Pin assign // MIDI Pin assign
// 2 : GND // 2 : GND
@ -125,6 +129,9 @@ void MIDI_poll()
_MIDI_SERIAL_PORT.write(outbuf, rc); _MIDI_SERIAL_PORT.write(outbuf, rc);
p += 4; p += 4;
} }
#if ENABLE_MIDI_SERIAL_FLUSH
_MIDI_SERIAL_PORT.flush();
#endif
readPtr += 4; readPtr += 4;
} }
#else #else
@ -133,6 +140,9 @@ void MIDI_poll()
if ( (size = Midi.RecvData(outBuf)) > 0 ) { if ( (size = Midi.RecvData(outBuf)) > 0 ) {
//MIDI Output //MIDI Output
_MIDI_SERIAL_PORT.write(outBuf, size); _MIDI_SERIAL_PORT.write(outBuf, size);
#if ENABLE_MIDI_SERIAL_FLUSH
_MIDI_SERIAL_PORT.flush();
#endif
} }
} while (size > 0); } while (size > 0);
#endif #endif