diff --git a/README.md b/README.md index b656c4bf4..4d968c6d2 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ -# ESP32 Marauder v0.9.13 +# ESP32 Marauder v0.9.15

Marauder logo

A suite of WiFi/Bluetooth offensive and defensive tools for the ESP32 diff --git a/esp32_marauder/esp32_marauder_v0_9_13_20220806_flipper.bin b/esp32_marauder/PreviousVersions/esp32_marauder_v0_9_13_20220806_flipper.bin similarity index 100% rename from esp32_marauder/esp32_marauder_v0_9_13_20220806_flipper.bin rename to esp32_marauder/PreviousVersions/esp32_marauder_v0_9_13_20220806_flipper.bin diff --git a/esp32_marauder/esp32_marauder_v0_9_13_20220806_kit.bin b/esp32_marauder/PreviousVersions/esp32_marauder_v0_9_13_20220806_kit.bin similarity index 100% rename from esp32_marauder/esp32_marauder_v0_9_13_20220806_kit.bin rename to esp32_marauder/PreviousVersions/esp32_marauder_v0_9_13_20220806_kit.bin diff --git a/esp32_marauder/esp32_marauder_v0_9_13_20220806_mini.bin b/esp32_marauder/PreviousVersions/esp32_marauder_v0_9_13_20220806_mini.bin similarity index 100% rename from esp32_marauder/esp32_marauder_v0_9_13_20220806_mini.bin rename to esp32_marauder/PreviousVersions/esp32_marauder_v0_9_13_20220806_mini.bin diff --git a/esp32_marauder/esp32_marauder_v0_9_13_20220806_new_hardware.bin b/esp32_marauder/PreviousVersions/esp32_marauder_v0_9_13_20220806_new_hardware.bin similarity index 100% rename from esp32_marauder/esp32_marauder_v0_9_13_20220806_new_hardware.bin rename to esp32_marauder/PreviousVersions/esp32_marauder_v0_9_13_20220806_new_hardware.bin diff --git a/esp32_marauder/esp32_marauder_v0_9_13_20220806_old_hardware.bin b/esp32_marauder/PreviousVersions/esp32_marauder_v0_9_13_20220806_old_hardware.bin similarity index 100% rename from esp32_marauder/esp32_marauder_v0_9_13_20220806_old_hardware.bin rename to esp32_marauder/PreviousVersions/esp32_marauder_v0_9_13_20220806_old_hardware.bin diff --git a/esp32_marauder/SDInterface.cpp b/esp32_marauder/SDInterface.cpp index f2617919e..8edb47a00 100644 --- a/esp32_marauder/SDInterface.cpp +++ b/esp32_marauder/SDInterface.cpp @@ -15,6 +15,10 @@ bool SDInterface::initSD() { return false; } #endif + + pinMode(SD_CS, OUTPUT); + + delay(10); if (!SD.begin(SD_CS)) { Serial.println(F("Failed to mount SD Card")); diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index 438089009..1c6e47a20 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -11,7 +11,7 @@ //#define GENERIC_ESP32 #define MARAUDER_FLIPPER - #define MARAUDER_VERSION "v0.9.14" + #define MARAUDER_VERSION "v0.9.15" //// BUTTON DEFINITIONS #ifdef MARAUDER_MINI diff --git a/esp32_marauder/esp32_marauder.ino b/esp32_marauder/esp32_marauder.ino index 19a66b46a..f4edbd6d4 100644 --- a/esp32_marauder/esp32_marauder.ino +++ b/esp32_marauder/esp32_marauder.ino @@ -119,9 +119,15 @@ void setup() #ifdef HAS_SCREEN digitalWrite(TFT_CS, HIGH); #endif + + pinMode(SD_CS, OUTPUT); + + delay(10); digitalWrite(SD_CS, HIGH); + delay(10); + Serial.begin(115200); //Serial.begin(115200); diff --git a/esp32_marauder/esp32_marauder_v0_9_15_20220907_flipper.bin b/esp32_marauder/esp32_marauder_v0_9_15_20220907_flipper.bin new file mode 100644 index 000000000..6cf8fdb14 Binary files /dev/null and b/esp32_marauder/esp32_marauder_v0_9_15_20220907_flipper.bin differ diff --git a/esp32_marauder/esp32_marauder_v0_9_15_20220907_kit.bin b/esp32_marauder/esp32_marauder_v0_9_15_20220907_kit.bin new file mode 100644 index 000000000..e88997c89 Binary files /dev/null and b/esp32_marauder/esp32_marauder_v0_9_15_20220907_kit.bin differ diff --git a/esp32_marauder/esp32_marauder_v0_9_15_20220907_mini.bin b/esp32_marauder/esp32_marauder_v0_9_15_20220907_mini.bin new file mode 100644 index 000000000..caa217768 Binary files /dev/null and b/esp32_marauder/esp32_marauder_v0_9_15_20220907_mini.bin differ diff --git a/esp32_marauder/esp32_marauder_v0_9_15_20220907_new_hardware.bin b/esp32_marauder/esp32_marauder_v0_9_15_20220907_new_hardware.bin new file mode 100644 index 000000000..9ce16d322 Binary files /dev/null and b/esp32_marauder/esp32_marauder_v0_9_15_20220907_new_hardware.bin differ diff --git a/esp32_marauder/esp32_marauder_v0_9_15_20220907_old_hardware.bin b/esp32_marauder/esp32_marauder_v0_9_15_20220907_old_hardware.bin new file mode 100644 index 000000000..f9a668b25 Binary files /dev/null and b/esp32_marauder/esp32_marauder_v0_9_15_20220907_old_hardware.bin differ