Merge pull request #1 from suchmememanyskill/Rewrite

Finish rewrite

README.md

@@ -10,12 +10,12 @@ Navigate around the menu's using the vol+, vol- and power buttons
 ## Functions
 - Navigate the SD card
 - Navigate the System partition of your sysnand
-- Deleting, copying or moving files
-- Launching payloads
+- Interact with files
+	- Deleting, copying or moving files
+	- Launching payloads files
+	- Viewing the hex data of a file
 - Dumping your current firmware to sd
-
-## Screenshot 
-![screenshot](example.png)
+- Formatting the sd card
 
 # Credits
 Based on [Lockpick_RCM](https://github.com/shchmue/Lockpick_RCM), and thus based on [Hekate](https://github.com/CTCaer/hekate)

source/tegraexplorer/te.c

@@ -54,6 +54,7 @@ void fillmainmenu(){
     for (i = 0; i < MAINMENU_AMOUNT; i++){
         switch (i + 1) {
             case 1:
+            case 5:
                 if (sd_mounted)
                     mainmenu[i].property = 1;
                 else
@@ -69,12 +70,6 @@ void fillmainmenu(){
                     strcpy(mainmenu[i].name, "\nMount SD");
                 }
                 break;
-            case 5:
-                if (sd_mounted)
-                    mainmenu[i].property = 1;
-                else
-                    mainmenu[i].property = -1;
-                break;
         }
     }
 }
@@ -134,16 +129,15 @@ void te_main(){
             case SD_FORMAT:
                 res = makemenu(formatmenu, 4);
 
-                switch(res){
-                    case FORMAT_ALL_FAT32:
-                        if (makewaitmenu("Are you sure you want to format your sd?\nThis action is irreversible!\n\nPress Vol+/- to cancel\n", "Press Power to continue", 10))
-                            format(1);
-                        break;
-                    case FORMAT_EMUMMC:
-                        if (makewaitmenu("Are you sure you want to format your sd?\nThis action is irreversible!\n\nPress Vol+/- to cancel\n", "Press Power to continue", 10))
-                            format(0);
-                        break;
+                if (res >= 0){
+                    if(makewaitmenu("Are you sure you want to format your sd?\nThis will delete everything on your SD card\nThis action is irreversible!\n\nPress Vol+/- to cancel\n", "Press Power to continue", 10)){
+                        if (format(res)){
+                            sd_unmount();
+                            sd_mounted = false;
+                        }
+                    }
                 }
+
                 break;
 
             case CREDITS:

source/tegraexplorer/te.h

@@ -37,8 +37,8 @@ enum toolsmenu_return {
 };
 
 enum formatmenu_return {
-    FORMAT_ALL_FAT32,
-    FORMAT_EMUMMC
+    FORMAT_EMUMMC = 0,
+    FORMAT_ALL_FAT32
 };
 
 //menu_item mainmenu[MAINMENU_AMOUNT];

source/tegraexplorer/tools.c

@@ -86,7 +86,7 @@ int dumpfirmware(){
     gfx_printf("PKG1 version: %d\n", pkg1ver);
 
     ret = f_mkdir("sd:/tegraexplorer");
-    gfx_printf("Creating making sd:/tegraexplorer %d\n", ret);
+    gfx_printf("Creating sd:/tegraexplorer %d\n", ret);
 
     ret = f_mkdir("sd:/tegraexplorer/Firmware");
     gfx_printf("Creating sd:/tegraexplorer/Firmware %d\n", ret);
@@ -124,7 +124,7 @@ int dumpfirmware(){
     return fail;
 }
 
-void format(int mode){
+int format(int mode){
     clearscreen();
     int res;
     bool fatalerror = false;
@@ -196,4 +196,5 @@ void format(int mode){
 
     gfx_printf("\nPress any button to return%k\nTotal time taken: %ds", COLOR_WHITE, (get_tmr_s() - timer));
     btn_wait();
+    return fatalerror;
 }

source/tegraexplorer/tools.h

@@ -2,5 +2,5 @@
 
 void displayinfo();
 void displaygpio();
-void format(int mode);
+int format(int mode);
 int dumpfirmware();