power up/down working for broadcast
This commit is contained in:
@@ -259,9 +259,12 @@ static void handleMenuKeys(uint32_t pressed, Menu_t *menu)
|
||||
|
||||
if (pressed == KEY_ENTER)
|
||||
{
|
||||
if (menu->items[menu->selected].handler != NULL)
|
||||
if (menu->items != NULL)
|
||||
{
|
||||
menu->items[menu->selected].handler(NULL);
|
||||
if (menu->items[menu->selected].handler != NULL)
|
||||
{
|
||||
menu->items[menu->selected].handler(NULL);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -585,75 +588,6 @@ static void DrawMenuScrollBar(uint32_t displayIndex, uint32_t numItems)
|
||||
* Public Functions
|
||||
******************************************************************************/
|
||||
|
||||
void MENU_Init(void)
|
||||
{
|
||||
//Init testMenu
|
||||
TM_Init();
|
||||
|
||||
//Clear menu items
|
||||
ClearMenuItems(mainMenu, MAIN_MENU_NUM_TX10);
|
||||
ClearMenuItems(langMenu, LANG_MENU_NUM);
|
||||
|
||||
_menuItemsIndex = 0;
|
||||
|
||||
for (int i=0; i < MENU_STACK_SIZE; ++i)
|
||||
{
|
||||
_menuData.menuStack[i].selected = 0;
|
||||
_menuData.menuStack[i].handler = NULL;
|
||||
}
|
||||
|
||||
//main menu
|
||||
uint32_t i = 0;
|
||||
mainMenu[i].pMonoIcon = 0;
|
||||
strcpy(mainMenu[i++].text, "System Information"); //System info screen
|
||||
|
||||
mainMenu[i].pMonoIcon = 0;
|
||||
strcpy(mainMenu[i++].text, "Frequencies"); //Frequency Selection Menu
|
||||
|
||||
mainMenu[i].pMonoIcon = 0;
|
||||
strcpy(mainMenu[i++].text, "Auto Shutdown"); //Auto Shutdown selection
|
||||
|
||||
mainMenu[i].pMonoIcon = 0;
|
||||
strcpy(mainMenu[i++].text, "Language"); //Language Selection Menu
|
||||
#if 0
|
||||
mainMenu[i].pMonoIcon = 0;
|
||||
strcpy(mainMenu[i++].text, "Link Radio"); //Link Radio Menu
|
||||
|
||||
//no regulatory info on the Tx10
|
||||
mainMenu[i].pMonoIcon = 0;
|
||||
strcpy(mainMenu[i++].text, "Regulatory Info"); //Reset - Needs a new name
|
||||
#endif
|
||||
|
||||
//check for array over run
|
||||
if(i > MAIN_MENU_NUM_TX10)
|
||||
{
|
||||
while(1);
|
||||
}
|
||||
|
||||
//language menu
|
||||
i = 0;
|
||||
langMenu[i].pMonoIcon = 0;
|
||||
strcpy(langMenu[i].text, languageNames[i++]);
|
||||
|
||||
langMenu[i].pMonoIcon = 0;
|
||||
strcpy(langMenu[i].text, languageNames[i++]);
|
||||
|
||||
langMenu[i].pMonoIcon = 0;
|
||||
strcpy(langMenu[i].text, languageNames[i++]);
|
||||
|
||||
langMenu[i].pMonoIcon = 0;
|
||||
strcpy(langMenu[i].text, languageNames[i++]);
|
||||
|
||||
//check for array over run
|
||||
if(i > LANG_MENU_NUM)
|
||||
{
|
||||
while(1);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
void Menu_init(void)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user