diff --git a/avr/cores/megacommand/MCL/FXPage.cpp b/avr/cores/megacommand/MCL/FXPage.cpp index 45a963769..e6aecb603 100644 --- a/avr/cores/megacommand/MCL/FXPage.cpp +++ b/avr/cores/megacommand/MCL/FXPage.cpp @@ -164,15 +164,5 @@ bool FXPage::handleEvent(gui_event_t *event) { return true; } - if (EVENT_PRESSED(event, Buttons.BUTTON3)) { - } - - if (EVENT_PRESSED(event, Buttons.BUTTON4)) { - } - if (EVENT_PRESSED(event, Buttons.BUTTON2)) { - mcl.setPage(PAGE_SELECT_PAGE); - return true; - } - return false; } diff --git a/avr/cores/megacommand/MCL/GridPage.cpp b/avr/cores/megacommand/MCL/GridPage.cpp index 31fb6f90c..23f1d621a 100644 --- a/avr/cores/megacommand/MCL/GridPage.cpp +++ b/avr/cores/megacommand/MCL/GridPage.cpp @@ -1190,10 +1190,6 @@ bool GridPage::handleEvent(gui_event_t *event) { mcl.pushPage(SYSTEM_PAGE); return true; } - if (EVENT_PRESSED(event, Buttons.BUTTON2)) { - mcl.setPage(PAGE_SELECT_PAGE); - return true; - } return false; } diff --git a/avr/cores/megacommand/MCL/MCL.cpp b/avr/cores/megacommand/MCL/MCL.cpp index bd0ec5bc6..db54b5df4 100644 --- a/avr/cores/megacommand/MCL/MCL.cpp +++ b/avr/cores/megacommand/MCL/MCL.cpp @@ -435,6 +435,12 @@ bool mcl_handleEvent(gui_event_t *event) { } } } + + if (EVENT_PRESSED(event, Buttons.BUTTON2)) { + mcl.setPage(PAGE_SELECT_PAGE); + return true; + } + return false; } diff --git a/avr/cores/megacommand/MCL/MixerPage.cpp b/avr/cores/megacommand/MCL/MixerPage.cpp index f7277c7d7..f57f23714 100644 --- a/avr/cores/megacommand/MCL/MixerPage.cpp +++ b/avr/cores/megacommand/MCL/MixerPage.cpp @@ -824,12 +824,6 @@ bool MixerPage::handleEvent(gui_event_t *event) { return true; } - - if (EVENT_PRESSED(event, Buttons.BUTTON2)) { - mcl.setPage(PAGE_SELECT_PAGE); - return true; - } - if (preview_mute_set != 255 && (trig_interface.is_key_down(MDX_KEY_NO))) { if (event->source >= Buttons.ENCODER1 && event->source <= Buttons.ENCODER4) { diff --git a/avr/cores/megacommand/MCL/PerfPageParent.cpp b/avr/cores/megacommand/MCL/PerfPageParent.cpp index 0d291bbfd..0492bf95c 100644 --- a/avr/cores/megacommand/MCL/PerfPageParent.cpp +++ b/avr/cores/megacommand/MCL/PerfPageParent.cpp @@ -94,10 +94,5 @@ bool PerfPageParent::handleEvent(gui_event_t *event) { } } */ - if (EVENT_PRESSED(event, Buttons.BUTTON2)) { - mcl.setPage(PAGE_SELECT_PAGE); - return true; - } - return false; } diff --git a/avr/cores/megacommand/MCL/RAMPage.cpp b/avr/cores/megacommand/MCL/RAMPage.cpp index 5d358f4e5..9d7bccdd8 100644 --- a/avr/cores/megacommand/MCL/RAMPage.cpp +++ b/avr/cores/megacommand/MCL/RAMPage.cpp @@ -753,11 +753,6 @@ bool RAMPage::handleEvent(gui_event_t *event) { } } - if (EVENT_PRESSED(event, Buttons.BUTTON2)) { - mcl.setPage(PAGE_SELECT_PAGE); - return true; - } - return false; } diff --git a/avr/cores/megacommand/MCL/RoutePage.cpp b/avr/cores/megacommand/MCL/RoutePage.cpp index adc59edb5..e46eb79eb 100644 --- a/avr/cores/megacommand/MCL/RoutePage.cpp +++ b/avr/cores/megacommand/MCL/RoutePage.cpp @@ -163,10 +163,6 @@ bool RoutePage::handleEvent(gui_event_t *event) { // mcl.setPage(MIXER_PAGE); // return true; //} - if (EVENT_PRESSED(event, Buttons.BUTTON2)) { - mcl.setPage(PAGE_SELECT_PAGE); - return true; - } /* if (EVENT_PRESSED(event, Buttons.ENCODER1) || EVENT_PRESSED(event, Buttons.ENCODER2) || diff --git a/avr/cores/megacommand/MCL/SampleBrowserPage.cpp b/avr/cores/megacommand/MCL/SampleBrowserPage.cpp index 4921c36a7..da30b4dd8 100644 --- a/avr/cores/megacommand/MCL/SampleBrowserPage.cpp +++ b/avr/cores/megacommand/MCL/SampleBrowserPage.cpp @@ -267,11 +267,6 @@ bool SampleBrowserPage::handleEvent(gui_event_t *event) { return true; } - if (EVENT_PRESSED(event, Buttons.BUTTON1)) { - mcl.setPage(PAGE_SELECT_PAGE); - return true; - } - return FileBrowserPage::handleEvent(event); } diff --git a/avr/cores/megacommand/MCL/SeqPage.cpp b/avr/cores/megacommand/MCL/SeqPage.cpp index 9178870f0..6f593441f 100644 --- a/avr/cores/megacommand/MCL/SeqPage.cpp +++ b/avr/cores/megacommand/MCL/SeqPage.cpp @@ -356,10 +356,6 @@ bool SeqPage::handleEvent(gui_event_t *event) { return true; } - if (EVENT_PRESSED(event, Buttons.BUTTON2)) { - mcl.setPage(PAGE_SELECT_PAGE); - } - if (EVENT_PRESSED(event, Buttons.BUTTON3)) { // If MD trig is held and BUTTON3 is pressed, launch note menu if (!show_seq_menu) { diff --git a/avr/cores/megacommand/MCL/WavDesignerPage.cpp b/avr/cores/megacommand/MCL/WavDesignerPage.cpp index e7afc2a2e..73f653c44 100644 --- a/avr/cores/megacommand/MCL/WavDesignerPage.cpp +++ b/avr/cores/megacommand/MCL/WavDesignerPage.cpp @@ -96,10 +96,6 @@ bool WavDesignerPage::handleEvent(gui_event_t *event) { } return true; } - if (EVENT_PRESSED(event, Buttons.BUTTON2)) { - mcl.setPage(PAGE_SELECT_PAGE); - return true; - } return false; }