brian/xevi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Hopefully I've managed to get all the legacy control stuff right this time.

Browse source
This commit is contained in:
Johan Berglund 2019-10-23 19:21:37 +02:00
parent bf125a3dd6
commit 858bcb359e
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
NuEVI/NuEVI.ino
View file

@ -411,6 +411,9 @@ void loop() {
if (legacy || legacyBrAct) { if (legacy || legacyBrAct) {
bool bothPB = (pbUp > ((pitchbMaxVal + pitchbThrVal) / 2)) && (pbDn > ((pitchbMaxVal + pitchbThrVal) / 2)); bool bothPB = (pbUp > ((pitchbMaxVal + pitchbThrVal) / 2)) && (pbDn > ((pitchbMaxVal + pitchbThrVal) / 2));
bool justPbDn = !(pbUp > ((pitchbMaxVal + pitchbThrVal) / 2)) && (pbDn > ((pitchbMaxVal + pitchbThrVal) / 2));
bool justPbUp = (pbUp > ((pitchbMaxVal + pitchbThrVal) / 2)) && !(pbDn > ((pitchbMaxVal + pitchbThrVal) / 2));
bool noPb = !(pbUp > ((pitchbMaxVal + pitchbThrVal) / 2)) && !(pbDn > ((pitchbMaxVal + pitchbThrVal) / 2));
bool brSuck = analogRead(breathSensorPin) < (breathCalZero - 850); bool brSuck = analogRead(breathSensorPin) < (breathCalZero - 850);
int pitchlatchForPatch = patchLimit(pitchlatch + 1); int pitchlatchForPatch = patchLimit(pitchlatch + 1);
if (pcCombo1 && (pcCombo1 != lastpcc1)){ // latched note number to patch number, send with K1/K5 combo if (pcCombo1 && (pcCombo1 != lastpcc1)){ // latched note number to patch number, send with K1/K5 combo
@ -435,7 +438,8 @@ void loop() {
lastpcc2=pcCombo2; lastpcc2=pcCombo2;
if ( if (
(bothPB && legacy) || (bothPB && legacy) ||
(brSuck && legacyBrAct && (bothPB || bcasMode)) (brSuck && legacyBrAct && justPbUp) ||
(brSuck && legacyBrAct && bcasMode && noPb)
) { // both pb pads touched or br suck ) { // both pb pads touched or br suck
@ -465,7 +469,7 @@ void loop() {
} }
} }
} else { } else {
if ((pbDn > (pitchbMaxVal + pitchbThrVal) / 2) && legacyBrAct && brSuck && programonce == false) { // down bend for suck programming button if (justPbDn && legacyBrAct && brSuck && programonce == false) { // down bend for suck programming button
programonce = true; programonce = true;
if (octaveR == 0) { //lowest octave position if (octaveR == 0) { //lowest octave position