diff --git a/README.md b/README.md index b24a61b..592fed6 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ -# ESP32 Marauder v0.4.5 +# ESP32 Marauder v0.4.6

Marauder logo

A suite of WiFi/Bluetooth offensive and defensive tools for the ESP32 diff --git a/esp32_marauder/Display.h b/esp32_marauder/Display.h index 7b631d9..4a849b6 100644 --- a/esp32_marauder/Display.h +++ b/esp32_marauder/Display.h @@ -56,7 +56,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.4.6"; + String version_number = "v0.5.1"; bool printing = false; bool loading = false; diff --git a/esp32_marauder/SDInterface.cpp b/esp32_marauder/SDInterface.cpp index 00cf111..ca7a50d 100644 --- a/esp32_marauder/SDInterface.cpp +++ b/esp32_marauder/SDInterface.cpp @@ -1,6 +1,8 @@ #include "SDInterface.h" bool SDInterface::initSD() { + String display_string = ""; + if (!SD.begin(SD_CS)) { Serial.println("Failed to mount SD Card"); this->supported = false; @@ -27,6 +29,24 @@ bool SDInterface::initSD() { Serial.printf("SD Card Size: %lluKB\n", this->cardSizeKB); Serial.printf("SD Card Size: %lluMB\n", this->cardSizeMB); Serial.printf("SD Card Size: %lluGB\n", this->cardSizeGB); + + if (this->supported) { + //display_obj.tft.println((byte)(sd_obj.cardSizeMB % 10)); + const int NUM_DIGITS = log10(this->cardSizeMB) + 1; + + char sz[NUM_DIGITS + 1]; + + sz[NUM_DIGITS] = 0; + for ( size_t i = NUM_DIGITS; i--; this->cardSizeMB /= 10) + { + sz[i] = '0' + (this->cardSizeMB % 10); + display_string.concat((String)sz[i]); + } + + //this->card_sz = display_string; + this->card_sz = sz; + } + return true; } } diff --git a/esp32_marauder/SDInterface.h b/esp32_marauder/SDInterface.h index adffb26..68a8ef0 100644 --- a/esp32_marauder/SDInterface.h +++ b/esp32_marauder/SDInterface.h @@ -16,9 +16,10 @@ class SDInterface { uint64_t cardSizeMB; uint64_t cardSizeGB; bool supported = false; + + String card_sz; - bool initSD(); - + bool initSD(); }; #endif diff --git a/esp32_marauder/WiFiScan.cpp b/esp32_marauder/WiFiScan.cpp index 6b63588..d153712 100644 --- a/esp32_marauder/WiFiScan.cpp +++ b/esp32_marauder/WiFiScan.cpp @@ -248,20 +248,8 @@ void WiFiScan::RunInfo() if (sd_obj.supported) { display_obj.tft.println(" SD Card: Connected"); display_obj.tft.print("SD Card Size: "); - //display_obj.tft.println((byte)(sd_obj.cardSizeMB % 10)); - const int NUM_DIGITS = log10(sd_obj.cardSizeMB) + 1; - - char sz[NUM_DIGITS + 1]; - - sz[NUM_DIGITS] = 0; - for ( size_t i = NUM_DIGITS; i--; sd_obj.cardSizeMB /= 10) - { - sz[i] = '0' + (sd_obj.cardSizeMB % 10); - } - - display_obj.tft.print(sz); + display_obj.tft.print(sd_obj.card_sz); display_obj.tft.println("MB"); - } else { display_obj.tft.println(" SD Card: Not Connected");