odie/ubitxv6
1
0
Fork 0
mirror of https://codeberg.org/mclemens/ubitxv6.git synced 2024-06-03 02:50:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix types and expose some buttons

Browse Source
This commit is contained in:
Reed Nightingale 2020-02-11 21:44:40 -08:00
parent c727d876eb
commit 2ff1d0d7e8
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
menu_main_buttons.cpp
View File

@ -258,7 +258,7 @@ constexpr Button b10 PROGMEM = {
constexpr char txtMenu [] PROGMEM = "\x7F";//gear icon
ButtonStatus_e bsIgnore();
void osMenu();
constexpr Button bMenu = {
constexpr Button bMenu PROGMEM = {
LAYOUT_BUTTON_X + 3*LAYOUT_BUTTON_PITCH_X,
LAYOUT_BUTTON_Y + 2*LAYOUT_BUTTON_PITCH_Y,
LAYOUT_BUTTON_WIDTH,
@ -273,7 +273,7 @@ constexpr Button bMenu = {
constexpr char txtNumpad [] PROGMEM = "FRQ";
ButtonStatus_e bsIgnore();
void osNumpad();
constexpr Button bNumpad = {
constexpr Button bNumpad PROGMEM = {
LAYOUT_BUTTON_X + 4*LAYOUT_BUTTON_PITCH_X,
LAYOUT_BUTTON_Y + 2*LAYOUT_BUTTON_PITCH_Y,
LAYOUT_BUTTON_WIDTH,
@ -285,13 +285,12 @@ constexpr Button bNumpad = {
'F'
};
static constexpr const Button *const buttons[] PROGMEM = {
const Button* const buttons[] PROGMEM = {
&bVfoA, &bVfoB,
&bRit, &bUsb, &bLsb, &bCw, &bSpl,
&b80, &b40, &b30, &b20, &b17,
&b15, &b10, &bMenu, &bNumpad
};
const Button* const* mainMenuButtons = buttons;

3
menu_main_buttons.h
View File

@ -6,3 +6,6 @@
extern const Button* const* mainMenuButtons;
extern const uint8_t MAIN_MENU_NUM_BUTTONS;
extern const Button bVfoA;
extern const Button bVfoB;