Jumpnrun lauffähig.

diff --git a/Makefile b/Makefile
index 474d2be..99cefca 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,9 +32,16 @@ OPTDEFINES = -D __NEWLIB__
 \r
 SRCS = \\r
   badge/main.c \\r
+  badge/jumpnrun/collision.c \\r
+  badge/jumpnrun/enemies.c \\r
+  badge/jumpnrun/items.c \\r
+  badge/jumpnrun/jumpnrun.c \\r
+  badge/jumpnrun/level_load.c \\r
+  badge/jumpnrun/tiles.c \\r
   badge/ui/display.c \\r
   badge/ui/event.c \\r
   badge/ui/sprite.c\r
+\r
 SRCS += \\r
   dataflash/at45db041d.c \\r
   dataflash/iobase.c \\r

diff --git a/badge/main.c b/badge/main.c
index ab3f7c3..6acbd0b 100644 (file)
--- a/badge/main.c
+++ b/badge/main.c
@@ -54,6 +54,7 @@
 #include "ui/display.h"
 #include "ui/sprite.h"
 #include "ui/event.h"
+#include "jumpnrun/jumpnrun.h"
 
 #include "r0ketports.h"
 #include "drivers/fatfs/ff.h"
@@ -175,6 +176,7 @@ int main(void)
 //  pmuInit();
 //  adcInit();
   rbInit();
+  usbMSCInit();
 
   badge_display_init();
 
@@ -212,6 +214,13 @@ int main(void)
 
   badge_event_start();
 
+  for(;;) {
+    if(JUMPNRUN_ERROR == jumpnrun_play("smb.lvl")) {
+      break;
+    }
+  }
+
+/*
   uint8_t buttons = 0;
 
   for(uint8_t i = 0; ; ++i) {
@@ -239,6 +248,7 @@ int main(void)
     }
     }
   }
+*/
 
   return 0;
 }

diff --git a/badge/ui/event.c b/badge/ui/event.c
index 5511bca..f5961bf 100644 (file)
--- a/badge/ui/event.c
+++ b/badge/ui/event.c
@@ -61,7 +61,7 @@ badge_event_t badge_event_wait(void) {
 }
 
 void badge_event_start(void) {
-  timer32Init(0, TIMER32_CCLK_10MS);
+  timer32Init(0, TIMER32_CCLK_10MS * 2);
   timer32SetIntHandler(badge_event_irq);
   timer32Enable(0);
 }