Merge branch 'master' of gitlab:wintermute/hackover2013-badge-firmware

[hackover2013-badge-firmware.git] / badge / main.c

diff --git a/badge/main.c b/badge/main.c
index 87927b9..e7d30a3 100644 (file)
--- a/badge/main.c
+++ b/badge/main.c
@@ -53,6 +53,7 @@
   #include "core/cmd/cmd.h"
 #endif
 
+#include "fahrplan.h"
 #include "init.h"
 #include "ui/browser.h"
 #include "ui/display.h"
@@ -186,7 +187,7 @@ void rbInit() {
 
 #endif
 
-void usbmode(void) {
+static void usbmode(void) {
   badge_event_stop();
 
   badge_framebuffer fb = { { { 0 } } };
@@ -202,10 +203,6 @@ void usbmode(void) {
   for(;;);
 }
 
-void scrolltest(void) {
-  badge_browse_textfile("/fahrplan/test.txt");
-}
-
 uint8_t main_menu_show(uint8_t selected) {
   char const menu_buf[][15] = {
     "Vanity-Screen",
@@ -233,7 +230,7 @@ void main_menu(void) {
     switch(selected) {
     case 0: badge_vanity_show(); break;
     case 1: jumpnrun_play    (); break;
-    case 2: scrolltest       (); break;
+    case 2: badge_fahrplan   (); break;
     case 3: usbmode          (); break;
     }
   }