ctdo
/
crashtest-r0ket
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Stefan `Sec` Zehl 2011-08-05 01:18:40 +02:00
parent 9a1ff11842 24965deaed
commit 608885ea06
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/applications/default.c
View File

@ -5,6 +5,7 @@
#include "lcd/lcd.h" #include "lcd/lcd.h"
#include "lcd/fonts/smallfonts.h" #include "lcd/fonts/smallfonts.h"
#include "lcd/print.h" #include "lcd/print.h"
#include "lcd/image.h"
#include "filesystem/ff.h" #include "filesystem/ff.h"
#include "usb/usbmsc.h" #include "usb/usbmsc.h"
#include "basic/random.h" #include "basic/random.h"
@ -15,7 +16,12 @@
void main_default(void) { void main_default(void) {
systickInit(SYSTICKSPEED); systickInit(SYSTICKSPEED);
switch(getInputRaw()){ //show bootscreen
lcdClear();
lcdLoadImage("r0ket.lcd");
lcdRefresh();
switch(getInputRaw()){
case BTN_ENTER: case BTN_ENTER:
ISPandReset(); ISPandReset();
break; break;

3
firmware/applications/final.c
View File

@ -18,7 +18,8 @@ void init_nick();
void fancyNickname(); void fancyNickname();
void main_final(void) { void main_final(void) {
if(GLOBAL(privacy)>2){ //firstboot init_nick();
if(GLOBAL(privacy)>2){ //firstboot
if(execute_file("1boot.int",0,0)){ if(execute_file("1boot.int",0,0)){
lcdPrintln("Badge SETUP"); lcdPrintln("Badge SETUP");
lcdPrintln("error."); lcdPrintln("error.");