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

Compare commits

base: Seich:create_CUSTOM_INSTANCE
Branches Tags
Seich:master
Seich:feat/v5.1.0
Seich:pr/hyperbolist/232
Seich:create_CUSTOM_INSTANCE
Seich:ActiveSensingv2
Seich:gh-pages
Seich:dev
Seich:5.0.2
Seich:5.0.1
Seich:5.0.0
Seich:4.3.1
Seich:4.3
Seich:4.2
Seich:4.1
Seich:4.0
Seich:init_gitflow
Seich:3.2
..
compare: Seich:master
Branches Tags
Seich:feat/v5.1.0
Seich:pr/hyperbolist/232
Seich:create_CUSTOM_INSTANCE
Seich:master
Seich:ActiveSensingv2
Seich:gh-pages
Seich:dev
Seich:5.0.2
Seich:5.0.1
Seich:5.0.0
Seich:4.3.1
Seich:4.3
Seich:4.2
Seich:4.1
Seich:4.0
Seich:init_gitflow
Seich:3.2

No commits in common. "create_CUSTOM_INSTANCE" and "master" have entirely different histories.
create_CUS ... master

2 changed files with 6 additions and 18 deletions
Show Stats Expand all files Collapse all files

6
examples/CustomBaudRate/CustomBaudRate.ino
View File

@ -8,9 +8,11 @@ struct CustomBaudRateSettings : public MIDI_NAMESPACE::DefaultSerialSettings {
#if defined(ARDUINO_SAM_DUE) || defined(USBCON) || defined(__MK20DX128__) || defined(__MK20DX256__) || defined(__MKL26Z64__)
// Leonardo, Due and other USB boards use Serial1 by default.
MIDI_CREATE_CUSTOMSERIAL_INSTANCE(HardwareSerial, Serial1, MIDI, CustomBaudRateSettings)
MIDI_NAMESPACE::SerialMIDI<HardwareSerial, CustomBaudRateSettings> serialMIDI(Serial1);
MIDI_NAMESPACE::MidiInterface<MIDI_NAMESPACE::SerialMIDI<HardwareSerial, CustomBaudRateSettings>> MIDI((MIDI_NAMESPACE::SerialMIDI<HardwareSerial, CustomBaudRateSettings>&)serialMIDI);
#else
MIDI_CREATE_CUSTOMSERIAL_INSTANCE(HardwareSerial, Serial, MIDI, CustomBaudRateSettings)
MIDI_NAMESPACE::SerialMIDI<HardwareSerial, CustomBaudRateSettings> serialMIDI(Serial);
MIDI_NAMESPACE::MidiInterface<MIDI_NAMESPACE::SerialMIDI<HardwareSerial, CustomBaudRateSettings>> MIDI((MIDI_NAMESPACE::SerialMIDI<HardwareSerial, CustomBaudRateSettings>&)serialMIDI);
#endif
void setup() {

18
src/serialMIDI.h
View File

@ -98,20 +98,6 @@ private:
END_MIDI_NAMESPACE
/*! \brief Create an instance of the library attached to a serial port
with overwritten MIDI & Serial Settings
*/
#define MIDI_CREATE_SPECIAL_INSTANCE(Type, SerialPort, Name, CustomMIDISettings, CustomSerialSettings) \
MIDI_NAMESPACE::SerialMIDI<Type, CustomSerialSettings> serial##Name(SerialPort); \
MIDI_NAMESPACE::MidiInterface<MIDI_NAMESPACE::SerialMIDI<Type, CustomSerialSettings>, CustomMIDISettings> Name((MIDI_NAMESPACE::SerialMIDI<Type, CustomSerialSettings>&)serial##Name);
/*! \brief Create an instance of the library attached to a serial port
with overwritten Serial Settings
*/
#define MIDI_CREATE_CUSTOMSERIAL_INSTANCE(Type, SerialPort, Name, CustomSerialSettings) \
MIDI_NAMESPACE::SerialMIDI<Type, CustomSerialSettings> serial##Name(SerialPort); \
MIDI_NAMESPACE::MidiInterface<MIDI_NAMESPACE::SerialMIDI<Type, CustomSerialSettings>> Name((MIDI_NAMESPACE::SerialMIDI<Type, CustomSerialSettings>&)serial##Name);
/*! \brief Create an instance of the library attached to a serial port.
You can use HardwareSerial or SoftwareSerial for the serial port.
Example: MIDI_CREATE_INSTANCE(HardwareSerial, Serial2, midi2);
@ -139,6 +125,6 @@ END_MIDI_NAMESPACE
@see DefaultSettings
@see MIDI_CREATE_INSTANCE
*/
#define MIDI_CREATE_CUSTOM_INSTANCE(Type, SerialPort, Name, CustomMIDISettings) \
#define MIDI_CREATE_CUSTOM_INSTANCE(Type, SerialPort, Name, Settings) \
MIDI_NAMESPACE::SerialMIDI<Type> serial##Name(SerialPort);\
MIDI_NAMESPACE::MidiInterface<MIDI_NAMESPACE::SerialMIDI<Type>, CustomMIDISettings> Name((MIDI_NAMESPACE::SerialMIDI<Type>&)serial##Name);
MIDI_NAMESPACE::MidiInterface<MIDI_NAMESPACE::SerialMIDI<Type>, Settings> Name((MIDI_NAMESPACE::SerialMIDI<Type>&)serial##Name);