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

Fixes #2335

Browse Source
This commit is contained in:
bsongis
2015-05-27 07:12:19 +02:00
parent f35148ed2d
commit 51ae30cc27
4 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/9X/popups.cpp
+1 -2
View File
@@ -149,8 +149,7 @@ const char * displayMenu(uint8_t event)
{
const char * result = NULL;
uint8_t display_count = min(s_menu_count, (uint16_t)MENU_MAX_LINES);
uint8_t display_count = min<uint8_t>(s_menu_count, MENU_MAX_LINES);
uint8_t y = (display_count >= 5 ? MENU_Y - FH - 1 : MENU_Y);
drawFilledRect(MENU_X, y, MENU_W, display_count * (FH+1) + 2, SOLID, ERASE);
lcd_rect(MENU_X, y, MENU_W, display_count * (FH+1) + 2);
radio/src/gui/Taranis/menus.h
+6 -1
View File
@@ -326,7 +326,7 @@ extern uint8_t s_warning_info_flags;
#define SET_WARNING_INFO(info, len, flags) (s_warning_info = info, s_warning_info_len = len, s_warning_info_flags = flags)
#define NAVIGATION_MENUS
#define MENU_ADD_ITEM(s) s_menu[s_menu_count++] = s
#define MENU_ADD_ITEM(s) do { s_menu_offset_type = MENU_OFFSET_INTERNAL; if (s_menu_count < MENU_MAX_LINES) s_menu[s_menu_count++] = s; } while (0)
#define MENU_MAX_LINES 12
#define MENU_MAX_DISPLAY_LINES 6
#define MENU_ADD_SD_ITEM(s) MENU_ADD_ITEM(s)
@@ -335,6 +335,11 @@ extern const char *s_menu[MENU_MAX_LINES];
extern uint16_t s_menu_count;
extern uint8_t s_menu_flags;
extern uint16_t s_menu_offset;
enum {
MENU_OFFSET_INTERNAL,
MENU_OFFSET_EXTERNAL
};
extern uint8_t s_menu_offset_type;
const char * displayMenu(uint8_t event);
extern void (*menuHandler)(const char *result);
radio/src/gui/Taranis/popups.cpp
+5 -4
View File
@@ -51,6 +51,7 @@ uint8_t s_menu_item = 0;
uint16_t s_menu_count = 0;
uint8_t s_menu_flags = 0;
uint16_t s_menu_offset = 0;
uint8_t s_menu_offset_type = MENU_OFFSET_INTERNAL;
void (*menuHandler)(const char *result);
void displayBox(const char *title)
@@ -127,13 +128,13 @@ const char * displayMenu(uint8_t event)
{
const char * result = NULL;
uint8_t display_count = min(s_menu_count, (uint16_t)MENU_MAX_DISPLAY_LINES);
uint8_t display_count = min<uint8_t>(s_menu_count, MENU_MAX_DISPLAY_LINES);
uint8_t y = (display_count >= 5 ? MENU_Y - FH - 1 : MENU_Y);
drawFilledRect(MENU_X, y, MENU_W, display_count * (FH+1) + 2, SOLID, ERASE);
lcd_rect(MENU_X, y, MENU_W, display_count * (FH+1) + 2);
for (uint8_t i=0; i<display_count; i++) {
lcd_putsAtt(MENU_X+6, i*(FH+1) + y + 2, s_menu[i+s_menu_offset], s_menu_flags);
lcd_putsAtt(MENU_X+6, i*(FH+1) + y + 2, s_menu[i+(s_menu_offset_type == MENU_OFFSET_INTERNAL ? s_menu_offset : 0)], s_menu_flags);
if (i == s_menu_item) drawFilledRect(MENU_X+1, i*(FH+1) + y + 1, MENU_W-2, 9);
}
@@ -152,7 +153,7 @@ const char * displayMenu(uint8_t event)
result = STR_UPDATE_LIST;
}
else {
s_menu_item = min(display_count, (uint8_t)MENU_MAX_DISPLAY_LINES)-1;
s_menu_item = min<uint8_t>(display_count, MENU_MAX_DISPLAY_LINES) - 1;
if (s_menu_count > MENU_MAX_DISPLAY_LINES) {
s_menu_offset = s_menu_count - MENU_MAX_DISPLAY_LINES;
result = STR_UPDATE_LIST;
@@ -179,7 +180,7 @@ const char * displayMenu(uint8_t event)
break;
CASE_EVT_ROTARY_BREAK
case EVT_KEY_BREAK(KEY_ENTER):
result = s_menu[s_menu_item+s_menu_offset];
result = s_menu[s_menu_item + (s_menu_offset_type == MENU_OFFSET_INTERNAL ? s_menu_offset : 0)];
// no break
case EVT_KEY_BREAK(KEY_EXIT):
s_menu_count = 0;
radio/src/sdcard.cpp
+3
View File
@@ -51,6 +51,9 @@ bool listSdFiles(const char *path, const char *extension, const uint8_t maxlen,
fno.lfsize = sizeof(lfn);
#endif
#if defined(PCBTARANIS)
s_menu_offset_type = MENU_OFFSET_EXTERNAL;
#endif
static uint16_t s_last_menu_offset = 0;
#if defined(CPUARM)