This commit is contained in:
Francois Best 2014-06-11 09:33:32 +02:00
parent 3dc0f30e16
commit e31d0a1910
6 changed files with 1601 additions and 1072 deletions

File diff suppressed because it is too large Load Diff

View File

@ -12,8 +12,8 @@ cd "`dirname "${0}"`"
root="${PWD}/.." root="${PWD}/.."
build="$root/build/MIDI" build="$root/build/MIDI"
echo root $root echo "root: $root"
echo build $build echo "build: $build"
# Create a temporary destination folder # Create a temporary destination folder
mkdir -p "$build" mkdir -p "$build"
@ -34,3 +34,7 @@ cp -r * "$build/examples"
# Generate package # Generate package
cd "$build/.." cd "$build/.."
zip -r Arduino_MIDI_Library.zip MIDI zip -r Arduino_MIDI_Library.zip MIDI
# Generate doc
cd "$root/doc"
doxygen .

View File

@ -179,7 +179,6 @@ public:
inline void turnThruOff(); inline void turnThruOff();
inline void setThruFilterMode(MidiFilterMode inThruFilterMode); inline void setThruFilterMode(MidiFilterMode inThruFilterMode);
private: private:
void thruFilter(byte inChannel); void thruFilter(byte inChannel);

View File

@ -1,5 +1,5 @@
/*! /*!
* @file midi_Inline.hpp * @file MIDI.hpp
* Project Arduino MIDI Library * Project Arduino MIDI Library
* @brief MIDI Library for the Arduino - Inline implementations * @brief MIDI Library for the Arduino - Inline implementations
* @version 4.2 * @version 4.2
@ -1201,6 +1201,4 @@ void MidiInterface<SerialPort, Settings>::thruFilter(Channel inChannel)
} }
} }
// -----------------------------------------------------------------------------
END_MIDI_NAMESPACE END_MIDI_NAMESPACE

View File

@ -34,8 +34,6 @@ typedef uint8_t byte;
BEGIN_MIDI_NAMESPACE BEGIN_MIDI_NAMESPACE
// -----------------------------------------------------------------------------
#define MIDI_CHANNEL_OMNI 0 #define MIDI_CHANNEL_OMNI 0
#define MIDI_CHANNEL_OFF 17 // and over #define MIDI_CHANNEL_OFF 17 // and over

View File

@ -27,16 +27,20 @@
BEGIN_MIDI_NAMESPACE BEGIN_MIDI_NAMESPACE
/*! \brief Default Settings Traits struct /*! \brief Default Settings for the MIDI Library.
To change the default settings, don't edit them there, create a subclass and To change the default settings, don't edit them there, create a subclass and
override the values in that subclass, then use the MIDI_CREATE_CUSTOM_INSTANCE override the values in that subclass, then use the MIDI_CREATE_CUSTOM_INSTANCE
macro to create your instance. The settings you don't override will keep their macro to create your instance. The settings you don't override will keep their
default value. Eg: default value. Eg:
\code{.cpp}
struct MySettings : public midi::DefaultSettings struct MySettings : public midi::DefaultSettings
{ {
static const bool UseRunningStatus = false; // Messes with my old equipment! static const bool UseRunningStatus = false; // Messes with my old equipment!
}; };
MIDI_CREATE_CUSTOM_INSTANCE(HardwareSerial, Serial2, midi, MySettings); MIDI_CREATE_CUSTOM_INSTANCE(HardwareSerial, Serial2, midi, MySettings);
\endcode
*/ */
struct DefaultSettings struct DefaultSettings
{ {