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

firmware/applications/default.c

@@ -22,22 +22,6 @@ void main_default(void) {
 	lcdRefresh();
 	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();
 	if(getInputRaw()==BTN_RIGHT){
             GLOBAL(develmode)=1;

firmware/main.c

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