Cleanup SD stuff

justcallmekoko · Aug 26, 2020 · f86b5a4 · f86b5a4
1 parent c7cf1e0
commit f86b5a4
Show file tree

Hide file tree

Showing 6 changed files with 112 additions and 43 deletions.
diff --git a/esp32_marauder/Display.h b/esp32_marauder/Display.h
@@ -76,7 +76,7 @@ class Display
     TFT_eSPI tft = TFT_eSPI();
     TFT_eSprite img = TFT_eSprite(&tft);
     TFT_eSPI_Button key[BUTTON_ARRAY_LEN];
-    String version_number = "v0.7.0";
+    String version_number = "v0.7.1";
 
     bool printing = false;
     bool loading = false;

diff --git a/esp32_marauder/MenuFunctions.cpp b/esp32_marauder/MenuFunctions.cpp
@@ -638,7 +638,7 @@ void MenuFunctions::RunSetup()
     WiFi.softAPdisconnect(true);
     web_obj.shutdownServer();
   });
-  //addNodes(&updateMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this](){wifi_scan_obj.currentScanMode = WIFI_SCAN_OFF; changeMenu(updateMenu.parentMenu);});
+  addNodes(&updateMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this](){wifi_scan_obj.currentScanMode = WIFI_SCAN_OFF; changeMenu(updateMenu.parentMenu);});
 
   // Failed update menu
   failedUpdateMenu.parentMenu = &whichUpdateMenu;

diff --git a/esp32_marauder/SDInterface.cpp b/esp32_marauder/SDInterface.cpp
@@ -1,13 +1,41 @@
 #include "SDInterface.h"
 
+bool SDInterface::startSD() {
+  Serial.println("Starting SD card...");
+  if (SD.begin(SD_CS)) {
+    buffer_obj = Buffer();
+    this->sd_running = true;
+    return true;
+  }
+  else {
+    //delete &buffer_obj;
+    //buffer_obj = NULL;
+    this->sd_running = false;
+    return false;
+  }
+}
+
+bool SDInterface::stopSD() {
+  Serial.println("Stopping SD card");
+  //delete &buffer_obj;
+  //buffer_obj = NULL;
+  this->sd_running = false;
+  SD.end();
+}
+
 bool SDInterface::initSD() {
   String display_string = "";
 
-  if (!SD.begin(SD_CS)) {
+  if (!this->startSD()) {
     Serial.println("Failed to mount SD Card");
     this->supported = false;
+    this->stopSD();
     return false;
   }
+//  else {
+//    SD.end(); // Release memory used for SD
+//    return false;
+//  }
   else {
     this->supported = true;
     this->cardType = SD.cardType();
@@ -47,10 +75,13 @@ bool SDInterface::initSD() {
       this->card_sz = sz;
     }
 
-    buffer_obj = Buffer();
+    //buffer_obj = Buffer();
 
     //if (this->supported)
     //  buffer_obj.open(&SD);
+
+    // Clean up the SD
+    this->stopSD();
 
     return true;
   }
@@ -69,6 +100,7 @@ void SDInterface::openCapture(String file_name) {
 }
 
 void SDInterface::runUpdate() {
+  this->startSD();
   //display_obj.clearScreen();
   display_obj.tft.setTextWrap(false);
   display_obj.tft.setFreeFont(NULL);
@@ -104,6 +136,8 @@ void SDInterface::runUpdate() {
     }
 
     updateBin.close();
+
+    this->stopSD();
 
       // whe finished remove the binary from sd card to indicate end of the process
     display_obj.tft.println("rebooting...");
@@ -160,7 +194,7 @@ void SDInterface::performUpdate(Stream &updateSource, size_t updateSize) {
 }
 
 void SDInterface::main() {
-  if ((this->supported) && (this->do_save)) {
+  if ((this->supported) && (this->do_save) && (this->sd_running)) {
     //Serial.println("Saving packet...");
     buffer_obj.forceSave(&SD);
   }

diff --git a/esp32_marauder/SDInterface.h b/esp32_marauder/SDInterface.h
@@ -14,6 +14,7 @@ extern Display display_obj;
 class SDInterface {
 
   private:
+    bool sd_running = false;
 
   public:
     uint8_t cardType;
@@ -28,6 +29,8 @@ class SDInterface {
 
     bool initSD();
 
+    bool stopSD();
+    bool startSD();
     void addPacket(uint8_t* buf, uint32_t len);
     void openCapture(String file_name = "");
     void runUpdate();