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

SD changes more

Browse Source
This commit is contained in:
Just Call Me Koko
2020-08-27 19:47:25 -04:00
parent f86b5a4df0
commit 7db2d0e05d
4 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
esp32_marauder/Buffer.h
View File

@@ -18,6 +18,9 @@ class Buffer {
void addPacket(uint8_t* buf, uint32_t len); void addPacket(uint8_t* buf, uint32_t len);
void save(fs::FS* fs); void save(fs::FS* fs);
void forceSave(fs::FS* fs); void forceSave(fs::FS* fs);
uint32_t bufSizeA = 0;
uint32_t bufSizeB = 0;
private: private:
void write(int32_t n); void write(int32_t n);
void write(uint32_t n); void write(uint32_t n);
@@ -27,9 +30,6 @@ class Buffer {
uint8_t* bufA; uint8_t* bufA;
uint8_t* bufB; uint8_t* bufB;
uint32_t bufSizeA = 0;
uint32_t bufSizeB = 0;
bool writing = false; // acceppting writes to buffer bool writing = false; // acceppting writes to buffer
bool useA = true; // writing to bufA or bufB bool useA = true; // writing to bufA or bufB
bool saving = false; // currently saving onto the SD card bool saving = false; // currently saving onto the SD card

2
esp32_marauder/MenuFunctions.cpp
View File

@@ -263,6 +263,7 @@ void MenuFunctions::battery2(bool initial)
void MenuFunctions::updateStatusBar() void MenuFunctions::updateStatusBar()
{ {
uint16_t the_color; uint16_t the_color;
display_obj.tft.setTextSize(1);
// Draw temp info // Draw temp info
if (temp_obj.current_temp < 70) if (temp_obj.current_temp < 70)
@@ -320,6 +321,7 @@ void MenuFunctions::updateStatusBar()
void MenuFunctions::drawStatusBar() void MenuFunctions::drawStatusBar()
{ {
display_obj.tft.setTextSize(1);
display_obj.tft.fillRect(0, 0, 240, STATUS_BAR_WIDTH, STATUSBAR_COLOR); display_obj.tft.fillRect(0, 0, 240, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
//display_obj.tft.fillRect(0, STATUS_BAR_WIDTH + 1, 240, 1, TFT_DARKGREY); //display_obj.tft.fillRect(0, STATUS_BAR_WIDTH + 1, 240, 1, TFT_DARKGREY);
display_obj.tft.setTextColor(TFT_WHITE, STATUSBAR_COLOR); display_obj.tft.setTextColor(TFT_WHITE, STATUSBAR_COLOR);

8
esp32_marauder/SDInterface.cpp
View File

@@ -19,8 +19,10 @@ bool SDInterface::stopSD() {
Serial.println("Stopping SD card"); Serial.println("Stopping SD card");
//delete &buffer_obj; //delete &buffer_obj;
//buffer_obj = NULL; //buffer_obj = NULL;
this->sd_running = false; //this->sd_running = false;
SD.end(); //sdcard_uninit();
//SD.end();
Serial.println(ESP.getFreeHeap());
} }
bool SDInterface::initSD() { bool SDInterface::initSD() {
@@ -75,7 +77,7 @@ bool SDInterface::initSD() {
this->card_sz = sz; this->card_sz = sz;
} }
//buffer_obj = Buffer(); buffer_obj = Buffer();
//if (this->supported) //if (this->supported)
// buffer_obj.open(&SD); // buffer_obj.open(&SD);

31
esp32_marauder/WiFiScan.cpp
View File

@@ -131,6 +131,9 @@ WiFiScan::WiFiScan()
// Function to prepare to run a specific scan // Function to prepare to run a specific scan
void WiFiScan::StartScan(uint8_t scan_mode, uint16_t color) void WiFiScan::StartScan(uint8_t scan_mode, uint16_t color)
{ {
Serial.println("bufSizeA: " + (String)buffer_obj.bufSizeA);
Serial.println("bufSizeB: " + (String)buffer_obj.bufSizeB);
//Serial.println("Starting Scan..."); //Serial.println("Starting Scan...");
if (scan_mode == WIFI_SCAN_OFF) if (scan_mode == WIFI_SCAN_OFF)
StopScan(scan_mode); StopScan(scan_mode);
@@ -165,13 +168,23 @@ void WiFiScan::StartScan(uint8_t scan_mode, uint16_t color)
void WiFiScan::shutdownWiFi() { void WiFiScan::shutdownWiFi() {
Serial.println("Ahhh yes...promiscuity will end"); Serial.println("Ahhh yes...promiscuity will end");
esp_wifi_set_promiscuous(false); esp_wifi_set_promiscuous(false);
WiFi.persistent(false); //Serial.println("WiFi.persistent(false)");
//WiFi.persistent(false); // I think this broke something when leaving packet monitor
Serial.println("WiFi.disconnect(true);");
WiFi.disconnect(true); WiFi.disconnect(true);
Serial.println("WIFI_OFF");
WiFi.mode(WIFI_OFF); WiFi.mode(WIFI_OFF);
Serial.println("esp_wifi_set_mode(WIFI_MODE_NULL);");
esp_wifi_set_mode(WIFI_MODE_NULL); esp_wifi_set_mode(WIFI_MODE_NULL);
Serial.println("esp_wifi_stop();");
esp_wifi_stop(); esp_wifi_stop();
Serial.println("esp_wifi_deinit();");
esp_wifi_deinit(); esp_wifi_deinit();
Serial.println("Finished stopping WiFi");
Serial.println("bufSizeA: " + (String)buffer_obj.bufSizeA);
Serial.println("bufSizeB: " + (String)buffer_obj.bufSizeB);
} }
// Function to stop all wifi scans // Function to stop all wifi scans
@@ -352,7 +365,7 @@ void WiFiScan::RunInfo()
} }
void WiFiScan::RunEspressifScan(uint8_t scan_mode, uint16_t color) { void WiFiScan::RunEspressifScan(uint8_t scan_mode, uint16_t color) {
sd_obj.startSD(); //sd_obj.startSD();
sd_obj.openCapture("espressif"); sd_obj.openCapture("espressif");
display_obj.TOP_FIXED_AREA_2 = 48; display_obj.TOP_FIXED_AREA_2 = 48;
@@ -385,7 +398,7 @@ void WiFiScan::RunPacketMonitor(uint8_t scan_mode, uint16_t color)
display_obj.tft.init(); display_obj.tft.init();
display_obj.tft.setRotation(1); display_obj.tft.setRotation(1);
display_obj.tft.fillScreen(TFT_BLACK); display_obj.tft.fillScreen(TFT_BLACK);
sd_obj.startSD(); //sd_obj.startSD();
sd_obj.openCapture("packet_monitor"); sd_obj.openCapture("packet_monitor");
#ifdef TFT_SHIELD #ifdef TFT_SHIELD
@@ -431,7 +444,7 @@ void WiFiScan::RunEapolScan(uint8_t scan_mode, uint16_t color)
display_obj.tft.init(); display_obj.tft.init();
display_obj.tft.setRotation(1); display_obj.tft.setRotation(1);
display_obj.tft.fillScreen(TFT_BLACK); display_obj.tft.fillScreen(TFT_BLACK);
sd_obj.startSD(); //sd_obj.startSD();
sd_obj.openCapture("eapol"); sd_obj.openCapture("eapol");
#ifdef TFT_SHIELD #ifdef TFT_SHIELD
@@ -459,7 +472,7 @@ void WiFiScan::RunEapolScan(uint8_t scan_mode, uint16_t color)
display_obj.tftDrawExitScaleButtons(); display_obj.tftDrawExitScaleButtons();
//wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT(); wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
esp_wifi_init(&cfg); esp_wifi_init(&cfg);
esp_wifi_set_storage(WIFI_STORAGE_RAM); esp_wifi_set_storage(WIFI_STORAGE_RAM);
esp_wifi_set_mode(WIFI_MODE_NULL); esp_wifi_set_mode(WIFI_MODE_NULL);
@@ -536,7 +549,7 @@ void WiFiScan::RunBeaconSpam(uint8_t scan_mode, uint16_t color)
void WiFiScan::RunPwnScan(uint8_t scan_mode, uint16_t color) void WiFiScan::RunPwnScan(uint8_t scan_mode, uint16_t color)
{ {
sd_obj.startSD(); //sd_obj.startSD();
sd_obj.openCapture("pwnagotchi"); sd_obj.openCapture("pwnagotchi");
display_obj.TOP_FIXED_AREA_2 = 48; display_obj.TOP_FIXED_AREA_2 = 48;
@@ -567,7 +580,7 @@ void WiFiScan::RunPwnScan(uint8_t scan_mode, uint16_t color)
// Function to start running a beacon scan // Function to start running a beacon scan
void WiFiScan::RunBeaconScan(uint8_t scan_mode, uint16_t color) void WiFiScan::RunBeaconScan(uint8_t scan_mode, uint16_t color)
{ {
sd_obj.startSD(); //sd_obj.startSD();
sd_obj.openCapture("beacon"); sd_obj.openCapture("beacon");
display_obj.TOP_FIXED_AREA_2 = 48; display_obj.TOP_FIXED_AREA_2 = 48;
@@ -597,7 +610,7 @@ void WiFiScan::RunBeaconScan(uint8_t scan_mode, uint16_t color)
void WiFiScan::RunDeauthScan(uint8_t scan_mode, uint16_t color) void WiFiScan::RunDeauthScan(uint8_t scan_mode, uint16_t color)
{ {
sd_obj.startSD(); //sd_obj.startSD();
sd_obj.openCapture("deauth"); sd_obj.openCapture("deauth");
display_obj.TOP_FIXED_AREA_2 = 48; display_obj.TOP_FIXED_AREA_2 = 48;
@@ -629,7 +642,7 @@ void WiFiScan::RunDeauthScan(uint8_t scan_mode, uint16_t color)
// Function for running probe request scan // Function for running probe request scan
void WiFiScan::RunProbeScan(uint8_t scan_mode, uint16_t color) void WiFiScan::RunProbeScan(uint8_t scan_mode, uint16_t color)
{ {
sd_obj.startSD(); //sd_obj.startSD();
sd_obj.openCapture("probe"); sd_obj.openCapture("probe");
display_obj.TOP_FIXED_AREA_2 = 48; display_obj.TOP_FIXED_AREA_2 = 48;