Seich
/
arduino_midi_library
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 8a571257b5 into 2d64cc3c2f

This commit is contained in:
Adrien Fauconnet 2022-01-22 23:37:07 -08:00 committed by GitHub
parent 2d64cc3c2f 8a571257b5
commit 893a4674a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/serialMIDI.h
View File

@ -30,13 +30,29 @@
BEGIN_MIDI_NAMESPACE BEGIN_MIDI_NAMESPACE
struct DefaultSerialSettings struct DefaultSerialSettings : public MIDI_NAMESPACE::DefaultSettings
{ {
/*! Override the default MIDI baudrate to transmit over USB serial, to /*! Override the default MIDI baudrate to transmit over USB serial, to
a decoding program such as Hairless MIDI (set baudrate to 115200)\n a decoding program such as Hairless MIDI (set baudrate to 115200)\n
http://projectgus.github.io/hairless-midiserial/ http://projectgus.github.io/hairless-midiserial/
*/ */
static const long BaudRate = 31250; static const long BaudRate = 31250;
#if defined(TEENSYDUINO) && !defined(ARDUINO_TEENSY2)
/*! Teensy supports various Serial data formats.
Override the default Serial Format to use circuits that may require inversion of
polarity on the RX, TX or both signals.
https://www.pjrc.com/teensy/td_serial.html
Format Name Data Bits Parity RX Polarity TX Polarity
SERIAL_8N1 8 None Normal Normal
SERIAL_8N1_RXINV 8 None Inverted Normal
SERIAL_8N1_TXINV 8 None Normal Inverted
SERIAL_8N1_RXINV_TXINV 8 None Inverted Inverted
*/
static const uint16_t SerialFormat = SERIAL_8N1;
#endif
}; };
template <class SerialPort, class _Settings = DefaultSerialSettings> template <class SerialPort, class _Settings = DefaultSerialSettings>
@ -58,6 +74,8 @@ public:
// Initialise the Serial port // Initialise the Serial port
#if defined(AVR_CAKE) #if defined(AVR_CAKE)
mSerial. template open<Settings::BaudRate>(); mSerial. template open<Settings::BaudRate>();
#elif defined(TEENSYDUINO) && !defined(ARDUINO_TEENSY2)
mSerial.begin(Settings::BaudRate, Settings::SerialFormat);
#else #else
mSerial.begin(Settings::BaudRate); mSerial.begin(Settings::BaudRate);
#endif #endif
@ -126,5 +144,5 @@ END_MIDI_NAMESPACE
@see MIDI_CREATE_INSTANCE @see MIDI_CREATE_INSTANCE
*/ */
#define MIDI_CREATE_CUSTOM_INSTANCE(Type, SerialPort, Name, Settings) \ #define MIDI_CREATE_CUSTOM_INSTANCE(Type, SerialPort, Name, Settings) \
MIDI_NAMESPACE::SerialMIDI<Type> serial##Name(SerialPort);\ MIDI_NAMESPACE::SerialMIDI<Type, Settings> serial##Name(SerialPort);\
MIDI_NAMESPACE::MidiInterface<MIDI_NAMESPACE::SerialMIDI<Type>, Settings> Name((MIDI_NAMESPACE::SerialMIDI<Type>&)serial##Name); MIDI_NAMESPACE::MidiInterface<MIDI_NAMESPACE::SerialMIDI<Type, Settings>, Settings> Name((MIDI_NAMESPACE::SerialMIDI<Type, Settings>&)serial##Name);