From 82f5dca265fc15808dc40520b15548a5501a3617 Mon Sep 17 00:00:00 2001 From: Francois Best Date: Fri, 4 Nov 2016 10:53:18 +0100 Subject: [PATCH 1/4] Bumped version to 4.3.1, fixing Arduino lib file. Removed redundant version mentions in sources. --- library.json | 2 +- library.properties | 2 +- src/MIDI.cpp | 1 - src/MIDI.h | 1 - src/MIDI.hpp | 1 - src/midi_Defs.h | 1 - src/midi_Message.h | 1 - src/midi_Namespace.h | 1 - src/midi_RingBuffer.h | 1 - src/midi_RingBuffer.hpp | 1 - src/midi_Settings.h | 1 - src/midi_UsbDefs.h | 1 - src/midi_UsbTransport.h | 1 - src/midi_UsbTransport.hpp | 1 - 14 files changed, 2 insertions(+), 14 deletions(-) diff --git a/library.json b/library.json index 5962825..2216154 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "MIDI Library", - "version": "4.3", + "version": "4.3.1", "keywords": "midi", "description": "Enables MIDI I/O communications on the Arduino serial ports", "license": "MIT", diff --git a/library.properties b/library.properties index e09d900..de8a53f 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=MIDI Library -version=4.2.0 +version=4.3.1 author=Forty Seven Effects maintainer=Francois Best sentence=MIDI I/Os for Arduino diff --git a/src/MIDI.cpp b/src/MIDI.cpp index d85accc..7761821 100644 --- a/src/MIDI.cpp +++ b/src/MIDI.cpp @@ -2,7 +2,6 @@ * @file MIDI.cpp * Project Arduino MIDI Library * @brief MIDI Library for the Arduino - * @version 4.3 * @author Francois Best * @date 24/02/11 * @license MIT - Copyright (c) 2015 Francois Best diff --git a/src/MIDI.h b/src/MIDI.h index 22a84c5..5fe356c 100644 --- a/src/MIDI.h +++ b/src/MIDI.h @@ -2,7 +2,6 @@ * @file MIDI.h * Project Arduino MIDI Library * @brief MIDI Library for the Arduino - * @version 4.3 * @author Francois Best * @date 24/02/11 * @license MIT - Copyright (c) 2015 Francois Best diff --git a/src/MIDI.hpp b/src/MIDI.hpp index 0df7be1..e800d8c 100644 --- a/src/MIDI.hpp +++ b/src/MIDI.hpp @@ -2,7 +2,6 @@ * @file MIDI.hpp * Project Arduino MIDI Library * @brief MIDI Library for the Arduino - Inline implementations - * @version 4.3 * @author Francois Best * @date 24/02/11 * @license MIT - Copyright (c) 2015 Francois Best diff --git a/src/midi_Defs.h b/src/midi_Defs.h index 4c36b13..32f57d8 100644 --- a/src/midi_Defs.h +++ b/src/midi_Defs.h @@ -2,7 +2,6 @@ * @file midi_Defs.h * Project Arduino MIDI Library * @brief MIDI Library for the Arduino - Definitions - * @version 4.3 * @author Francois Best * @date 24/02/11 * @license MIT - Copyright (c) 2015 Francois Best diff --git a/src/midi_Message.h b/src/midi_Message.h index 3dcd7da..0d23107 100644 --- a/src/midi_Message.h +++ b/src/midi_Message.h @@ -2,7 +2,6 @@ * @file midi_Message.h * Project Arduino MIDI Library * @brief MIDI Library for the Arduino - Message struct definition - * @version 4.3 * @author Francois Best * @date 11/06/14 * @license MIT - Copyright (c) 2015 Francois Best diff --git a/src/midi_Namespace.h b/src/midi_Namespace.h index c241f95..0348dfa 100644 --- a/src/midi_Namespace.h +++ b/src/midi_Namespace.h @@ -2,7 +2,6 @@ * @file midi_Namespace.h * Project Arduino MIDI Library * @brief MIDI Library for the Arduino - Namespace declaration - * @version 4.3 * @author Francois Best * @date 24/02/11 * @license MIT - Copyright (c) 2015 Francois Best diff --git a/src/midi_RingBuffer.h b/src/midi_RingBuffer.h index ef66b67..da2266c 100644 --- a/src/midi_RingBuffer.h +++ b/src/midi_RingBuffer.h @@ -2,7 +2,6 @@ * @file midi_RingBuffer.h * Project Arduino MIDI Library * @brief MIDI Library for Arduino - Ring Buffer - * @version 4.3 * @author Francois Best * @date 10/10/2016 * @license MIT - Copyright (c) 2016 Francois Best diff --git a/src/midi_RingBuffer.hpp b/src/midi_RingBuffer.hpp index 3dc6750..9c273c9 100644 --- a/src/midi_RingBuffer.hpp +++ b/src/midi_RingBuffer.hpp @@ -2,7 +2,6 @@ * @file midi_RingBuffer.hpp * Project Arduino MIDI Library * @brief MIDI Library for Arduino - Ring Buffer - * @version 4.3 * @author Francois Best * @date 10/10/2016 * @license MIT - Copyright (c) 2016 Francois Best diff --git a/src/midi_Settings.h b/src/midi_Settings.h index c25a707..1951944 100644 --- a/src/midi_Settings.h +++ b/src/midi_Settings.h @@ -2,7 +2,6 @@ * @file midi_Settings.h * Project Arduino MIDI Library * @brief MIDI Library for the Arduino - Settings - * @version 4.3 * @author Francois Best * @date 24/02/11 * @license MIT - Copyright (c) 2015 Francois Best diff --git a/src/midi_UsbDefs.h b/src/midi_UsbDefs.h index 8a5ffd5..2170d02 100644 --- a/src/midi_UsbDefs.h +++ b/src/midi_UsbDefs.h @@ -2,7 +2,6 @@ * @file midi_UsbDefs.h * Project Arduino MIDI Library * @brief MIDI Library for the Arduino - Definitions - * @version 4.3 * @author Francois Best * @date 24/02/11 * @license MIT - Copyright (c) 2016 Francois Best diff --git a/src/midi_UsbTransport.h b/src/midi_UsbTransport.h index cffe454..a1556f5 100644 --- a/src/midi_UsbTransport.h +++ b/src/midi_UsbTransport.h @@ -2,7 +2,6 @@ * @file midi_UsbTransport.h * Project Arduino MIDI Library * @brief MIDI Library for the Arduino - Transport layer for USB MIDI - * @version 4.3 * @author Francois Best * @date 10/10/2016 * @license MIT - Copyright (c) 2016 Francois Best diff --git a/src/midi_UsbTransport.hpp b/src/midi_UsbTransport.hpp index ed53578..2a02c41 100644 --- a/src/midi_UsbTransport.hpp +++ b/src/midi_UsbTransport.hpp @@ -2,7 +2,6 @@ * @file midi_UsbTransport.hpp * Project Arduino MIDI Library * @brief MIDI Library for the Arduino - Transport layer for USB MIDI - * @version 4.3 * @author Francois Best * @date 10/10/2016 * @license MIT - Copyright (c) 2016 Francois Best From ce42efc7c6d7ec6fd7bc69d69201c7908a052706 Mon Sep 17 00:00:00 2001 From: Francois Best Date: Fri, 4 Nov 2016 10:53:54 +0100 Subject: [PATCH 2/4] Updated doc and tag URL. --- doc/Doxyfile | 2 +- library.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/Doxyfile b/doc/Doxyfile index 5551e59..5773a06 100644 --- a/doc/Doxyfile +++ b/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" +PROJECT_NUMBER = "Version 4.3.1" # 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 diff --git a/library.json b/library.json index 2216154..ffc44ce 100644 --- a/library.json +++ b/library.json @@ -17,7 +17,7 @@ "url": "https://github.com/FortySevenEffects/arduino_midi_library.git", "branch": "master" }, - "downloadUrl": "https://github.com/FortySevenEffects/arduino_midi_library/releases/tag/4.3", + "downloadUrl": "https://github.com/FortySevenEffects/arduino_midi_library/releases/tag/4.3.1", "include": "src", "examples": "examples/*/*.ino", "frameworks": "arduino", From 32489bc0ead39f930edb4e70009bfa6778fea7c9 Mon Sep 17 00:00:00 2001 From: David Menting Date: Fri, 4 Nov 2016 12:36:21 +0100 Subject: [PATCH 3/4] Added default serial port for Teensy 3.0/3.1/3.2 and Teensy LC --- src/midi_Defs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/midi_Defs.h b/src/midi_Defs.h index 32f57d8..9adec03 100644 --- a/src/midi_Defs.h +++ b/src/midi_Defs.h @@ -214,7 +214,7 @@ struct RPN #define MIDI_CREATE_INSTANCE(Type, SerialPort, Name) \ midi::MidiInterface Name((Type&)SerialPort); -#if defined(ARDUINO_SAM_DUE) || defined(USBCON) +#if defined(ARDUINO_SAM_DUE) || defined(USBCON) || defined(__MK20DX128__) || defined(__MK20DX256__) || defined(__MKL26Z64__) // Leonardo, Due and other USB boards use Serial1 by default. #define MIDI_CREATE_DEFAULT_INSTANCE() \ MIDI_CREATE_INSTANCE(HardwareSerial, Serial1, MIDI); From de608f874f2db44a765c2cd2f3f48eb19c0778bf Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 4 Nov 2016 13:45:47 +0200 Subject: [PATCH 4/4] Fix library manifest for @PlatformIO --- library.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/library.json b/library.json index ffc44ce..ad0375b 100644 --- a/library.json +++ b/library.json @@ -17,9 +17,12 @@ "url": "https://github.com/FortySevenEffects/arduino_midi_library.git", "branch": "master" }, - "downloadUrl": "https://github.com/FortySevenEffects/arduino_midi_library/releases/tag/4.3.1", - "include": "src", - "examples": "examples/*/*.ino", + "export": { + "include": [ + "src", + "examples" + ] + }, "frameworks": "arduino", "platforms": ["atmelavr", "atmelsam", "teensy"] }