Just Call Me Koko 3 лет назад
Родитель
Сommit
cbcfa10330

+ 0 - 0
esp32_marauder/esp32_marauder_v0_9_9_20220628_flipper.bin → esp32_marauder/PreviousVersions/esp32_marauder_v0_9_9_20220628_flipper.bin


+ 0 - 0
esp32_marauder/esp32_marauder_v0_9_9_20220628_kit.bin → esp32_marauder/PreviousVersions/esp32_marauder_v0_9_9_20220628_kit.bin


+ 0 - 0
esp32_marauder/esp32_marauder_v0_9_9_20220628_mini.bin → esp32_marauder/PreviousVersions/esp32_marauder_v0_9_9_20220628_mini.bin


+ 0 - 0
esp32_marauder/esp32_marauder_v0_9_9_20220628_new_hardware.bin → esp32_marauder/PreviousVersions/esp32_marauder_v0_9_9_20220628_new_hardware.bin


+ 0 - 0
esp32_marauder/esp32_marauder_v0_9_9_20220628_old_hardware.bin → esp32_marauder/PreviousVersions/esp32_marauder_v0_9_9_20220628_old_hardware.bin


+ 9 - 8
esp32_marauder/WiFiScan.cpp

@@ -348,13 +348,14 @@ void WiFiScan::startWiFiAttacks(uint8_t scan_mode, uint16_t color, String title_
     display_obj.tft.setTextColor(TFT_GREEN, TFT_BLACK);
   #endif
   packets_sent = 0;
-  esp_wifi_init(&cfg);
-  esp_wifi_set_storage(WIFI_STORAGE_RAM);
-  esp_wifi_set_mode(WIFI_AP_STA);
-  esp_wifi_start();
-  esp_wifi_set_promiscuous_filter(NULL);
+  WiFi.mode(WIFI_AP_STA);
+  //esp_wifi_init(&cfg);
+  //esp_wifi_set_storage(WIFI_STORAGE_RAM);
+  //esp_wifi_set_mode(WIFI_AP_STA);
+  //esp_wifi_start();
+  //esp_wifi_set_promiscuous_filter(NULL);
   esp_wifi_set_promiscuous(true);
-  esp_wifi_set_max_tx_power(78);
+  esp_wifi_set_max_tx_power(82);
   this->wifi_initialized = true;
   initTime = millis();
 }
@@ -2055,8 +2056,8 @@ void WiFiScan::broadcastRandomSSID(uint32_t currentTime) {
     packet[38 + 6 + i] = postSSID[i];
 
   esp_wifi_80211_tx(WIFI_IF_AP, packet, sizeof(packet), false);
-  esp_wifi_80211_tx(WIFI_IF_AP, packet, sizeof(packet), false);
-  esp_wifi_80211_tx(WIFI_IF_AP, packet, sizeof(packet), false);
+  //ESP_ERROR_CHECK(esp_wifi_80211_tx(WIFI_IF_AP, packet, sizeof(packet), false));
+  //ESP_ERROR_CHECK(esp_wifi_80211_tx(WIFI_IF_AP, packet, sizeof(packet), false));
 
   packets_sent = packets_sent + 3;
 }

+ 3 - 3
esp32_marauder/configs.h

@@ -4,14 +4,14 @@
 
   #define POLISH_POTATO
   
-  //#define MARAUDER_MINI
+  #define MARAUDER_MINI
   //#define MARAUDER_V4
   //#define MARAUDER_V6
-  #define MARAUDER_KIT
+  //#define MARAUDER_KIT
   //#define GENERIC_ESP32
   //#define MARAUDER_FLIPPER
 
-  #define MARAUDER_VERSION "v0.9.9"
+  #define MARAUDER_VERSION "v0.9.10"
 
   //// BUTTON DEFINITIONS
   #ifdef MARAUDER_MINI

+ 5 - 1
esp32_marauder/esp32_marauder.ino

@@ -301,7 +301,11 @@ void loop()
     }
       if (wifi_scan_obj.currentScanMode == OTA_UPDATE)
         web_obj.main();
-    delay(1);
+    #ifdef HAS_SCREEN
+      delay(1);
+    #else
+      delay(50);
+    #endif
   }
   #ifdef HAS_SCREEN
     else if ((display_obj.draw_tft) &&

BIN
esp32_marauder/esp32_marauder_v0_9_10_20220718_flipper.bin


BIN
esp32_marauder/esp32_marauder_v0_9_10_20220718_kit.bin


BIN
esp32_marauder/esp32_marauder_v0_9_10_20220718_mini.bin


BIN
esp32_marauder/esp32_marauder_v0_9_10_20220718_new_hardware.bin


BIN
esp32_marauder/esp32_marauder_v0_9_10_20220718_old_hardware.bin