Merge branch 'master' of github.com:r0ket/r0ket

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;

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.");