gitea-mirror/ESP32Marauder
1
0
Fork 0
mirror of https://github.com/justcallmekoko/ESP32Marauder.git synced 2025-12-23 07:29:14 -08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Cleanup SD stuff"

Browse Source 
This reverts commit f86b5a4df0.
This commit is contained in:
Just Call Me Koko
2020-08-27 20:03:33 -04:00
parent d914ebd7c0
commit 2572b83701
6 changed files with 43 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
esp32_marauder/SDInterface.cpp
View File

@@ -1,41 +1,13 @@
#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 (!this->startSD()) {
if (!SD.begin(SD_CS)) {
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();
@@ -75,13 +47,10 @@ 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;
}
@@ -100,7 +69,6 @@ void SDInterface::openCapture(String file_name) {
}
void SDInterface::runUpdate() {
this->startSD();
//display_obj.clearScreen();
display_obj.tft.setTextWrap(false);
display_obj.tft.setFreeFont(NULL);
@@ -136,8 +104,6 @@ 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...");
@@ -194,7 +160,7 @@ void SDInterface::performUpdate(Stream &updateSource, size_t updateSize) {
}
void SDInterface::main() {
if ((this->supported) && (this->do_save) && (this->sd_running)) {
if ((this->supported) && (this->do_save)) {
//Serial.println("Saving packet...");
buffer_obj.forceSave(&SD);
}