From dbc9d9734539386a161b5790079e9b7d7b49ad75 Mon Sep 17 00:00:00 2001 From: Francois Best Date: Thu, 13 Feb 2014 22:05:52 +0100 Subject: [PATCH] Cleanup tester. --- .../midi_ValidatorInstances.ino | 3 --- .../MIDI_LibValidator/midi_ValidatorTester.h | 3 --- .../MIDI_LibValidator/midi_ValidatorTester.ino | 18 +++++++++--------- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/res/Examples/MIDI_LibValidator/midi_ValidatorInstances.ino b/res/Examples/MIDI_LibValidator/midi_ValidatorInstances.ino index 8bd29bf..4ec241b 100644 --- a/res/Examples/MIDI_LibValidator/midi_ValidatorInstances.ino +++ b/res/Examples/MIDI_LibValidator/midi_ValidatorInstances.ino @@ -13,9 +13,6 @@ SoftwareSerial softSerial(10, 11); MIDI_CREATE_INSTANCE(SoftwareSerial, softSerial, midiSW); #endif -// \todo Create instance for USB if available - - void setupMidi() { while (!softSerial.isListening()) diff --git a/res/Examples/MIDI_LibValidator/midi_ValidatorTester.h b/res/Examples/MIDI_LibValidator/midi_ValidatorTester.h index e6eceea..9098ee7 100644 --- a/res/Examples/MIDI_LibValidator/midi_ValidatorTester.h +++ b/res/Examples/MIDI_LibValidator/midi_ValidatorTester.h @@ -2,6 +2,3 @@ void setupTesters(); bool launchTests(); - - - diff --git a/res/Examples/MIDI_LibValidator/midi_ValidatorTester.ino b/res/Examples/MIDI_LibValidator/midi_ValidatorTester.ino index 0fb4a41..8cabb07 100644 --- a/res/Examples/MIDI_LibValidator/midi_ValidatorTester.ino +++ b/res/Examples/MIDI_LibValidator/midi_ValidatorTester.ino @@ -8,23 +8,23 @@ template class Tester { -public: +public: typedef bool (*Functor) (MIDI_CLASS(SerialClass)&); - + public: explicit Tester(MIDI_CLASS(SerialClass)& inInstance) : mMidiInstance(inInstance) , mProgress(0) { } - + void setup() { mProgress = 0; mMidiInstance.begin(MIDI_CHANNEL_OMNI); mMidiInstance.turnThruOff(); } - + public: inline bool performTest(Functor inTestMethod) { @@ -36,7 +36,7 @@ public: } return false; } - + inline bool expect(bool inCondition) const { Serial.print(testNames[mProgress]); @@ -53,7 +53,7 @@ public: } return inCondition; } - + bool run() { bool result = true; @@ -77,7 +77,7 @@ public: result &= performTest(testSystemReset); return result; } - + private: MIDI_CLASS(SerialClass)& mMidiInstance; unsigned mProgress; @@ -102,8 +102,8 @@ bool launchTests() Serial.println("Testing HW:"); if (testerHW.run() == false) return false; - /*Serial.println("Testing SW:"); + Serial.println("Testing SW:"); if (testerSW.run() == false) - return false;*/ + return false; return true; }