Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Teensy specific Serial data format #196

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
+21 −3
Open

Teensy specific Serial data format #196

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
75fb8b9
Added Serial Format to settings for Teensyduino boards
Jan 18, 2021
44b754a
Use new SerialFormat setting in serial begin
Jan 18, 2021
28fd7f4
Added comments for Teensy Serial formats in Settings
Jan 18, 2021
7e58b9d
Set Settings::SerialFormat to uint16_t
Jan 18, 2021
489ccb7
moved SerialFormat settings to serialMIDI.h
Jan 18, 2021
8a57125
added checks for teensy2
Jan 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions src/serialMIDI.h
View file
Original file line number Diff line number Diff line change
@@ -30,13 +30,29 @@

BEGIN_MIDI_NAMESPACE

struct DefaultSerialSettings
struct DefaultSerialSettings : public MIDI_NAMESPACE::DefaultSettings
{
/*! Override the default MIDI baudrate to transmit over USB serial, to
a decoding program such as Hairless MIDI (set baudrate to 115200)\n
http://projectgus.github.io/hairless-midiserial/
*/
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>
@@ -58,6 +74,8 @@ class SerialMIDI
// Initialise the Serial port
#if defined(AVR_CAKE)
mSerial. template open<Settings::BaudRate>();
#elif defined(TEENSYDUINO) && !defined(ARDUINO_TEENSY2)
mSerial.begin(Settings::BaudRate, Settings::SerialFormat);
#else
mSerial.begin(Settings::BaudRate);
#endif
@@ -121,5 +139,5 @@ END_MIDI_NAMESPACE
@see MIDI_CREATE_INSTANCE
*/
#define MIDI_CREATE_CUSTOM_INSTANCE(Type, SerialPort, Name, Settings) \
MIDI_NAMESPACE::SerialMIDI<Type> serial##Name(SerialPort);\
MIDI_NAMESPACE::MidiInterface<MIDI_NAMESPACE::SerialMIDI<Type>, Settings> Name((MIDI_NAMESPACE::SerialMIDI<Type>&)serial##Name);
MIDI_NAMESPACE::SerialMIDI<Type, Settings> serial##Name(SerialPort);\
MIDI_NAMESPACE::MidiInterface<MIDI_NAMESPACE::SerialMIDI<Type, Settings>, Settings> Name((MIDI_NAMESPACE::SerialMIDI<Type, Settings>&)serial##Name);