From: Wintermate <wintermute@hannover.ccc.de>
Date: Tue, 22 Oct 2013 12:10:51 +0000 (+0200)
Subject: jumprun_tile als packed struct für mehr Speicher.
X-Git-Url: http://git.rohieb.name/hackover2013-badge-firmware.git/commitdiff_plain/a4e373da35b19a2726275f7068599830d8de5ca2

jumprun_tile als packed struct für mehr Speicher.
---

diff --git a/badge/jumpnrun/tiles.h b/badge/jumpnrun/tiles.h
index efc0161..8e47800 100644
--- a/badge/jumpnrun/tiles.h
+++ b/badge/jumpnrun/tiles.h
@@ -22,7 +22,7 @@ enum {
 typedef struct jumpnrun_tile_position {
   int16_t x;
   int8_t  y;
-} jumpnrun_tile_position;
+} __attribute__((packed)) jumpnrun_tile_position;
 
 typedef struct jumpnrun_tile_type {
   uint8_t      lethal_sides;
@@ -32,7 +32,7 @@ typedef struct jumpnrun_tile_type {
 typedef struct jumpnrun_tile {
   jumpnrun_tile_position pos;
   uint8_t                type;
-} jumpnrun_tile;
+} __attribute__((packed)) jumpnrun_tile;
 
 typedef struct jumpnrun_tile_range {
   uint16_t first;
diff --git a/badge/main.c b/badge/main.c
index a712686..265093b 100644
--- a/badge/main.c
+++ b/badge/main.c
@@ -183,6 +183,20 @@ void rbInit() {
 
 #endif
 
+void usbmode(void) {
+    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(;;);
+}
+
 /**************************************************************************/
 /*!
     Main program entry point.  After reset, normal code execution will
@@ -209,12 +223,7 @@ int main(void)
   f_mount(0, &fs);
 
   if(badge_input_raw() & BADGE_EVENT_KEY_DOWN) {
-    badge_framebuffer fb = { { { 0 } } };
-
-    fb.data[0][0] = badge_framebuffer_render_text(&fb, 23, 30, "USB-Modus");
-    badge_framebuffer_flush(&fb);
-    usbMSCInit();
-    for(;;);
+    usbmode();
   }
 
   badge_event_start();