Seich
/
arduino_midi_library
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed build.

This commit is contained in:
Francois Best 2014-02-13 22:13:09 +01:00
parent dbc9d97345
commit 1750e3a5af
8 changed files with 38 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
res/Examples/MIDI_LibValidator/MIDI_LibValidator.ino
View File

@ -3,6 +3,7 @@
#include <MIDI.h> #include <MIDI.h>
#include <LiquidCrystal.h> #include <LiquidCrystal.h>
#include <Arduino.h>
#include "midi_ValidatorSerialDebug.h" #include "midi_ValidatorSerialDebug.h"
#include "midi_ValidatorLCD.h" #include "midi_ValidatorLCD.h"
#include "midi_ValidatorLEDs.h" #include "midi_ValidatorLEDs.h"

2
res/Examples/MIDI_LibValidator/midi_ValidatorInstances.ino
View File

@ -1,4 +1,4 @@
#include <Arduino.h>
#include "midi_ValidatorInstances.h" #include "midi_ValidatorInstances.h"
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------

8
res/Examples/MIDI_LibValidator/midi_ValidatorLCD.ino
View File

@ -1,4 +1,4 @@
#include <Arduino.h>
#include "midi_ValidatorLCD.h" #include "midi_ValidatorLCD.h"
#define LCD_D4 8 #define LCD_D4 8
@ -10,7 +10,7 @@
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
byte progressChar[6][8] = byte progressChar[6][8] =
{ {
{ B00000, B00000, B00000, B00000, B00000, B00000, B00000, B00000 }, { B00000, B00000, B00000, B00000, B00000, B00000, B00000, B00000 },
{ B10000, B10000, B10000, B10000, B10000, B10000, B10000, B10000 }, { B10000, B10000, B10000, B10000, B10000, B10000, B10000, B10000 },
@ -28,7 +28,7 @@ void setupLCD()
{ {
for (byte i = 0; i < 6; ++i) for (byte i = 0; i < 6; ++i)
lcd.createChar(i, progressChar[i]); lcd.createChar(i, progressChar[i]);
lcd.begin(16,2); lcd.begin(16,2);
} }
@ -41,7 +41,7 @@ void setProgressBar(unsigned inProgress, unsigned inTotal)
const unsigned progress = (inProgress * numCols* numPix) / inTotal; const unsigned progress = (inProgress * numCols* numPix) / inTotal;
const byte cursorX = progress / numPix; const byte cursorX = progress / numPix;
const byte charIndex = progress % numPix; const byte charIndex = progress % numPix;
lcd.setCursor(cursorX, 1); lcd.setCursor(cursorX, 1);
lcd.write(charIndex); lcd.write(charIndex);
} }

2
res/Examples/MIDI_LibValidator/midi_ValidatorLEDs.h
View File

@ -32,7 +32,7 @@ inline void setLedsFinal(bool inSuccess)
{ {
digitalWrite(LED_PASS, HIGH); digitalWrite(LED_PASS, HIGH);
digitalWrite(LED_FAIL, LOW); digitalWrite(LED_FAIL, LOW);
} }
else else
{ {
digitalWrite(LED_FAIL, HIGH); digitalWrite(LED_FAIL, HIGH);

1
res/Examples/MIDI_LibValidator/midi_ValidatorLEDs.ino
View File

@ -1,3 +1,4 @@
#include <Arduino.h>
#include "midi_ValidatorLEDs.h" #include "midi_ValidatorLEDs.h"
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------

1
res/Examples/MIDI_LibValidator/midi_ValidatorSerialDebug.ino
View File

@ -1,3 +1,4 @@
#include <Arduino.h>
#include "midi_ValidatorSerialDebug.h" #include "midi_ValidatorSerialDebug.h"
void setupSerialDebug() void setupSerialDebug()

2
res/Examples/MIDI_LibValidator/midi_ValidatorTester.ino
View File

@ -1,4 +1,4 @@
#include <Arduino.h>
#include "midi_ValidatorTester.h" #include "midi_ValidatorTester.h"
#include "midi_ValidatorInstances.h" #include "midi_ValidatorInstances.h"
#include "midi_ValidatorTests.h" #include "midi_ValidatorTests.h"

56
res/Examples/MIDI_LibValidator/midi_ValidatorTests.ino
View File

@ -1,4 +1,4 @@
#include <Arduino.h>
#include "midi_ValidatorTests.h" #include "midi_ValidatorTests.h"
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
@ -7,9 +7,9 @@ IMPLEMENT_MIDI_TEST(testNoteOn, inMidi)
{ {
inMidi.sendNoteOn(12, 42, 3); inMidi.sendNoteOn(12, 42, 3);
while (inMidi.read() == false) { } while (inMidi.read() == false) { }
bool result = inMidi.getType() == midi::NoteOn && bool result = inMidi.getType() == midi::NoteOn &&
inMidi.getData1() == 12 && inMidi.getData1() == 12 &&
inMidi.getData2() == 42 && inMidi.getData2() == 42 &&
inMidi.getChannel() == 3; inMidi.getChannel() == 3;
return result; return result;
@ -19,9 +19,9 @@ IMPLEMENT_MIDI_TEST(testNoteOff, inMidi)
{ {
inMidi.sendNoteOff(12, 42, 3); inMidi.sendNoteOff(12, 42, 3);
while (inMidi.read() == false) { } while (inMidi.read() == false) { }
bool result = inMidi.getType() == midi::NoteOff && bool result = inMidi.getType() == midi::NoteOff &&
inMidi.getData1() == 12 && inMidi.getData1() == 12 &&
inMidi.getData2() == 42 && inMidi.getData2() == 42 &&
inMidi.getChannel() == 3; inMidi.getChannel() == 3;
return result; return result;
@ -31,9 +31,9 @@ IMPLEMENT_MIDI_TEST(testControlChange, inMidi)
{ {
inMidi.sendControlChange(12, 42, 3); inMidi.sendControlChange(12, 42, 3);
while (inMidi.read() == false) { } while (inMidi.read() == false) { }
bool result = inMidi.getType() == midi::ControlChange && bool result = inMidi.getType() == midi::ControlChange &&
inMidi.getData1() == 12 && inMidi.getData1() == 12 &&
inMidi.getData2() == 42 && inMidi.getData2() == 42 &&
inMidi.getChannel() == 3; inMidi.getChannel() == 3;
return result; return result;
@ -43,9 +43,9 @@ IMPLEMENT_MIDI_TEST(testProgramChange, inMidi)
{ {
inMidi.sendProgramChange(12, 3); inMidi.sendProgramChange(12, 3);
while (inMidi.read() == false) { } while (inMidi.read() == false) { }
bool result = inMidi.getType() == midi::ProgramChange && bool result = inMidi.getType() == midi::ProgramChange &&
inMidi.getData1() == 12 && inMidi.getData1() == 12 &&
inMidi.getData2() == 0 && inMidi.getData2() == 0 &&
inMidi.getChannel() == 3; inMidi.getChannel() == 3;
return result; return result;
@ -55,9 +55,9 @@ IMPLEMENT_MIDI_TEST(testAftertouchMono, inMidi)
{ {
inMidi.sendAfterTouch(12, 3); inMidi.sendAfterTouch(12, 3);
while (inMidi.read() == false) { } while (inMidi.read() == false) { }
bool result = inMidi.getType() == midi::AfterTouchChannel && bool result = inMidi.getType() == midi::AfterTouchChannel &&
inMidi.getData1() == 12 && inMidi.getData1() == 12 &&
inMidi.getData2() == 0 && inMidi.getData2() == 0 &&
inMidi.getChannel() == 3; inMidi.getChannel() == 3;
return result; return result;
@ -67,9 +67,9 @@ IMPLEMENT_MIDI_TEST(testAftertouchPoly, inMidi)
{ {
inMidi.sendPolyPressure(12, 42, 3); inMidi.sendPolyPressure(12, 42, 3);
while (inMidi.read() == false) { } while (inMidi.read() == false) { }
bool result = inMidi.getType() == midi::AfterTouchPoly && bool result = inMidi.getType() == midi::AfterTouchPoly &&
inMidi.getData1() == 12 && inMidi.getData1() == 12 &&
inMidi.getData2() == 42 && inMidi.getData2() == 42 &&
inMidi.getChannel() == 3; inMidi.getChannel() == 3;
return result; return result;
@ -90,8 +90,8 @@ IMPLEMENT_MIDI_TEST(testPitchBend, inMidi)
pitchBendMemory = 0; pitchBendMemory = 0;
inMidi.sendPitchBend((int)1234, 3); inMidi.sendPitchBend((int)1234, 3);
while (inMidi.read() == false) { } while (inMidi.read() == false) { }
bool result = inMidi.getType() == midi::PitchBend && bool result = inMidi.getType() == midi::PitchBend &&
pitchBendMemory == 1234 && pitchBendMemory == 1234 &&
inMidi.getChannel() == 3; inMidi.getChannel() == 3;
return result; return result;
@ -108,7 +108,7 @@ IMPLEMENT_MIDI_TEST(testSysEx, inMidi)
}; };
inMidi.sendSysEx(13, testData); inMidi.sendSysEx(13, testData);
while (inMidi.read() == false) { } while (inMidi.read() == false) { }
bool result = inMidi.getSysExArrayLength() == 15 && // 13 + F0 + F7 bool result = inMidi.getSysExArrayLength() == 15 && // 13 + F0 + F7
@ -170,7 +170,7 @@ IMPLEMENT_MIDI_TEST(testTimeCode, inMidi)
inMidi.setHandleTimeCodeQuarterFrame(timeCodeCallback); inMidi.setHandleTimeCodeQuarterFrame(timeCodeCallback);
inMidi.sendTimeCodeQuarterFrame(0x07, 0x0F); inMidi.sendTimeCodeQuarterFrame(0x07, 0x0F);
while (inMidi.read() == false) { } while (inMidi.read() == false) { }
bool result = inMidi.getType() == midi::TimeCodeQuarterFrame && bool result = inMidi.getType() == midi::TimeCodeQuarterFrame &&
timeCodeMemory == 0x7F && timeCodeMemory == 0x7F &&
inMidi.getChannel() == 0; inMidi.getChannel() == 0;
return result; return result;
@ -182,9 +182,9 @@ IMPLEMENT_MIDI_TEST(testSongSelect, inMidi)
{ {
inMidi.sendSongSelect(12); inMidi.sendSongSelect(12);
while (inMidi.read() == false) { } while (inMidi.read() == false) { }
bool result = inMidi.getType() == midi::SongSelect && bool result = inMidi.getType() == midi::SongSelect &&
inMidi.getData1() == 12 && inMidi.getData1() == 12 &&
inMidi.getData2() == 0 && inMidi.getData2() == 0 &&
inMidi.getChannel() == 0; inMidi.getChannel() == 0;
return result; return result;
@ -205,8 +205,8 @@ IMPLEMENT_MIDI_TEST(testSongPosition, inMidi)
inMidi.setHandleSongPosition(songPositionCallback); inMidi.setHandleSongPosition(songPositionCallback);
inMidi.sendSongPosition(12345); inMidi.sendSongPosition(12345);
while (inMidi.read() == false) { } while (inMidi.read() == false) { }
bool result = inMidi.getType() == midi::SongPosition && bool result = inMidi.getType() == midi::SongPosition &&
songPositionMemory == 12345 && songPositionMemory == 12345 &&
inMidi.getChannel() == 0; inMidi.getChannel() == 0;
return result; return result;