Fix SysEx size callback bug, using template settings instead of preprocessor macros.

Author: Francois Best

res/Examples/MIDI_Basic_IO/MIDI_Basic_IO.ino

@@ -1,9 +1,11 @@
 #include <MIDI.h>
 
 // Simple tutorial on how to receive and send MIDI messages.
-// Here, when receiving any message on channel 4, the Arduino 
+// Here, when receiving any message on channel 4, the Arduino
 // will blink a led and play back a note for 1 second.
 
+MIDI_CREATE_DEFAULT_INSTANCE();
+
 #define LED 13   		    // LED pin on Arduino Uno
 
 void setup()

res/Examples/MIDI_Callbacks/MIDI_Callbacks.ino

@@ -1,33 +1,39 @@
 #include <MIDI.h>
 
+MIDI_CREATE_DEFAULT_INSTANCE();
+
+// -----------------------------------------------------------------------------
+
 // This function will be automatically called when a NoteOn is received.
 // It must be a void-returning function with the correct parameters,
 // see documentation here:
 // http://arduinomidilib.fortyseveneffects.com/a00022.html
 
-void HandleNoteOn(byte channel, byte pitch, byte velocity)
+void handleNoteOn(byte channel, byte pitch, byte velocity)
 {
-    // Do whatever you want when you receive a Note On.
-
-    if (velocity == 0)
-    {
-        // This acts like a NoteOff. You can ask the library to call the NoteOff
-        // callback when receiving null-velocity NoteOn messages.
-        // See MIDI_HANDLE_NULL_VELOCITY_NOTE_ON_AS_NOTE_OFF in midi_Settings.h
-    }
+    // Do whatever you want when a note is pressed.
 
     // Try to keep your callbacks short (no delays ect)
     // otherwise it would slow down the loop() and have a bad impact
     // on real-time performance.
 }
 
+void handleNoteOff(byte channel, byte pitch, byte velocity)
+{
+    // Do something when the note is released.
+    // Note that NoteOn messages with 0 velocity are interpreted as NoteOffs.
+}
+
 // -----------------------------------------------------------------------------
 
 void setup()
 {
-    // Connect the HandleNoteOn function to the library,
+    // Connect the handleNoteOn function to the library,
     // so it is called upon reception of a NoteOn.
-    MIDI.setHandleNoteOn(HandleNoteOn);  // Put only the name of the function
+    MIDI.setHandleNoteOn(handleNoteOn);  // Put only the name of the function
+
+    // Do the same for NoteOffs
+    MIDI.setHandleNoteOff(handleNoteOff);
 
     // Initiate MIDI communications, listen to all channels
     MIDI.begin(MIDI_CHANNEL_OMNI);

res/Examples/MIDI_Input/MIDI_Input.ino

@@ -1,5 +1,9 @@
 #include <MIDI.h>
 
+MIDI_CREATE_DEFAULT_INSTANCE();
+
+// -----------------------------------------------------------------------------
+
 // This example shows the old way of checking for input messages.
 // It's simpler to use the callbacks now, check out the dedicated example.
 
@@ -8,7 +12,7 @@
 // -----------------------------------------------------------------------------
 
 void BlinkLed(byte num)         // Basic blink function
-{     
+{
     for (byte i=0;i<num;i++)
     {
         digitalWrite(LED,HIGH);
@@ -29,12 +33,12 @@ void setup()
 void loop()
 {
     if (MIDI.read())                // Is there a MIDI message incoming ?
-    {                    
+    {
         switch(MIDI.getType())      // Get the type of the message we caught
-        {        
+        {
             case midi::ProgramChange:       // If it is a Program Change,
-                BlinkLed(MIDI.getData1());  // blink the LED a number of times 
-                                            // correponding to the program number 
+                BlinkLed(MIDI.getData1());  // blink the LED a number of times
+                                            // correponding to the program number
                                             // (0 to 127, it can last a while..)
                 break;
             // See the online reference for other message types

res/Examples/MIDI_SimpleSynth/MIDI_SimpleSynth.ino

@@ -2,6 +2,8 @@
 #include "noteList.h"
 #include "pitches.h"
 
+MIDI_CREATE_DEFAULT_INSTANCE();
+
 #ifdef ARDUINO_SAM_DUE // Due has no tone function (yet), overriden to prevent build errors.
 #define tone(...)
 #define noTone(...)
@@ -50,7 +52,7 @@ void handleNotesChanged(bool isFirstNote = false)
         if (midiNotes.getLast(currentNote))
         {
             tone(sAudioOutPin, sNotePitches[currentNote]);
-            
+
             if (isFirstNote)
             {
                 handleGateChanged(true);

res/validator/validate.py

@@ -4,6 +4,7 @@
 import os
 import shutil
 import subprocess
+import argparse
 from pprint     import pprint
 from midi       import *
 from tester     import *
@@ -138,28 +139,42 @@ def validate(self):
 # ------------------------------------------------------------------------------
 
 def main():
-    midiInterface = MidiInterface()
-    tester  = Tester(midiInterface)
-    midiInterface.listenerCallback = tester.handleMidiInput
-
-    tester.checkThru([Midi.NoteOn, 64, 80])
-    tester.checkThru([Midi.AfterTouchChannel, 1])
-    tester.checkThru([2])
-    tester.checkThru([3])
-    tester.checkThru([Midi.NoteOn, 64, 0])
-    tester.checkThru([65, 127])
-    tester.checkThru([65, 0])
-    tester.checkThru([66, 127])
-    tester.checkThru([66, 0])
-
-    #lib = ArduinoMidiLibrary()
-    #lib.install()
-    #if lib.validate():
-    #    print('Validation passed')
-    #else:
-    #    print('Validation failed')
-
 
+    info = "Validator script for the Arduino MIDI Library."
+    arg_parser = argparse.ArgumentParser(description = info)
+
+    arg_parser.add_argument('--compile', '-c',
+                            action="store_true",
+                            help="Test compilation of the example sketches")
+
+    arg_parser.add_argument('--runtime', '-r',
+                            action="store_true",
+                            help="Test runtime")
+
+    args = arg_parser.parse_args()
+
+    if args.compile:
+        lib = ArduinoMidiLibrary()
+        lib.install()
+        if lib.validate():
+            print('Compilation test passed')
+        else:
+            print('Compilation test failed')
+
+    if args.runtime:
+        midiInterface = MidiInterface()
+        tester  = Tester(midiInterface)
+        midiInterface.listenerCallback = tester.handleMidiInput
+
+        tester.checkThru([Midi.NoteOn, 64, 80])
+        tester.checkThru([Midi.AfterTouchChannel, 1])
+        tester.checkThru([2])
+        tester.checkThru([3])
+        tester.checkThru([Midi.NoteOn, 64, 0])
+        tester.checkThru([65, 127])
+        tester.checkThru([65, 0])
+        tester.checkThru([66, 127])
+        tester.checkThru([66, 0])
 
 # ------------------------------------------------------------------------------
 

src/MIDI.h

@@ -23,8 +23,9 @@
 
 #pragma once
 
-#include "midi_Settings.h"
 #include "midi_Defs.h"
+#include "midi_Settings.h"
+#include "midi_Message.h"
 
 // -----------------------------------------------------------------------------
 
@@ -131,7 +132,7 @@ class MidiInterface
     inline void setHandleProgramChange(void (*fptr)(byte channel, byte number));
     inline void setHandleAfterTouchChannel(void (*fptr)(byte channel, byte pressure));
     inline void setHandlePitchBend(void (*fptr)(byte channel, int bend));
-    inline void setHandleSystemExclusive(void (*fptr)(byte * array, byte size));
+    inline void setHandleSystemExclusive(void (*fptr)(byte * array, unsigned size));
     inline void setHandleTimeCodeQuarterFrame(void (*fptr)(byte data));
     inline void setHandleSongPosition(void (*fptr)(unsigned beats));
     inline void setHandleSongSelect(void (*fptr)(byte songnumber));
@@ -155,7 +156,7 @@ class MidiInterface
     void (*mProgramChangeCallback)(byte channel, byte);
     void (*mAfterTouchChannelCallback)(byte channel, byte);
     void (*mPitchBendCallback)(byte channel, int);
-    void (*mSystemExclusiveCallback)(byte * array, byte size);
+    void (*mSystemExclusiveCallback)(byte * array, unsigned size);
     void (*mTimeCodeQuarterFrameCallback)(byte data);
     void (*mSongPositionCallback)(unsigned beats);
     void (*mSongSelectCallback)(byte songnumber);
@@ -192,25 +193,22 @@ class MidiInterface
     bool            mThruActivated  : 1;
     MidiFilterMode  mThruFilterMode : 7;
 
+private:
+    typedef Message<Settings::SysExMaxSize> MidiMessage;
+
 private:
     StatusByte  mRunningStatus_RX;
+    StatusByte  mRunningStatus_TX;
     Channel     mInputChannel;
     byte        mPendingMessage[3];
     unsigned    mPendingMessageExpectedLenght;
     unsigned    mPendingMessageIndex;
-    Message     mMessage;
+    MidiMessage mMessage;
 
 private:
     inline StatusByte getStatus(MidiType inType,
                                 Channel inChannel) const;
 
-
-
-#if MIDI_USE_RUNNING_STATUS
-private:
-    StatusByte mRunningStatus_TX;
-#endif
-
 private:
     SerialPort& mSerial;
 };