v5.0.0

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

.gitignore

@@ -3,3 +3,8 @@
 logs/
 build/
 .vscode/.cmaketools.json
+src/.DS_Store
+examples/.DS_Store
+.DS_Store
+test/xcode
+.development

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "external/google-test"]
 	path = external/google-test
 	url = https://github.com/google/googletest.git
-[submodule "external/midi-usb"]
-	path = external/midi-usb
-	url = https://github.com/arduino-libraries/MIDIUSB.git

.travis.yml

@@ -25,10 +25,11 @@ env:
         - PLATFORMIO_CI_SRC=examples/Bench
         - PLATFORMIO_CI_SRC=examples/Callbacks
         - PLATFORMIO_CI_SRC=examples/DualMerger
+        - PLATFORMIO_CI_SRC=examples/ErrorCallback
         - PLATFORMIO_CI_SRC=examples/Input
-        - PLATFORMIO_CI_SRC=examples/MidiUSB REQUIRES_USB=1
         - PLATFORMIO_CI_SRC=examples/RPN_NRPN
         - PLATFORMIO_CI_SRC=examples/SimpleSynth
+        - PLATFORMIO_CI_SRC=examples/AltPinSerial
 
 addons:
     apt:
@@ -48,7 +49,7 @@ install:
             # Install newer lcov (1.9 seems to fail: http://gronlier.fr/blog/2015/01/adding-code-coverage-to-your-c-project/)
             export LCOV_ROOT="$HOME/lcov"
             mkdir -p "$LCOV_ROOT"
-            wget http://ftp.de.debian.org/debian/pool/main/l/lcov/lcov_1.12.orig.tar.gz --output-document="$LCOV_ROOT/lcov.tar.gz"
+            wget http://ftp.de.debian.org/debian/pool/main/l/lcov/lcov_1.14.orig.tar.gz --output-document="$LCOV_ROOT/lcov.tar.gz"
             tar xf "$LCOV_ROOT/lcov.tar.gz" --strip-components=1 -C $LCOV_ROOT
             export PATH="$LCOV_ROOT/bin:$PATH"
             which lcov
@@ -74,17 +75,25 @@ script:
     # Build current example
     - |
         if [ ! "${BUILD_UNIT_TESTS}" ]; then
-            if [ "${REQUIRES_USB}" ]; then
-                platformio ci --lib="." --lib=external/midi-usb --board="due" --board="dueUSB" --board="zero" --board="zeroUSB" --board="leonardo"
-            else
-                platformio ci --lib="." --board=uno --board="due" --board="zero" --board="leonardo" --board="micro" --board="nanoatmega328" --board="megaatmega2560" --board="teensy20" --board="teensy20pp" --board="teensy30" --board="teensy31"
-            fi
+            platformio ci --lib="."       \
+                --board="uno"             \
+                --board="due"             \
+                --board="zero"            \
+                --board="leonardo"        \
+                --board="micro"           \
+                --board="nanoatmega328"   \
+                --board="megaatmega2560"  \
+                --board="teensy2"         \
+                --board="teensy30"        \
+                --board="teensy31"        \
+                --board="teensylc"
         fi
 
 after_success:
     - |
         if [ "${GENERATE_COVERAGE}" ]; then
             # Generate code coverage information & send to Coveralls
+            rm -rf ./external/google-test/googletest/CMakeFiles/gtest.dir/src/gtest-all.cc.gcda
             lcov --gcov-tool $GCOV --directory . --capture --output-file coverage.info
             lcov --gcov-tool $GCOV --remove coverage.info 'test/*' '/usr/*' 'external/*' --output-file coverage.info
             lcov --list coverage.info

.vscode/arduino.json

@@ -0,0 +1,3 @@
+{
+    "board": "arduino:avr:leonardo"
+}

.vscode/c_cpp_properties.json

@@ -3,6 +3,8 @@
         {
             "name": "Mac",
             "includePath": [
+                "/Applications/Arduino.app/Contents/Java/tools/**",
+                "/Applications/Arduino.app/Contents/Java/hardware/arduino/avr/**",
                 "/Applications/Arduino.app/Contents/Java/hardware/tools/avr/include",
                 "/Applications/Arduino.app/Contents/Java/hardware/arduino/avr/cores/arduino",
                 "${workspaceRoot}"
@@ -20,7 +22,11 @@
             "macFrameworkPath": [
                 "/System/Library/Frameworks",
                 "/Library/Frameworks"
-            ]
+            ],
+            "forcedInclude": [
+                "/Applications/Arduino.app/Contents/Java/hardware/arduino/avr/cores/arduino/Arduino.h"
+            ],
+            "configurationProvider": "vector-of-bool.cmake-tools"
         },
         {
             "name": "Linux",
@@ -55,5 +61,5 @@
             "intelliSenseMode": "msvc-x64"
         }
     ],
-    "version": 3
+    "version": 4
 }

.vscode/settings.json

@@ -1,4 +1,13 @@
-// Place your settings in this file to overwrite default and user settings.
 {
-    "cmake.experimental.enableTargetDebugging": true
-}
+    "files.associations": {
+        "cstddef": "cpp",
+        "ostream": "cpp",
+        "__locale": "cpp",
+        "functional": "cpp",
+        "iterator": "cpp",
+        "string": "cpp",
+        "string_view": "cpp",
+        "vector": "cpp",
+        "istream": "cpp"
+    }
+}

.vscode/tasks.json

@@ -0,0 +1,28 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Build",
+            "command": "make",
+            "args": ["all"],
+            "options": {
+                "cwd": "${workspaceRoot}/build"
+            },
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "Run Tests",
+            "command": "${workspaceRoot}/build/test/unit-tests/unit-tests",
+            "group": {
+                "kind": "test",
+                "isDefault": true
+            },
+            "dependsOn": ["Build"]
+        }
+    ]
+}

README.md

@@ -5,59 +5,113 @@
 [![GitHub release](https://img.shields.io/github/release/FortySevenEffects/arduino_midi_library.svg?maxAge=3600)](https://github.com/FortySevenEffects/arduino_midi_library/releases/latest)
 [![License](https://img.shields.io/github/license/FortySevenEffects/arduino_midi_library.svg?maxAge=3600)](LICENSE)
 
-This library enables MIDI I/O communications on the Arduino serial ports.
+This library adds MIDI I/O communications to an Arduino board.
 
 ### Features
-* Compatible with all Arduino boards (and clones with an AVR processor).
-* Simple and fast way to send and receive every kind of MIDI message (including all System messages, SysEx, Clock, etc..).
-* OMNI input reading (read all channels).
-* Software Thru, with message filtering.
-* [Callbacks](http://playground.arduino.cc/Main/MIDILibraryCallbacks) to handle input messages more easily.
-* Last received message is saved until a new one arrives.
-* Configurable: [overridable template-based settings](https://github.com/FortySevenEffects/arduino_midi_library/wiki/Using-custom-Settings).
-* Create more than one MIDI port for mergers/splitters applications.
-* Use any serial port, hardware or software.
+
+-   **New** : USB MIDI Device support with [`MIDIUSB`](https://github.com/arduino-libraries/MIDIUSB).
+-   Compatible with all Arduino boards (and clones with an AVR processor).
+-   Simple and fast way to send and receive every kind of MIDI message (including all System messages, SysEx, Clock, etc..).
+-   OMNI input reading (read all channels).
+-   Software Thru, with message filtering.
+-   [Callbacks](https://github.com/FortySevenEffects/arduino_midi_library/wiki/Using-Callbacks) to handle input messages more easily.
+-   Last received message is saved until a new one arrives.
+-   Configurable: [overridable template-based settings](https://github.com/FortySevenEffects/arduino_midi_library/wiki/Using-custom-Settings).
+-   Create more than one MIDI interface for mergers/splitters applications.
+-   Use any serial port, hardware or software.
 
 ### Getting Started
 
-1. Use Arduino's Library Manager to install the library.
-![Type "MIDI" in the Arduino IDE Library Manager](res/library-manager.jpg)
+1. Use the Arduino Library Manager to install the library.
+   ![Type "MIDI" in the Arduino IDE Library Manager](res/library-manager.jpg)
 
 2. Start coding:
-   ```c++
-    #include <MIDI.h>
 
-    // Created and binds the MIDI interface to the default hardware Serial port
-    MIDI_CREATE_DEFAULT_INSTANCE();
+```c++
+#include <MIDI.h>
+
+// Create and bind the MIDI interface to the default hardware Serial port
+MIDI_CREATE_DEFAULT_INSTANCE();
 
-    void setup()
-    {
-        MIDI.begin(MIDI_CHANNEL_OMNI);  // Listen to all incoming messages
-    }
+void setup()
+{
+    MIDI.begin(MIDI_CHANNEL_OMNI);  // Listen to all incoming messages
+}
 
-    void loop()
-    {
-        // Send note 42 with velocity 127 on channel 1
-        MIDI.sendNoteOn(42, 127, 1);
+void loop()
+{
+    // Send note 42 with velocity 127 on channel 1
+    MIDI.sendNoteOn(42, 127, 1);
 
-        // Read incoming messages
-        MIDI.read();
-    }
-    ```
+    // Read incoming messages
+    MIDI.read();
+}
+```
 
 3. Read the [documentation](#documentation) or watch the awesome video tutorials from [Notes & Volts](https://www.youtube.com/playlist?list=PL4_gPbvyebyH2xfPXePHtx8gK5zPBrVkg).
 
 ## Documentation
 
-- [Doxygen Extended Documentation](http://fortyseveneffects.github.io/arduino_midi_library/).
-- [GitHub wiki](https://github.com/FortySevenEffects/arduino_midi_library/wiki).
+-   [Doxygen Extended Documentation](https://fortyseveneffects.github.io/arduino_midi_library/).
+-   [GitHub wiki](https://github.com/FortySevenEffects/arduino_midi_library/wiki).
+
+## USB Migration (4.x to 5.x)
+
+All USB related code has been moved into a separate repository [Arduino-USB-MIDI](https://github.com/lathoub/Arduino-USBMIDI), USB MIDI Device support with [`MIDIUSB`](https://github.com/arduino-libraries/MIDIUSB), still using this library to do all the MIDI heavy-lifting.
+
+Migration has been made as easy as possible: only the declaration of the MIDI object has been modified, the rest of your code remains identical.
+
+`4.3.1` code:
+
+```c++
+#include <MIDI.h>
+#include <midi_UsbTransport.h>
+
+static const unsigned sUsbTransportBufferSize = 16;
+typedef midi::UsbTransport<sUsbTransportBufferSize> UsbTransport;
+
+UsbTransport sUsbTransport;
+
+MIDI_CREATE_INSTANCE(UsbTransport, sUsbTransport, MIDI);
+
+// ...
+```
+
+now becomes in `5.0.0`:
+
+```c++
+#include <USB-MIDI.h>
+USBMIDI_CREATE_DEFAULT_INSTANCE();
+
+// ...
+```
+
+Start with the [NoteOnOffEverySec](https://github.com/lathoub/Arduino-USBMIDI/blob/master/examples/NoteOnOffEverySec/NoteOnOffEverySec.ino) example that is based on the original MidiUSB [sketch](https://github.com/lathoub/arduino_midi_library/blob/master/examples/MidiUSB/MidiUSB.ino). Note the only difference is in the declaration.
+
+The [USB-MIDI](https://github.com/lathoub/Arduino-USBMIDI) Arduino library depends on [this library](https://github.com/FortySevenEffects/arduino_midi_library) and the [MIDIUSB](https://github.com/arduino-libraries/MIDIUSB) library.
+
+[USB-MIDI](https://github.com/lathoub/Arduino-USBMIDI) uses the latest Arduino IDE `depends` feature in the `library.properties` file installing all the dependencies automatically when installing from the IDE.
+
+## Other Transport mechanisms
+
+Version 5 of this library, allows for other Transport layers than the
+original MIDI 1.0 Electrical Specification (hardware serial).
+
+-   [USB-MIDI](https://github.com/lathoub/Arduino-USBMIDI)
+-   [AppleMIDI or rtpMIDI](https://github.com/lathoub/Arduino-AppleMIDI-Library)
+-   [ipMIDI](https://github.com/lathoub/Arduino-ipMIDI)
+-   [BLE-MIDI](https://github.com/lathoub/Arduino-BLE-MIDI)
+
+All these Transport layers use this library for all the underlying MIDI
+work, making it easy to switch transport protocols or making transport
+protocol bridges.
 
 ## Contact
 
 To report a bug, contribute, discuss on usage, or simply request support, please [create an issue here](https://github.com/FortySevenEffects/arduino_midi_library/issues/new).
 
-You can also get informations about bug fixes and updates on my twitter account: [@fortysevenfx](http://twitter.com/fortysevenfx).
+You can also contact me on Twitter: [@fortysevenfx](https://twitter.com/fortysevenfx).
 
 ## License
 
-MIT © 2016 [Francois Best](http://fortyseveneffects.com)
+MIT © 2009 - present [Francois Best](https://francoisbest.com)

builder/CMakeLists.txt

@@ -8,11 +8,26 @@ macro(setup_builder)
 
     include_directories(${ROOT_SOURCE_DIR})
 
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -W -Wshadow -Wunused-variable -Wunused-parameter -Wunused-function -Wunused -Wno-system-headers -Wno-deprecated -Woverloaded-virtual")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
+      -Wall                 \
+      -W                    \
+      -Wshadow              \
+      -Wunused-variable     \
+      -Wunused-parameter    \
+      -Wunused-function     \
+      -Wunused              \
+      -Wno-system-headers   \
+      -Wno-deprecated       \
+      -Woverloaded-virtual  \
+    ")
     if (BUILDER_ENABLE_PROFILING)
         set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -O0")
         set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} --coverage")
     endif()
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 
 endmacro()
+
+macro(increase_warning_level)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wconversion -Wsign-conversion")
+endmacro()

doc/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = "Arduino MIDI Library"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "Version 4.3.1"
+PROJECT_NUMBER         = "Version 4.4.0"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a