Option UNITS=IMPERIAL added
SD card archive function continued (doesn't delete the model until function finished) Alternate view for outputs in Main Views (Bars and Numbers) GPS speed was badly displayed (ap instead of bp)
This commit is contained in:
+10
-10
@@ -528,18 +528,20 @@ void displayConfirmation(uint8_t event)
|
||||
}
|
||||
|
||||
#if defined(SDCARD)
|
||||
const pm_char * s_menu[MENU_MAX_LINES] = { 0, 0, 0, 0 };
|
||||
const char *s_menu[MENU_MAX_LINES];
|
||||
char s_bss_menu[MENU_MAX_LINES*MENU_LINE_LENGTH];
|
||||
uint8_t s_menu_item = 0;
|
||||
uint8_t s_menu_count = 0;
|
||||
const pm_char * displayMenu(uint8_t event)
|
||||
uint8_t s_menu_flags;
|
||||
const char * displayMenu(uint8_t event)
|
||||
{
|
||||
const pm_char * result = NULL;
|
||||
const char * result = NULL;
|
||||
|
||||
lcd_filled_rect(10, 16, 108, s_menu_count * (FH+1) + 2, SOLID, WHITE);
|
||||
lcd_rect(10, 16, 108, s_menu_count * (FH+1) + 2);
|
||||
|
||||
for (uint8_t i=0; i<s_menu_count; i++) {
|
||||
lcd_puts(16, i*(FH+1) + 2*FH + 2, s_menu[i]);
|
||||
lcd_putsAtt(16, i*(FH+1) + 2*FH + 2, s_menu[i], s_menu_flags);
|
||||
if (i == s_menu_item) lcd_filled_rect(11, i*(FH+1) + 2*FH + 1, 106, 9);
|
||||
}
|
||||
|
||||
@@ -550,16 +552,14 @@ const pm_char * displayMenu(uint8_t event)
|
||||
case EVT_KEY_FIRST(KEY_DOWN):
|
||||
if (s_menu_item < s_menu_count - 1) s_menu_item++;
|
||||
break;
|
||||
case EVT_KEY_FIRST(KEY_MENU):
|
||||
result = s_menu[s_menu_item];
|
||||
// no break
|
||||
case EVT_KEY_FIRST(KEY_EXIT):
|
||||
killEvents(event);
|
||||
s_menu_item = 0;
|
||||
s_menu_count = 0;
|
||||
break;
|
||||
case EVT_KEY_FIRST(KEY_MENU):
|
||||
killEvents(event);
|
||||
result = s_menu[s_menu_item];
|
||||
s_menu_count = 0;
|
||||
s_menu_item = 0;
|
||||
s_menu_flags = 0;
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user