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

Pass *currentPage to functions instead of the original page data

Browse source 
This way it will be easier to break out even more functionality into more general functions.
This commit is contained in:
Mikael Degerfält 2019-06-21 20:51:46 +02:00
parent 5aafab684e
commit 0c7bb7cc13
1 changed files with 37 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

79
NuEVI/menu.cpp
View file

@ -1420,7 +1420,7 @@ void menu() {
} }
currentPage = &mainMenuPage; currentPage = &mainMenuPage;
if (subTranspose){ if (subTranspose){
redraw |= updateSubMenuCursor( mainMenuPage, timeNow ); redraw |= updateSubMenuCursor( *currentPage, timeNow );
if (buttonPressedAndNotUsed){ if (buttonPressedAndNotUsed){
buttonPressedAndNotUsed = 0; buttonPressedAndNotUsed = 0;
switch (deumButtonState){ switch (deumButtonState){
@ -1443,7 +1443,7 @@ void menu() {
redrawSubValue = true; redrawSubValue = true;
} }
} else if (subOctave){ } else if (subOctave){
redraw |= updateSubMenuCursor( mainMenuPage, timeNow ); redraw |= updateSubMenuCursor( *currentPage, timeNow );
if (buttonPressedAndNotUsed){ if (buttonPressedAndNotUsed){
buttonPressedAndNotUsed = 0; buttonPressedAndNotUsed = 0;
switch (deumButtonState){ switch (deumButtonState){
@ -1466,7 +1466,7 @@ void menu() {
redrawSubValue = true; redrawSubValue = true;
} }
} else if (subMIDI) { } else if (subMIDI) {
redraw |= updateSubMenuCursor( mainMenuPage, timeNow ); redraw |= updateSubMenuCursor( *currentPage, timeNow );
if (buttonPressedAndNotUsed){ if (buttonPressedAndNotUsed){
buttonPressedAndNotUsed = 0; buttonPressedAndNotUsed = 0;
switch (deumButtonState){ switch (deumButtonState){
@ -1501,7 +1501,7 @@ void menu() {
} }
} else { } else {
bool hadButtons = buttonPressedAndNotUsed; bool hadButtons = buttonPressedAndNotUsed;
redraw |= updateMenuPage( mainMenuPage, timeNow ); redraw |= updateMenuPage( *currentPage, timeNow );
if (hadButtons) if (hadButtons)
checkForPatchView(); checkForPatchView();
} }
@ -1584,7 +1584,7 @@ void menu() {
cursorBlinkTime = timeNow; cursorBlinkTime = timeNow;
} }
} else if (subPriority){ } else if (subPriority){
updateSubMenuCursor( rotatorMenuPage, timeNow ); updateSubMenuCursor( *currentPage, timeNow );
if (buttonPressedAndNotUsed) { if (buttonPressedAndNotUsed) {
buttonPressedAndNotUsed = 0; buttonPressedAndNotUsed = 0;
switch (deumButtonState){ switch (deumButtonState){
@ -1605,21 +1605,19 @@ void menu() {
} }
} else { } else {
bool hadButtons = buttonPressedAndNotUsed; bool hadButtons = buttonPressedAndNotUsed;
redraw |= updateMenuPage( rotatorMenuPage, timeNow ); redraw |= updateMenuPage( *currentPage, timeNow );
if (hadButtons) if (hadButtons)
checkForPatchView(); checkForPatchView();
} }
// end rotator menu // end rotator menu
} else if (state == ADJUST_MENU) { } else if (state == ADJUST_MENU) {
// This is a hack to update touch_Thr is it was changed.. // This is a hack to update touch_Thr is it was changed..
int old_thr = ctouchThrVal; int old_thr = ctouchThrVal;
redraw |= updateAdjustMenu( timeNow, buttonPressedAndNotUsed ? deumButtonState : 0 ); redraw |= updateAdjustMenu( timeNow, buttonPressedAndNotUsed ? deumButtonState : 0 );
buttonPressedAndNotUsed = 0; buttonPressedAndNotUsed = 0;
if( old_thr != ctouchThrVal) { if( old_thr != ctouchThrVal) {
// Question: Why not used the built-in threshold in the touch sensor?
touch_Thr = map(ctouchThrVal,ctouchHiLimit,ctouchLoLimit,ttouchLoLimit,ttouchHiLimit); touch_Thr = map(ctouchThrVal,ctouchHiLimit,ctouchLoLimit,ttouchLoLimit,ttouchHiLimit);
} }
} else if (state == SETUP_BR_MENU) { // SETUP BREATH MENU HERE <<<<<<<<<<<<<< } else if (state == SETUP_BR_MENU) { // SETUP BREATH MENU HERE <<<<<<<<<<<<<<
@ -1629,7 +1627,7 @@ void menu() {
} }
currentPage = &breathMenuPage; currentPage = &breathMenuPage;
if (subBreathCC){ if (subBreathCC){
redraw |= updateSubMenuCursor( breathMenuPage, timeNow ); redraw |= updateSubMenuCursor( *currentPage, timeNow );
if (buttonPressedAndNotUsed){ if (buttonPressedAndNotUsed){
buttonPressedAndNotUsed = 0; buttonPressedAndNotUsed = 0;
switch (deumButtonState){ switch (deumButtonState){
@ -1660,23 +1658,20 @@ void menu() {
redrawSubValue = true; redrawSubValue = true;
} }
} else if (subBreathAT) { } else if (subBreathAT) {
redraw |= updateSubMenuCursor( breathMenuPage, timeNow ); redraw |= updateSubMenuCursor( *currentPage, timeNow );
if (buttonPressedAndNotUsed){ if (buttonPressedAndNotUsed){
buttonPressedAndNotUsed = 0; buttonPressedAndNotUsed = 0;
switch (deumButtonState){ switch (deumButtonState){
case BTN_DOWN: case BTN_DOWN: // fallthrough
breathAT = !breathAT; breathAT = !breathAT;
break;
case BTN_UP:
// up
breathAT = !breathAT; breathAT = !breathAT;
break; break;
case BTN_ENTER: // fallthrough case BTN_ENTER: // fallthrough
case BTN_MENU: case BTN_MENU:
// menu
subBreathAT = 0; subBreathAT = 0;
if (readSetting(BREATH_AT_ADDR) != breathAT){ if (readSetting(BREATH_AT_ADDR) != breathAT){
writeSetting(BREATH_AT_ADDR,breathAT); writeSetting(BREATH_AT_ADDR, breathAT);
midiReset(); midiReset();
} }
break; break;
@ -1684,7 +1679,7 @@ void menu() {
redrawSubValue = true; redrawSubValue = true;
} }
} else if (subVelocity) { } else if (subVelocity) {
redraw |= updateSubMenuCursor( breathMenuPage, timeNow ); redraw |= updateSubMenuCursor( *currentPage, timeNow );
if (buttonPressedAndNotUsed){ if (buttonPressedAndNotUsed){
buttonPressedAndNotUsed = 0; buttonPressedAndNotUsed = 0;
switch (deumButtonState){ switch (deumButtonState){
@ -1693,11 +1688,13 @@ void menu() {
velocity--; velocity--;
} else velocity = 127; } else velocity = 127;
break; break;
case BTN_UP: case BTN_UP:
if (velocity < 127){ if (velocity < 127){
velocity++; velocity++;
} else velocity = 0; } else velocity = 0;
break; break;
case BTN_ENTER: // fallthrough case BTN_ENTER: // fallthrough
case BTN_MENU: case BTN_MENU:
subVelocity = 0; subVelocity = 0;
@ -1708,24 +1705,24 @@ void menu() {
} }
} else if (subCurve) { } else if (subCurve) {
redraw |= updateSubMenuCursor( breathMenuPage, timeNow ); redraw |= updateSubMenuCursor( *currentPage, timeNow );
if (buttonPressedAndNotUsed){ if (buttonPressedAndNotUsed){
buttonPressedAndNotUsed = 0; buttonPressedAndNotUsed = 0;
switch (deumButtonState){ switch (deumButtonState){
case BTN_DOWN: case BTN_DOWN:
if (curve > 0){ if (curve > 0)
curve--; curve--;
} else curve = 12; else curve = 12;
break; break;
case BTN_UP: case BTN_UP:
// up if (curve < 12)
if (curve < 12){
curve++; curve++;
} else curve = 0; else curve = 0;
break; break;
case BTN_ENTER: // fallthrough case BTN_ENTER: // fallthrough
case BTN_MENU: case BTN_MENU:
// menu
subCurve = 0; subCurve = 0;
writeSetting(BREATHCURVE_ADDR,curve); writeSetting(BREATHCURVE_ADDR,curve);
break; break;
@ -1734,7 +1731,7 @@ void menu() {
} }
} else if (subVelSmpDl) { } else if (subVelSmpDl) {
redraw |= updateSubMenuCursor( breathMenuPage, timeNow ); redraw |= updateSubMenuCursor( *currentPage, timeNow );
if (buttonPressedAndNotUsed){ if (buttonPressedAndNotUsed){
buttonPressedAndNotUsed = 0; buttonPressedAndNotUsed = 0;
switch (deumButtonState){ switch (deumButtonState){
@ -1760,7 +1757,7 @@ void menu() {
} }
} else if (subVelBias) { } else if (subVelBias) {
redraw |= updateSubMenuCursor( breathMenuPage, timeNow ); redraw |= updateSubMenuCursor( *currentPage, timeNow );
if (buttonPressedAndNotUsed){ if (buttonPressedAndNotUsed){
buttonPressedAndNotUsed = 0; buttonPressedAndNotUsed = 0;
switch (deumButtonState) { switch (deumButtonState) {
@ -1794,7 +1791,7 @@ void menu() {
} }
} else { } else {
redraw |= updateMenuPage( breathMenuPage, timeNow ); redraw |= updateMenuPage( *currentPage, timeNow );
} }
@ -1805,7 +1802,7 @@ void menu() {
} }
currentPage = &controlMenuPage; currentPage = &controlMenuPage;
if (subPort){ if (subPort){
redraw |= updateSubMenuCursor( controlMenuPage, timeNow ); redraw |= updateSubMenuCursor( *currentPage, timeNow );
if (buttonPressedAndNotUsed){ if (buttonPressedAndNotUsed){
buttonPressedAndNotUsed = 0; buttonPressedAndNotUsed = 0;
switch (deumButtonState){ switch (deumButtonState){
@ -1830,7 +1827,7 @@ void menu() {
redrawSubValue = true; redrawSubValue = true;
} }
} else if (subPB) { } else if (subPB) {
redraw |= updateSubMenuCursor( controlMenuPage, timeNow ); redraw |= updateSubMenuCursor( *currentPage, timeNow );
if (buttonPressedAndNotUsed){ if (buttonPressedAndNotUsed){
buttonPressedAndNotUsed = 0; buttonPressedAndNotUsed = 0;
switch (deumButtonState){ switch (deumButtonState){
@ -1853,7 +1850,7 @@ void menu() {
redrawSubValue = true; redrawSubValue = true;
} }
} else if (subExtra) { } else if (subExtra) {
redraw |= updateSubMenuCursor( controlMenuPage, timeNow ); redraw |= updateSubMenuCursor( *currentPage, timeNow );
if (buttonPressedAndNotUsed){ if (buttonPressedAndNotUsed){
buttonPressedAndNotUsed = 0; buttonPressedAndNotUsed = 0;
switch (deumButtonState){ switch (deumButtonState){
@ -1878,7 +1875,7 @@ void menu() {
redrawSubValue = true; redrawSubValue = true;
} }
} else if (subDeglitch) { } else if (subDeglitch) {
redraw |= updateSubMenuCursor( controlMenuPage, timeNow ); redraw |= updateSubMenuCursor( *currentPage, timeNow );
if (buttonPressedAndNotUsed){ if (buttonPressedAndNotUsed){
buttonPressedAndNotUsed = 0; buttonPressedAndNotUsed = 0;
switch (deumButtonState){ switch (deumButtonState){
@ -1902,7 +1899,7 @@ void menu() {
redrawSubValue = true; redrawSubValue = true;
} }
} else if (subPinky) { } else if (subPinky) {
redraw |= updateSubMenuCursor( controlMenuPage, timeNow ); redraw |= updateSubMenuCursor( *currentPage, timeNow );
if (buttonPressedAndNotUsed){ if (buttonPressedAndNotUsed){
buttonPressedAndNotUsed = 0; buttonPressedAndNotUsed = 0;
switch (deumButtonState){ switch (deumButtonState){
@ -1925,7 +1922,7 @@ void menu() {
redrawSubValue = true; redrawSubValue = true;
} }
} else { } else {
redraw |= updateMenuPage( controlMenuPage, timeNow ); redraw |= updateMenuPage( *currentPage, timeNow );
} }
} else if (state == VIBRATO_MENU) { // VIBRATO MENU HERE <<<<<<<<<<<<< } else if (state == VIBRATO_MENU) { // VIBRATO MENU HERE <<<<<<<<<<<<<
@ -1935,7 +1932,7 @@ void menu() {
} }
currentPage = &vibratoMenuPage; currentPage = &vibratoMenuPage;
if (subVibrato) { if (subVibrato) {
redraw |= updateSubMenuCursor( vibratoMenuPage, timeNow ); redraw |= updateSubMenuCursor( *currentPage, timeNow );
if (buttonPressedAndNotUsed){ if (buttonPressedAndNotUsed){
buttonPressedAndNotUsed = 0; buttonPressedAndNotUsed = 0;
switch (deumButtonState){ switch (deumButtonState){
@ -1958,9 +1955,7 @@ void menu() {
redrawSubValue = true; redrawSubValue = true;
} }
} else if (subVibSens) { } else if (subVibSens) {
redraw |= updateSubMenuCursor( *currentPage, timeNow );
redraw |= updateSubMenuCursor( vibratoMenuPage, timeNow );
if (buttonPressedAndNotUsed){ if (buttonPressedAndNotUsed){
buttonPressedAndNotUsed = 0; buttonPressedAndNotUsed = 0;
switch (deumButtonState){ switch (deumButtonState){
@ -1987,7 +1982,7 @@ void menu() {
cursorBlinkTime = timeNow; cursorBlinkTime = timeNow;
} }
} else if (subVibRetn) { } else if (subVibRetn) {
redraw |= updateSubMenuCursor( vibratoMenuPage, timeNow ); redraw |= updateSubMenuCursor( *currentPage, timeNow );
if (buttonPressedAndNotUsed){ if (buttonPressedAndNotUsed){
buttonPressedAndNotUsed = 0; buttonPressedAndNotUsed = 0;
switch (deumButtonState){ switch (deumButtonState){
@ -2010,7 +2005,7 @@ void menu() {
redrawSubValue = true; redrawSubValue = true;
} }
} else if (subVibSquelch) { } else if (subVibSquelch) {
redraw |= updateSubMenuCursor( vibratoMenuPage, timeNow ); redraw |= updateSubMenuCursor( *currentPage, timeNow );
if (buttonPressedAndNotUsed){ if (buttonPressedAndNotUsed){
buttonPressedAndNotUsed = 0; buttonPressedAndNotUsed = 0;
switch (deumButtonState){ switch (deumButtonState){
@ -2037,7 +2032,7 @@ void menu() {
redraw = true; redraw = true;
} }
} else if (subVibDirection) { } else if (subVibDirection) {
redraw |= updateSubMenuCursor( vibratoMenuPage, timeNow ); redraw |= updateSubMenuCursor( *currentPage, timeNow );
if (buttonPressedAndNotUsed){ if (buttonPressedAndNotUsed){
buttonPressedAndNotUsed = 0; buttonPressedAndNotUsed = 0;
switch (deumButtonState){ switch (deumButtonState){
@ -2056,7 +2051,7 @@ void menu() {
redrawSubValue = true; redrawSubValue = true;
} }
} else { } else {
redraw |= updateMenuPage( vibratoMenuPage, timeNow ); redraw |= updateMenuPage( *currentPage, timeNow );
} }
} }