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

Add numpad functionality to main menu

Browse Source
This commit is contained in:
Reed Nightingale 2020-02-14 18:51:28 -08:00
parent d42571f7a5
commit 04560ef8b6
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
menu_main.cpp
View File

@ -29,8 +29,6 @@ Menu_t* const rootMenu = &mainMenu;
bool mainMenuSelecting = false;//Tracks if we're selecting buttons with knob, or adjusting frequency bool mainMenuSelecting = false;//Tracks if we're selecting buttons with knob, or adjusting frequency
int16_t mainMenuSelectedItemRaw = 0;//Allow negative only for easier checks on wrap around int16_t mainMenuSelectedItemRaw = 0;//Allow negative only for easier checks on wrap around
extern Button* const* buttons;
void drawMainMenu(void) void drawMainMenu(void)
{ {
displayClear(COLOR_BACKGROUND); displayClear(COLOR_BACKGROUND);

12
menu_main_buttons.cpp
View File

@ -7,6 +7,8 @@
#include "bands.h" #include "bands.h"
#include "button.h" #include "button.h"
#include "color_theme.h" #include "color_theme.h"
#include "menu_main.h"
#include "menu_numpad.h"
#include "morse.h" #include "morse.h"
#include "nano_gui.h" #include "nano_gui.h"
#include "settings.h" #include "settings.h"
@ -286,7 +288,7 @@ constexpr Button bNumpad PROGMEM = {
'F' 'F'
}; };
const Button* const buttons[] PROGMEM = { const Button* const mainMenuButtons [] PROGMEM = {
&bVfoA, &bVfoB, &bVfoA, &bVfoB,
&bRit, &bUsb, &bLsb, &bCw, &bSpl, &bRit, &bUsb, &bLsb, &bCw, &bSpl,
@ -294,8 +296,7 @@ const Button* const buttons[] PROGMEM = {
&b15, &b10, &bMenu, &bNumpad &b15, &b10, &bMenu, &bNumpad
}; };
const Button* const* mainMenuButtons = buttons; const uint8_t MAIN_MENU_NUM_BUTTONS = sizeof(mainMenuButtons) / sizeof(mainMenuButtons[0]);
const uint8_t MAIN_MENU_NUM_BUTTONS = sizeof(buttons) / sizeof(buttons[0]);
void updateBandButtons(const uint32_t old_freq) void updateBandButtons(const uint32_t old_freq)
{ {
@ -587,7 +588,6 @@ void osMenu(){
} }
void osNumpad(){ void osNumpad(){
//TODO numpadMenu->initMenu();
//numpadMenu->initMenu(); rootMenu->active_submenu = numpadMenu;
//mainMenu.active_submenu = numpadMenu;
} }

2
menu_main_buttons.h
View File

@ -4,7 +4,7 @@
#include "button.h" #include "button.h"
extern const Button* const* mainMenuButtons; extern const Button* const mainMenuButtons[];
extern const uint8_t MAIN_MENU_NUM_BUTTONS; extern const uint8_t MAIN_MENU_NUM_BUTTONS;
extern const Button bVfoA; extern const Button bVfoA;