From 549c2797b047ff52d00a13b1febc59265a84f1fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20St=C3=A4ck?= <stack@spotify.com>
Date: Tue, 25 Jun 2019 08:28:34 +0200
Subject: [PATCH] Use pin names rather than hardcoding

---
 NuEVI/NuEVI.ino  | 14 +++++++-------
 NuEVI/hardware.h |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/NuEVI/NuEVI.ino b/NuEVI/NuEVI.ino
index 17c595e..820a73a 100644
--- a/NuEVI/NuEVI.ino
+++ b/NuEVI/NuEVI.ino
@@ -257,7 +257,7 @@ void setup() {
     writeSetting(VERSION_ADDR,VERSION);
     writeSetting(BREATH_THR_ADDR,BREATH_THR_FACTORY);
     writeSetting(BREATH_MAX_ADDR,BREATH_MAX_FACTORY);
-      if (digitalRead(biteJumperPin)){ //PBITE (if pulled low with jumper, pressure sensor on A7 instead of capacitive bite sensing)
+      if (digitalRead(biteJumperPin)){ //PBITE (if pulled low with jumper, pressure sensor is used instead of capacitive bite sensing)
         writeSetting(PORTAM_THR_ADDR,PORTAM_THR_FACTORY);  
         writeSetting(PORTAM_MAX_ADDR,PORTAM_MAX_FACTORY); 
       } else {
@@ -443,10 +443,10 @@ void loop() {
     if (legacy || legacyBrAct) {
       #if defined(CASSIDY)
       if (((pbUp > ((pitchbMaxVal + pitchbThrVal) / 2)) && (pbDn > ((pitchbMaxVal + pitchbThrVal) / 2)) && legacy) ||
-          ((analogRead(0) < breathCalZero - 900) && legacyBrAct)) { // both pb pads touched or br suck
+          ((analogRead(breathSensorPin) < breathCalZero - 900) && legacyBrAct)) { // both pb pads touched or br suck
       #else
       if (((pbUp > ((pitchbMaxVal + pitchbThrVal) / 2)) && (pbDn > ((pitchbMaxVal + pitchbThrVal) / 2)) && legacy) ||
-          ((analogRead(0) < breathCalZero - 800) && legacyBrAct && (pbUp > (pitchbMaxVal + pitchbThrVal) / 2) && (pbDn < (pitchbMaxVal + pitchbThrVal) / 2))) { // both pb pads touched or br suck
+          ((analogRead(breathSensorPin) < breathCalZero - 800) && legacyBrAct && (pbUp > (pitchbMaxVal + pitchbThrVal) / 2) && (pbDn < (pitchbMaxVal + pitchbThrVal) / 2))) { // both pb pads touched or br suck
       #endif  
         readSwitches();
         fingeredNoteUntransposed = patchLimit(fingeredNoteUntransposed + 1);
@@ -495,7 +495,7 @@ void loop() {
           }
         }
       } else {
-        if (pbDn > (pitchbMaxVal + pitchbThrVal) / 2 && (analogRead(0) < (breathCalZero - 800)) && programonce == false) { // down bend for suck programming button
+        if (pbDn > (pitchbMaxVal + pitchbThrVal) / 2 && (analogRead(breathSensorPin) < (breathCalZero - 800)) && programonce == false) { // down bend for suck programming button
           programonce = true;
           readSwitches();
 
@@ -564,7 +564,7 @@ void loop() {
       }
     }
 
-    if (analogRead(0) > (breathCalZero - 800)) programonce = false;
+    if (analogRead(breathSensorPin) > (breathCalZero - 800)) programonce = false;
 
     specialKey = (touchRead(specialKeyPin) > touch_Thr); //S2 on pcb
     if (lastSpecialKey != specialKey) {
@@ -1206,8 +1206,8 @@ void extraController() {
 
 void portamento_() {
   // Portamento is controlled with the bite sensor (variable capacitor) in the mouthpiece
-  if (biteJumper){ //PBITE (if pulled low with jumper, use pressure sensor on A7)
-    biteSensor = analogRead(A7); // alternative kind bite sensor (air pressure tube and sensor)  PBITE 
+  if (biteJumper){ //PBITE (if pulled low with jumper, use pressure sensor instead of capacitive bite sensor)
+    biteSensor=analogRead(bitePressurePin); // alternative kind bite sensor (air pressure tube and sensor)  PBITE
    } else { 
     biteSensor = touchRead(bitePin);     // get sensor data, do some smoothing - SENSOR PIN 17 - PCB PINS LABELED "BITE" (GND left, sensor pin right) 
    }
diff --git a/NuEVI/hardware.h b/NuEVI/hardware.h
index cbe9a75..3b9c64a 100644
--- a/NuEVI/hardware.h
+++ b/NuEVI/hardware.h
@@ -21,6 +21,7 @@
 #define biteJumperGndPin 12 //PBITE
 
 #define breathSensorPin A0
+#define bitePressurePin A7
 
 #define dPin 3
 #define ePin 4