From 0fd1657c606b10c865c00522b4a2a3908ca35c4b Mon Sep 17 00:00:00 2001 From: Jan-Henrik Bruhn Date: Sun, 23 Feb 2020 01:15:49 +0100 Subject: [PATCH] Remove unused visible parameter from menu items, select part 0 as default on boot --- midi2cv/menu/menu_items.h | 2 -- midi2cv/ui/main_menu.h | 2 +- midi2cv/ui/part_menu.cc | 3 ++- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/midi2cv/menu/menu_items.h b/midi2cv/menu/menu_items.h index fd315ca..0049bc5 100644 --- a/midi2cv/menu/menu_items.h +++ b/midi2cv/menu/menu_items.h @@ -16,7 +16,6 @@ template class MenuItem : public AbstractMenuItem { private: const char* label; - bool visible; T value; T step; char stringRepresentation[24]; @@ -24,7 +23,6 @@ class MenuItem : public AbstractMenuItem { protected: MenuItem(const char* _label, T _initialValue) : label(_label) - , visible(true) , value(_initialValue) {}; virtual void to_string(char* buf) = 0; diff --git a/midi2cv/ui/main_menu.h b/midi2cv/ui/main_menu.h index af89e9c..adc7c21 100644 --- a/midi2cv/ui/main_menu.h +++ b/midi2cv/ui/main_menu.h @@ -14,7 +14,7 @@ class MainMenu { void render(u8g2_t* u8g2, int x, int y, int width, int height); MainMenu() - : activePartMenu(-1) + : activePartMenu(0) , selectedPart(0) {}; private: diff --git a/midi2cv/ui/part_menu.cc b/midi2cv/ui/part_menu.cc index 7ca8bee..999ea80 100644 --- a/midi2cv/ui/part_menu.cc +++ b/midi2cv/ui/part_menu.cc @@ -6,7 +6,7 @@ PartMenu::PartMenu() : item_voice_count("voice count", 1, 1, 4, 1) , item_voice_detail("voice detail", 1, 1, 4, 1) - , item_midi_filter_enabled("MIDI filter", 0, "on", "off") + , item_midi_filter_enabled("MIDI filter", 1, "on", "off") , item_midi_channel("MIDI channel", 0, 0, 100, 1) , item_midi_lowest_note("MIDI lowest", 0) , item_midi_highest_note("MIDI highest", 127) @@ -39,6 +39,7 @@ bool PartMenu::back() bool PartMenu::enter() { menu.enter(); + return false; }