From 34869e2973d130e734517a102721f0d2e9b0a3c0 Mon Sep 17 00:00:00 2001
From: Stefan `Sec` Zehl <sec@42.org>
Date: Mon, 1 Aug 2011 05:10:37 +0200
Subject: [PATCH] modernize menu.c

---
 firmware/basic/menu.c | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/firmware/basic/menu.c b/firmware/basic/menu.c
index 4758d65..811e356 100644
--- a/firmware/basic/menu.c
+++ b/firmware/basic/menu.c
@@ -2,7 +2,6 @@
 
 #include "basic/basic.h"
 
-#include "lcd/fonts.h"
 #include "lcd/render.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++);
 
-    visible_lines = (RESY/font->u8Height)-1; // subtract title line
+    visible_lines = (RESY/getFontHeight())-1; // subtract title line
 #ifdef SAFETY
     if (visible_lines < 2) return;
 #endif
 
     while (!back) {
-        uint8_t line = 0;
-
         // Display current menu page
-        lcdFill(0);
-        DoString(0, line, the_menu->title);
-        line += font->u8Height;
+        lcdClear();
+        lcdPrintln(the_menu->title);
 
         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) {
-                DoString(0, line, "* ");
+                lcdPrint("*");
             }
-            line += font->u8Height;
+            lcdSetCrsrX(14);
+            lcdPrintln(the_menu->entries[i]->text);
         }
-        lcdDisplay();
+        lcdRefresh();
 
         switch (getInputWait()) {
             case BTN_UP: