From 7342de4d82901f95606cab2ff782d0a8b98d6a2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20St=C3=A4ck?= <stack@spotify.com>
Date: Tue, 25 Jun 2019 08:20:08 +0200
Subject: [PATCH] Annotate "fingering math" for readability

---
 NuEVI/NuEVI.ino | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/NuEVI/NuEVI.ino b/NuEVI/NuEVI.ino
index 8579820..17c595e 100644
--- a/NuEVI/NuEVI.ino
+++ b/NuEVI/NuEVI.ino
@@ -1296,12 +1296,24 @@ void readSwitches() {
 
   // Calculate midi note number from pressed keys  
   #if defined(CASSIDY)
-  fingeredNote = startNote - 2*K1 - K2 - 3*K3 - 5*K4 + 2*K5 + K6 + 3*K7 + octaveR*12 + (octave - 3)*12 + transpose - 12 + qTransp;
-  fingeredNoteUntransposed = startNote - 2*K1 - K2 - 3*K3 - 5*K4 + 2*K5 + K6 + 3*K7 + octaveR*12;
+
+  fingeredNoteUntransposed = startNote
+    - 2*K1 - K2 - 3*K3  //"Trumpet valves"
+    - 5*K4              //Fifth key
+    + 2*K5 + K6 + 3*K7  //Trill keys (different from standard)
+    + octaveR*12;       //Octave rollers
+
   #else
-  fingeredNote = startNote - 2*K1 - K2 - 3*K3 - 5*K4 + 2*K5 + K6 + 4*K7 + octaveR*12 + (octave - 3)*12 + transpose - 12 + qTransp;
-  fingeredNoteUntransposed = startNote - 2*K1 - K2 - 3*K3 - 5*K4 + 2*K5 + K6 + 4*K7 + octaveR*12;
+
+  fingeredNoteUntransposed = startNote
+    - 2*K1 - K2 - 3*K3  //"Trumpet valves"
+    - 5*K4              //Fifth key
+    + 2*K5 + K6 + 4*K7  //Trill keys
+    + octaveR*12;       //Octave rollers
+
   #endif
 
+  fingeredNote = fingeredNoteUntransposed + transpose - 12 + qTransp;
+
   if (pinkyKey) pitchlatch = fingeredNoteUntransposed; //use pitchlatch to make settings based on note fingered
 }