piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Re #2469: part1: Menu system renaming of variables and refactoring (ported #3087 from master commits 3186a5d99..94d8b8b0e8d)

Browse Source
This commit is contained in:
Damjan Adamic
2015-11-26 18:29:20 +01:00
parent ab99740e1b
commit 51b8f9b054
96 changed files with 2150 additions and 2167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/Taranis/menus.cpp
+18 -15
View File
@@ -36,44 +36,47 @@
#include "../../opentx.h"
MenuFuncP g_menuStack[5];
MenuHandlerFunc menuHandlers[5];
uint8_t menuEvent = 0;
uint8_t g_menuPos[4];
uint8_t g_menuStackPtr = 0;
uint8_t menuVerticalPositions[4];
uint8_t menuLevel = 0;
void popMenu()
{
assert(g_menuStackPtr>0);
g_menuStackPtr = g_menuStackPtr-1;
assert(menuLevel>0);
menuLevel = menuLevel-1;
menuEvent = EVT_ENTRY_UP;
TRACE("popMenu(%d)", menuLevel);
}
void chainMenu(MenuFuncP newMenu)
void chainMenu(MenuHandlerFunc newMenu)
{
g_menuStack[g_menuStackPtr] = newMenu;
menuHandlers[menuLevel] = newMenu;
menuEvent = EVT_ENTRY;
TRACE("chainMenu(%d, %p)", menuLevel, newMenu);
}
void pushMenu(MenuFuncP newMenu)
void pushMenu(MenuHandlerFunc newMenu)
{
killEvents(KEY_ENTER);
if (g_menuStackPtr == 0) {
if (menuLevel == 0) {
if (newMenu == menuGeneralSetup)
g_menuPos[0] = 1;
menuVerticalPositions[0] = 1;
if (newMenu == menuModelSelect)
g_menuPos[0] = 0;
menuVerticalPositions[0] = 0;
}
else {
g_menuPos[g_menuStackPtr] = m_posVert;
menuVerticalPositions[menuLevel] = menuVerticalPosition;
}
g_menuStackPtr++;
menuLevel++;
assert(g_menuStackPtr < DIM(g_menuStack));
assert(menuLevel < DIM(menuHandlers));
g_menuStack[g_menuStackPtr] = newMenu;
menuHandlers[menuLevel] = newMenu;
menuEvent = EVT_ENTRY;
TRACE("pushMenu(%d, %p)", menuLevel, newMenu);
}
void menuModelNotes(uint8_t event)