X-Git-Url: http://git.rohieb.name/hackover2013-badge-firmware.git/blobdiff_plain/f4ce05f33d3d5dcfbdd33a74a14c2ac23e379526..8722dc932b090044e3fe6a5835214321a14ae397:/badge/main.c

diff --git a/badge/main.c b/badge/main.c
index 87927b9..cb9a0c9 100644
--- 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,42 +187,40 @@ void rbInit() {
 
 #endif
 
-void usbmode(void) {
+static void usbmode(void) {
   badge_event_stop();
 
   badge_framebuffer fb = { { { 0 } } };
-
-  badge_framebuffer_render_text(&fb, 23, 30, "USB-Modus");
+  badge_framebuffer_render_text(&fb, 22, 20, "USB-Modus");
+//  badge_framebuffer_render_text(&fb, 10, 35, "Reset to exit");
+  badge_framebuffer_render_text(&fb, 16, 35, "Zurück mit");
+  badge_framebuffer_render_text(&fb, 32, 45, "Reset");
 /*
     badge_framebuffer_render_number(&fb, 23, 50, sizeof(jumpnrun_tile));
     badge_framebuffer_render_number(&fb, 33, 50, sizeof(jumpnrun_item));
     badge_framebuffer_render_number(&fb, 48, 50, sizeof(jumpnrun_enemy));
 */
   badge_framebuffer_flush(&fb);
+
   usbMSCInit();
-  for(;;);
-}
 
-void scrolltest(void) {
-  badge_browse_textfile("/fahrplan/test.txt");
+  for(;;) {
+    pmuSleep();
+  }
 }
 
 uint8_t main_menu_show(uint8_t selected) {
-  char const menu_buf[][15] = {
+  // first_visible = 0, weil das Menü so kurz ist. Sollte es
+  // größer werden: Parameter aus main_menu empfangen und merken.
+  uint8_t first_visible = 0;
+  char const *const menu[] = {
     "Vanity-Screen",
     "Super Hackio",
     "Fahrplan",
     "USB-Modus"
   };
 
-  char const *menu[ARRAY_SIZE(menu_buf)];
-  for(uint8_t i = 0; i < ARRAY_SIZE(menu_buf); ++i) {
-    menu[i] = menu_buf[i];
-  }
-
   f_chdir("/");
-  // first_visible = 0, weil Menü so kurz. Ggf. Parameter aus main_menu empfangen und merken.
-  size_t first_visible = 0;
   return (uint8_t) badge_menu(menu, ARRAY_SIZE(menu), &first_visible, selected);
 }
 
@@ -233,7 +232,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;
     }
   }
@@ -244,7 +243,7 @@ int main(void)
   cpuInit();
   systickInit(CFG_SYSTICK_DELAY_IN_MS);
 
-  // pmuInit();
+  pmuInit();
   // adcInit();
 #ifdef R0KET
   rbInit();
@@ -255,12 +254,16 @@ int main(void)
   FATFS fs;
   f_mount(0, &fs);
 
+#ifdef USBONLY
+  for(;;) usbmode();
+#else
   if(badge_input_raw() & BADGE_EVENT_KEY_DOWN) {
     usbmode();
   }
 
   badge_event_start();
   main_menu();
+#endif
 
   return 0;
 }