mclemens/ubitxv6
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add quicklist to main menu, but disable numpad temporarily for size reasons

Browse Source
This commit is contained in:
Reed Nightingale 2020-04-26 17:30:58 -07:00
parent fafc9acd0e
commit aa7e6825b4
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
menu_main_buttons.cpp
View File

@ -10,6 +10,7 @@
#include "color_theme.h" #include "color_theme.h"
#include "menu_main.h" #include "menu_main.h"
#include "menu_numpad.h" #include "menu_numpad.h"
#include "menu_quicklist.h"
#include "morse.h" #include "morse.h"
#include "nano_gui.h" #include "nano_gui.h"
#include "scratch_space.h" #include "scratch_space.h"
@ -285,6 +286,21 @@ constexpr Button b10 PROGMEM = {
'1' '1'
}; };
constexpr char txtQuickList [] PROGMEM = "\x83";//star icon
ButtonStatus_e bsIgnore();
void osQuickList();
constexpr Button bQuickList PROGMEM = {
LAYOUT_BUTTON_X + 2*LAYOUT_BUTTON_PITCH_X,
LAYOUT_BUTTON_Y + 2*LAYOUT_BUTTON_PITCH_Y,
LAYOUT_BUTTON_WIDTH,
LAYOUT_BUTTON_HEIGHT,
txtQuickList,
nullptr,
bsIgnore,
osQuickList,
'Q'
};
constexpr char txtMenu [] PROGMEM = "\x7F";//gear icon constexpr char txtMenu [] PROGMEM = "\x7F";//gear icon
ButtonStatus_e bsIgnore(); ButtonStatus_e bsIgnore();
void osMenu(); void osMenu();
@ -300,7 +316,7 @@ constexpr Button bMenu PROGMEM = {
'M' 'M'
}; };
constexpr char txtNumpad [] PROGMEM = "\x82"; constexpr char txtNumpad [] PROGMEM = "\x82";//numpad icon
ButtonStatus_e bsIgnore(); ButtonStatus_e bsIgnore();
void osNumpad(); void osNumpad();
constexpr Button bNumpad PROGMEM = { constexpr Button bNumpad PROGMEM = {
@ -316,11 +332,11 @@ constexpr Button bNumpad PROGMEM = {
}; };
const Button* const mainMenuButtons [] PROGMEM = { const Button* const mainMenuButtons [] PROGMEM = {
&bVfoA, &bVfoB, &bVfoA, &bVfoB,
&bRit, &bUsb, &bLsb, &bCw, &bSpl, &bRit, &bUsb, &bLsb, &bCw, &bSpl,
&b80, &b40, &b30, &b20, &b17, &b80, &b40, &b30, &b20, &b17,
&b15, &b10, &bMenu, &bNumpad &b15, &b10, &bQuickList, &bMenu, &bNumpad
}; };
const uint8_t MAIN_MENU_NUM_BUTTONS = sizeof(mainMenuButtons) / sizeof(mainMenuButtons[0]); const uint8_t MAIN_MENU_NUM_BUTTONS = sizeof(mainMenuButtons) / sizeof(mainMenuButtons[0]);
@ -622,10 +638,14 @@ ButtonStatus_e bsIgnore(){
return ButtonStatus_e::Stateless; return ButtonStatus_e::Stateless;
} }
void osQuickList(){
enterSubmenu(quickListMenu);
}
void osMenu(){ void osMenu(){
enterSubmenu(setupMenu); enterSubmenu(setupMenu);
} }
void osNumpad(){ void osNumpad(){
enterSubmenu(numpadMenu); //enterSubmenu(numpadMenu);
} }