ctdo
/
crashtest-r0ket
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

modernize menu.c

This commit is contained in:
Stefan `Sec` Zehl 2011-08-01 05:10:37 +02:00
parent f41d900e0d
commit 34869e2973
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
firmware/basic/menu.c
View File

@ -2,7 +2,6 @@
#include "basic/basic.h" #include "basic/basic.h"
#include "lcd/fonts.h"
#include "lcd/render.h" #include "lcd/render.h"
#include "lcd/print.h" #include "lcd/print.h"
@ -21,27 +20,24 @@ void handleMenu(const struct MENU *the_menu) {
for (numentries = 0; the_menu->entries[numentries] != NULL; numentries++); for (numentries = 0; the_menu->entries[numentries] != NULL; numentries++);
visible_lines = (RESY/font->u8Height)-1; // subtract title line visible_lines = (RESY/getFontHeight())-1; // subtract title line
#ifdef SAFETY #ifdef SAFETY
if (visible_lines < 2) return; if (visible_lines < 2) return;
#endif #endif
while (!back) { while (!back) {
uint8_t line = 0;
// Display current menu page // Display current menu page
lcdFill(0); lcdClear();
DoString(0, line, the_menu->title); lcdPrintln(the_menu->title);
line += font->u8Height;
for (uint8_t i = current_offset; i < (visible_lines + current_offset) && i < numentries; i++) { for (uint8_t i = current_offset; i < (visible_lines + current_offset) && i < numentries; i++) {
DoString(14, line, the_menu->entries[i]->text);
if (i == menuselection) { if (i == menuselection) {
DoString(0, line, "* "); lcdPrint("*");
} }
line += font->u8Height; lcdSetCrsrX(14);
lcdPrintln(the_menu->entries[i]->text);
} }
lcdDisplay(); lcdRefresh();
switch (getInputWait()) { switch (getInputWait()) {
case BTN_UP: case BTN_UP: