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

diff --git a/badge/main.c b/badge/main.c
index c225b4e..cb9a0c9 100644
--- a/badge/main.c
+++ b/badge/main.c
@@ -53,12 +53,15 @@
   #include "core/cmd/cmd.h"
 #endif
 
+#include "fahrplan.h"
 #include "init.h"
+#include "ui/browser.h"
 #include "ui/display.h"
 #include "ui/event.h"
 #include "ui/font.h"
 #include "ui/menu.h"
 #include "ui/sprite.h"
+#include "ui/vanity.h"
 #include "util/util.h"
 #include "jumpnrun/jumpnrun.h"
 
@@ -184,60 +187,55 @@ void rbInit() {
 
 #endif
 
-void usbmode(void) {
-    badge_framebuffer fb = { { { 0 } } };
+static void usbmode(void) {
+  badge_event_stop();
 
-    badge_framebuffer_render_text(&fb, 23, 30, "USB-Modus");
+  badge_framebuffer fb = { { { 0 } } };
+  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(;;);
+  badge_framebuffer_flush(&fb);
+
+  usbMSCInit();
+
+  for(;;) {
+    pmuSleep();
+  }
 }
 
-void scrolltest(void) {
-  char menu_buf[][15] = {
-    "foo",
-    "bar",
-    "baz",
-    "qux",
-    "foo",
-    "bar",
-    "baz",
-    "qux",
-    "foo",
-    "bar",
-    "baz",
-    "qux",
-    "foo",
-    "bar",
-    "baz",
-    "qux",
+uint8_t main_menu_show(uint8_t selected) {
+  // 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_index[] = {
-    menu_buf[0],
-    menu_buf[1],
-    menu_buf[2],
-    menu_buf[3],
-    menu_buf[4],
-    menu_buf[5],
-    menu_buf[6],
-    menu_buf[7],
-    menu_buf[8],
-    menu_buf[9],
-    menu_buf[10],
-    menu_buf[11],
-    menu_buf[12],
-    menu_buf[13],
-    menu_buf[14],
-    menu_buf[15]
-  };
+  f_chdir("/");
+  return (uint8_t) badge_menu(menu, ARRAY_SIZE(menu), &first_visible, selected);
+}
 
-  badge_scroll_text(menu_index, 16);
+void main_menu(void) {
+  uint8_t selected = 0;
+
+  for(;;) {
+    selected = main_menu_show(selected);
+    switch(selected) {
+    case 0: badge_vanity_show(); break;
+    case 1: jumpnrun_play    (); break;
+    case 2: badge_fahrplan   (); break;
+    case 3: usbmode          (); break;
+    }
+  }
 }
 
 int main(void)
@@ -245,7 +243,7 @@ int main(void)
   cpuInit();
   systickInit(CFG_SYSTICK_DELAY_IN_MS);
 
-  // pmuInit();
+  pmuInit();
   // adcInit();
 #ifdef R0KET
   rbInit();
@@ -256,18 +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();
-
-  if(badge_input_raw() & BADGE_EVENT_KEY_UP) {
-    scrolltest();
-  }
-
-  jumpnrun_play();
-  usbmode();
+  main_menu();
+#endif
 
   return 0;
 }