Pass button state instead of accessing global variable

This commit is contained in:
Mikael Degerfält 2019-06-21 21:50:46 +02:00
parent 2ed201ed04
commit 8772e28907

View file

@ -1150,11 +1150,11 @@ static bool updateMenuPage( const MenuPage &page, uint32_t timeNow ) {
} }
//*********************************************************** //***********************************************************
static void checkForPatchView() static void checkForPatchView(int buttons)
{ {
int trills = readTrills(); int trills = readTrills();
switch (deumButtonState){ switch (buttons){
case BTN_MENU+BTN_DOWN: case BTN_MENU+BTN_DOWN:
break; break;
@ -1501,7 +1501,7 @@ void menu() {
bool hadButtons = buttonPressedAndNotUsed; bool hadButtons = buttonPressedAndNotUsed;
redraw |= updateMenuPage( *currentPage, timeNow ); redraw |= updateMenuPage( *currentPage, timeNow );
if (hadButtons) if (hadButtons)
checkForPatchView(); checkForPatchView(deumButtonState);
} }
} else if (state == ROTATOR_MENU) { // ROTATOR MENU HERE <<<<<<<<<<<<<<< } else if (state == ROTATOR_MENU) { // ROTATOR MENU HERE <<<<<<<<<<<<<<<
if (stateFirstRun) { if (stateFirstRun) {
@ -1605,7 +1605,7 @@ void menu() {
bool hadButtons = buttonPressedAndNotUsed; bool hadButtons = buttonPressedAndNotUsed;
redraw |= updateMenuPage( *currentPage, timeNow ); redraw |= updateMenuPage( *currentPage, timeNow );
if (hadButtons) if (hadButtons)
checkForPatchView(); checkForPatchView(deumButtonState);
} }
// end rotator menu // end rotator menu