From ff3052ceb437e2bbdf3ae483835f12175df060e2 Mon Sep 17 00:00:00 2001 From: lathoub Date: Sat, 16 May 2020 11:16:46 +0200 Subject: [PATCH] fix bug in MIDI_CREATE_CUSTOM_INSTANCE - MIDI Setting in MIDI_CREATE_CUSTOM_INSTANCE, but Setting for SerialMIDI - MACRO outside of Namespace --- src/midi_Settings.h | 4 ++-- src/serialMIDI.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/midi_Settings.h b/src/midi_Settings.h index 0066190..179b773 100644 --- a/src/midi_Settings.h +++ b/src/midi_Settings.h @@ -38,12 +38,12 @@ BEGIN_MIDI_NAMESPACE macro to create your instance. The settings you don't override will keep their default value. Eg: \code{.cpp} - struct MySettings : public midi::DefaultSettings + struct MySettings : public MIDI_NAMESPACE::DefaultSettings { static const unsigned SysExMaxSize = 1024; // Accept SysEx messages up to 1024 bytes long. }; - MIDI_CREATE_CUSTOM_INSTANCE(HardwareSerial, Serial2, midi, MySettings); + MIDI_CREATE_CUSTOM_INSTANCE(HardwareSerial, Serial2, MIDI, MySettings); \endcode */ struct DefaultSettings diff --git a/src/serialMIDI.h b/src/serialMIDI.h index da78271..9bd9669 100644 --- a/src/serialMIDI.h +++ b/src/serialMIDI.h @@ -91,6 +91,8 @@ private: SerialPort& mSerial; }; +END_MIDI_NAMESPACE + /*! \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); @@ -119,7 +121,5 @@ private: @see MIDI_CREATE_INSTANCE */ #define MIDI_CREATE_CUSTOM_INSTANCE(Type, SerialPort, Name, Settings) \ - MIDI_NAMESPACE::SerialMIDI serial##Name(SerialPort);\ - MIDI_NAMESPACE::MidiInterface> Name((MIDI_NAMESPACE::SerialMIDI&)serial##Name); - -END_MIDI_NAMESPACE + MIDI_NAMESPACE::SerialMIDI serial##Name(SerialPort);\ + MIDI_NAMESPACE::MidiInterface, Settings> Name((MIDI_NAMESPACE::SerialMIDI&)serial##Name);