From cc3323fd036c209bb1387c06fd98932ab42cb1dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikael=20Degerf=C3=A4lt?= <micke@demicode.se>
Date: Sat, 8 Jun 2019 16:11:49 +0200
Subject: [PATCH] Move access to usbMIDI to midi.ino
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

NuEVI.ino shouldn’t have to know about usbMIDI.
---
 NuEVI/NuEVI.ino | 5 ++---
 NuEVI/midi.h    | 2 +-
 NuEVI/midi.ino  | 7 +++++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/NuEVI/NuEVI.ino b/NuEVI/NuEVI.ino
index 0ebf6a1..6c05706 100644
--- a/NuEVI/NuEVI.ino
+++ b/NuEVI/NuEVI.ino
@@ -849,9 +849,8 @@ void loop() {
     analogWrite(dacPin,breathCurve(map(constrain(pressureSensor,breathThrVal,breathMaxVal),breathThrVal,breathMaxVal,0,4095)));
   #endif
 
-  while (usbMIDI.read()) {
-    // read & ignore incoming messages
-  }
+  midiDiscardInput();
+
   //do menu stuff
   menu();
 }
diff --git a/NuEVI/midi.h b/NuEVI/midi.h
index ae9d440..5af5f28 100644
--- a/NuEVI/midi.h
+++ b/NuEVI/midi.h
@@ -16,7 +16,7 @@ void midiSendNoteOff(byte note);
 void midiSendAfterTouch(byte value);
 void midiSendPitchBend(int value);
 
-
+void midiDiscardInput(void);
 void midiReset(); // reset controllers
 void midiPanic(); // turn all notes off
 
diff --git a/NuEVI/midi.ino b/NuEVI/midi.ino
index 63327f8..65c64c7 100644
--- a/NuEVI/midi.ino
+++ b/NuEVI/midi.ino
@@ -50,6 +50,13 @@ void midiSendPitchBend(int value) {
     dinMIDIsendPitchBend(value, midiChannel - 1);
 }
 
+void midiDiscardInput()
+{
+  while (usbMIDI.read()) {
+    // read & ignore incoming messages
+  }
+}
+
 void midiReset() { // reset controllers
   midiSendControlChange(7, 100);
   midiSendControlChange(11, 127);