Bugfix: Kollisionsprüfung am oberen Bildschirmrand, bzw. allgemein Koordinaten-

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

diff --git a/badge/main.c b/badge/main.c
index 5f7fde3..be4ad7a 100644 (file)
--- a/badge/main.c
+++ b/badge/main.c
@@ -57,6 +57,7 @@
 #include "ui/display.h"
 #include "ui/sprite.h"
 #include "ui/event.h"
 #include "ui/display.h"
 #include "ui/sprite.h"
 #include "ui/event.h"

+#include "ui/font.h"

 #include "util/util.h"
 #include "jumpnrun/jumpnrun.h"
 
 #include "util/util.h"
 #include "jumpnrun/jumpnrun.h"
 


@@ -65,6 +66,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 +128,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);


@@ -203,10 +205,14 @@ int main(void)
   badge_init();
 #endif
 
   badge_init();
 #endif
 

+  /*
+  nrf_init();
+

   for(uint8_t i = 1; ; ++i) {
     badge_framebuffer fb = { { { 0 } } };
 
     fb.data[2][86] = 0xff;
   for(uint8_t i = 1; ; ++i) {
     badge_framebuffer fb = { { { 0 } } };
 
     fb.data[2][86] = 0xff;

+    fb.data[3][87] = nrf_read_reg(R_CONFIG);

     fb.data[4][86] = 0xff;
     for(uint8_t j = 0; j < i; j += 3) {
       fb.data[3][j / 3] = 0xff;
     fb.data[4][86] = 0xff;
     for(uint8_t j = 0; j < i; j += 3) {
       fb.data[3][j / 3] = 0xff;


@@ -216,26 +222,15 @@ int main(void)
     badge_framebuffer_flush(&fb);
     systickDelay(200);
   }
     badge_framebuffer_flush(&fb);
     systickDelay(200);
   }

+  */

 
 

-  {
-    //    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);
-    }
+  FATFS fs;
+  f_mount(0, &fs);

 
 

-    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)) {
-      }
+  {
+    badge_framebuffer fb = { { { 0 } } };

 
 

-      f_close(&fil);
-    }
+    fb.data[0][0] = badge_framebuffer_render_text(&fb, 2, 10, "foobar");

 
     badge_framebuffer_flush(&fb);
   }
 
     badge_framebuffer_flush(&fb);
   }