Schrift erweitert.

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

diff --git a/badge/main.c b/badge/main.c
index cb7966b..466ae3e 100644 (file)
--- a/badge/main.c
+++ b/badge/main.c
@@ -54,9 +54,13 @@
 #endif
 
 #include "init.h"
 #endif
 
 #include "init.h"

+#include "ui/browser.h"

 #include "ui/display.h"
 #include "ui/display.h"

-#include "ui/sprite.h"

 #include "ui/event.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"
 
 #include "util/util.h"
 #include "jumpnrun/jumpnrun.h"
 


@@ -65,6 +69,7 @@
 #include "drivers/fatfs/ff.h"
 
 #include "badge/pinconfig.h"
 #include "drivers/fatfs/ff.h"
 
 #include "badge/pinconfig.h"

+#include <funk/nrf24l01p.h>

 
 #ifdef R0KET
 
 
 #ifdef R0KET
 


@@ -126,7 +131,7 @@ void rbInit() {
     { RB_PWR_CHRG, &RB_PWR_CHRG_IO, gpioPullupMode_PullUp }
 #endif
   };
     { RB_PWR_CHRG, &RB_PWR_CHRG_IO, gpioPullupMode_PullUp }
 #endif
   };

-    
+

   for(int i = 0; i < ARRAY_SIZE(input_pins); ++i) {
     gpioSetDir(input_pins[i].port, input_pins[i].pin, gpioDirection_Input);
     gpioSetPullup(input_pins[i].reg, input_pins[i].mode);
   for(int i = 0; i < ARRAY_SIZE(input_pins); ++i) {
     gpioSetDir(input_pins[i].port, input_pins[i].pin, gpioDirection_Input);
     gpioSetPullup(input_pins[i].reg, input_pins[i].mode);


@@ -181,17 +186,62 @@ void rbInit() {
 
 #endif
 
 
 #endif
 

-/**************************************************************************/
-/*!
-    Main program entry point.  After reset, normal code execution will
-    begin here.
+static void usbmode(void) {
+  badge_event_stop();
+
+  badge_framebuffer fb = { { { 0 } } };
+
+  badge_framebuffer_render_text(&fb, 23, 30, "USB-Modus");
+/*
+    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(;;);
+}
+
+static void fahrplan(void) {
+  f_chdir("/fahrplan");
+  badge_browse_textfiles("fahrplan.lst");
+}
+
+uint8_t main_menu_show(uint8_t selected) {
+  char const menu_buf[][15] = {
+    "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);
+}
+
+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: fahrplan         (); break;
+    case 3: usbmode          (); break;
+    }
+  }
+}
+

 int main(void)
 {
 int main(void)
 {

-  // Configure cpu and mandatory peripherals
-  //systemInit();
-

   cpuInit();
   systickInit(CFG_SYSTICK_DELAY_IN_MS);
 
   cpuInit();
   systickInit(CFG_SYSTICK_DELAY_IN_MS);
 


@@ -203,75 +253,15 @@ int main(void)
   badge_init();
 #endif
 
   badge_init();
 #endif
 

-#ifdef HOB_REV2
-  gpioSetValue(HOB_PORT(HOB_LED_LEFT), HOB_PIN(HOB_LED_LEFT), 1);
-  systickDelay(1000);
-  gpioSetValue(HOB_PORT(HOB_LED_RIGHT), HOB_PIN(HOB_LED_RIGHT), 1);
-#endif
-
-  {
-    //    f_mkfs(0, 1, 0);
-    badge_framebuffer fb;
-    int res = 0;
-    FATFS fatvol;
-
-    while(FR_OK != f_mount(0, &fatvol)) {
-      f_mkfs(0, 1, 0);
-    }
-
-    FIL fil;
-    if(FR_OK == (res = f_open(&fil, "sshot.dat", FA_OPEN_EXISTING | FA_READ))) {
-      UINT readbytes;
-
-      if(FR_OK != f_read(&fil, &fb, sizeof(fb), &readbytes)) {
-      }
-
-      f_close(&fil);
-    }
-
-    badge_framebuffer_flush(&fb);
-  }
+  FATFS fs;
+  f_mount(0, &fs);

 
   if(badge_input_raw() & BADGE_EVENT_KEY_DOWN) {
 
   if(badge_input_raw() & BADGE_EVENT_KEY_DOWN) {

-    usbMSCInit();
-    for(;;);
+    usbmode();

   }
 
   badge_event_start();
   }
 
   badge_event_start();

-
-  for(;;) {
-    if(JUMPNRUN_ERROR == jumpnrun_play("smb.lvl")) {
-      break;
-    }
-  }
-
-  uint8_t buttons = 0;
-
-  for(uint8_t i = 0; ; ++i) {
-    badge_event_t event = badge_event_wait();
-
-    switch(badge_event_type(event)) {
-    case BADGE_EVENT_USER_INPUT: {
-      buttons = badge_event_current_input_state();
-      break;
-    }
-    case BADGE_EVENT_GAME_TICK: {
-      badge_sprite const sp = { 4, 4, (uint8_t const *) "\xff\xff" };
-      badge_framebuffer fb = { { { 0x80 } } };
-
-      if(buttons & BADGE_EVENT_KEY_UP)    { badge_framebuffer_blt(&fb, 30, 10, &sp, 0); }
-      if(buttons & BADGE_EVENT_KEY_DOWN)  { badge_framebuffer_blt(&fb, 30, 50, &sp, 0); }
-      if(buttons & BADGE_EVENT_KEY_LEFT)  { badge_framebuffer_blt(&fb, 10, 30, &sp, 0); }
-      if(buttons & BADGE_EVENT_KEY_RIGHT) { badge_framebuffer_blt(&fb, 50, 30, &sp, 0); }
-      if(buttons & BADGE_EVENT_KEY_CENTER){ badge_framebuffer_blt(&fb, 30, 30, &sp, 0); }
-      if(buttons & BADGE_EVENT_KEY_BTN_A) { badge_framebuffer_blt(&fb, 70, 10, &sp, 0); }
-      if(buttons & BADGE_EVENT_KEY_BTN_B) { badge_framebuffer_blt(&fb, 70, 50, &sp, 0); }
-
-      badge_framebuffer_flush(&fb);
-      break;
-    }
-    }
-  }
+  main_menu();

 
   return 0;
 }
 
   return 0;
 }