From 5a1ed63623a8c84b007f25506697b4863dd29c45 Mon Sep 17 00:00:00 2001
From: iggy <iggy@yggi.de>
Date: Fri, 5 Aug 2011 00:49:00 +0200
Subject: [PATCH] bootscreen, bugfix

---
 firmware/applications/default.c | 10 ++++++++--
 firmware/applications/final.c   |  3 ++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/firmware/applications/default.c b/firmware/applications/default.c
index db93123..cbba99e 100644
--- a/firmware/applications/default.c
+++ b/firmware/applications/default.c
@@ -5,6 +5,7 @@
 #include "lcd/lcd.h"
 #include "lcd/fonts/smallfonts.h"
 #include "lcd/print.h"
+#include "lcd/image.h"
 #include "filesystem/ff.h"
 #include "usb/usbmsc.h"
 #include "basic/random.h"
@@ -14,8 +15,13 @@
 
 void main_default(void) {
     systickInit(SYSTICKSPEED);
-
-    switch(getInputRaw()){
+    
+	//show bootscreen
+	lcdClear();
+	lcdLoadImage("r0ket.lcd");
+	lcdRefresh();
+    
+	switch(getInputRaw()){
         case BTN_ENTER:
             ISPandReset();
             break;
diff --git a/firmware/applications/final.c b/firmware/applications/final.c
index b46a770..9ffd509 100644
--- a/firmware/applications/final.c
+++ b/firmware/applications/final.c
@@ -18,7 +18,8 @@ void init_nick();
 void fancyNickname();
 
 void main_final(void) {
-    if(GLOBAL(privacy)>2){ //firstboot
+    init_nick();
+	if(GLOBAL(privacy)>2){ //firstboot
         if(execute_file("1boot.int",0,0)){
             lcdPrintln("Badge SETUP");
             lcdPrintln("error.");