From 4836f5b8f5e2e799757be79b1f5188e84c965d1f Mon Sep 17 00:00:00 2001
From: Stefan `Sec` Zehl <sec@42.org>
Date: Fri, 5 Aug 2011 01:58:12 +0200
Subject: [PATCH] Devel-menu egg

---
 firmware/applications/default.c   |  1 +
 firmware/applications/final/exe.c |  6 ++++++
 firmware/basic/menu.c             | 12 ++++++++----
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/firmware/applications/default.c b/firmware/applications/default.c
index 0584753..0104352 100644
--- a/firmware/applications/default.c
+++ b/firmware/applications/default.c
@@ -30,6 +30,7 @@ void main_default(void) {
             break;
         case BTN_RIGHT: 
             GLOBAL(develmode)=1;
+            applyConfig();
             break;
         case BTN_DOWN:
             usbMSCInit();
diff --git a/firmware/applications/final/exe.c b/firmware/applications/final/exe.c
index bd7c7c1..d277caa 100644
--- a/firmware/applications/final/exe.c
+++ b/firmware/applications/final/exe.c
@@ -19,3 +19,9 @@ void execute_menu(void){
     lcdRefresh();
 };
 
+//# MENU |devel
+void execute_devel(void){
+    while(getInput()!=BTN_NONE);
+    executeSelect("INT");
+    lcdRefresh();
+};
diff --git a/firmware/basic/menu.c b/firmware/basic/menu.c
index fc1fe48..43a353f 100644
--- a/firmware/basic/menu.c
+++ b/firmware/basic/menu.c
@@ -1,6 +1,7 @@
 #include <sysinit.h>
 
 #include "basic/basic.h"
+#include "basic/config.h"
 
 #include "lcd/print.h"
 
@@ -11,7 +12,7 @@ uint8_t menuflags=0;
 void handleMenu(const struct MENU *the_menu) {
     uint8_t back = 0;
     int8_t menuselection = 0;
-    uint8_t numentries = 0;
+    uint8_t numentries;
     uint8_t visible_lines = 0;
     uint8_t current_offset = 0;
 
@@ -21,6 +22,9 @@ void handleMenu(const struct MENU *the_menu) {
 
     for (numentries = 0; the_menu->entries[numentries].text != NULL ; numentries++);
 
+    if(the_menu->entries[numentries-1].text[0]=='|' && !GLOBAL(develmode))
+        numentries--;
+
     visible_lines = lcdGetVisibleLines()-1; // subtract title line
 
     if(menuflags&MENU_BIG)
@@ -81,8 +85,8 @@ void handleMenu(const struct MENU *the_menu) {
                 break;
             case BTN_ENTER:
                 lcdClear();
-                lcdPrintln("Called...");
-                lcdRefresh();
+//                lcdPrintln("Called...");
+//                lcdRefresh();
                 getInputWaitRelease();
                 if (the_menu->entries[menuselection].callback!=NULL)
                     the_menu->entries[menuselection].callback();
@@ -91,7 +95,7 @@ void handleMenu(const struct MENU *the_menu) {
 				if (menuflags&MENU_JUSTONCE)
 					return;
 
-                getInputWait();
+//                getInputWait();
 
                 break;
             case BTN_NONE: /* timeout */