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

This commit is contained in:
roy rocket 2011-12-23 14:30:27 +01:00
commit de2e722661
2 changed files with 18 additions and 16 deletions

View File

@ -22,22 +22,6 @@ void main_default(void) {
lcdRefresh(); lcdRefresh();
lcdClear(); lcdClear();
switch(getInputRaw()){
case BTN_ENTER:
lcdPrint("ISP active");
lcdRefresh();
ReinvokeISP();
break;
case BTN_UP: // Reset config
saveConfig();
break;
case BTN_DOWN:
usbMSCInit();
while(1);
//delayms_power(100);
break;
};
readConfig(); readConfig();
if(getInputRaw()==BTN_RIGHT){ if(getInputRaw()==BTN_RIGHT){
GLOBAL(develmode)=1; GLOBAL(develmode)=1;

View File

@ -53,7 +53,25 @@ int main(void) {
lcdFill(0); lcdFill(0);
lcdDisplay(); lcdDisplay();
switch(getInputRaw()){
case BTN_ENTER:
lcdPrint("ISP active");
lcdRefresh();
ReinvokeISP();
break;
case BTN_DOWN:
lcdPrint("MSC active");
lcdRefresh();
usbMSCInit();
while(1);
break;
};
fsInit(); fsInit();
if( getInputRaw() == BTN_UP ){ // Reset config
saveConfig();
}
wrapper(); // see module/ subdirectory wrapper(); // see module/ subdirectory
} }