Fix station wardrive and sniff title

esp32_marauder/Display.cpp

@@ -505,21 +505,26 @@ void Display::displayBuffer(bool do_clear)
 {
   if (this->display_buffer->size() > 0)
   {
+
     int print_count = 10;
+
     while ((display_buffer->size() > 0) && (print_count > 0))
     {
+      // Freeze adding to display buffer
+      if (display_buffer->size() > DISPLAY_BUFFER_LIMIT)
+        this->printing = true;
 
       #ifndef SCREEN_BUFFER
         xPos = 0;
         if ((display_buffer->size() > 0) && (!loading))
         {
-          printing = true;
+          //printing = true;
           delay(print_delay_1);
           yDraw = scroll_line(TFT_RED);
           tft.setCursor(xPos, yDraw);
           tft.setTextColor(TFT_GREEN, TFT_BLACK);
           tft.print(display_buffer->shift());
-          printing = false;
+          //printing = false;
           delay(print_delay_2);
         }
         if (!tteBar)
@@ -545,6 +550,8 @@ void Display::displayBuffer(bool do_clear)
 
       print_count--;
     }
+
+    this->printing = false;
   }
 }
 

esp32_marauder/WiFiScan.cpp

@@ -493,11 +493,11 @@ extern "C" {
         
                 Serial.println();
         
-                while (display_obj.printing)
-                  delay(1);
-                display_obj.loading = true;
-                display_obj.display_buffer->add(display_string);
-                display_obj.loading = false;
+                if (!display_obj.printing) {
+                  display_obj.loading = true;
+                  display_obj.display_buffer->add(display_string);
+                  display_obj.loading = false;
+                }
               #endif
             }
           }
@@ -971,11 +971,11 @@ extern "C" {
                       {
                         display_string.concat(" ");
                       }
-                      while (display_obj.printing)
-                        delay(1);
-                      display_obj.loading = true;
-                      display_obj.display_buffer->add(display_string);
-                      display_obj.loading = false;
+                      if (!display_obj.printing) {
+                        display_obj.loading = true;
+                        display_obj.display_buffer->add(display_string);
+                        display_obj.loading = false;
+                      }
                     }
                   #endif
                 }
@@ -1194,11 +1194,11 @@ extern "C" {
         
                 Serial.println();
         
-                while (display_obj.printing)
-                  delay(1);
-                display_obj.loading = true;
-                display_obj.display_buffer->add(display_string);
-                display_obj.loading = false;
+                if (!display_obj.printing) {
+                  display_obj.loading = true;
+                  display_obj.display_buffer->add(display_string);
+                  display_obj.loading = false;
+                }
               #endif
             }
           }
@@ -1654,11 +1654,11 @@ extern "C" {
                       {
                         display_string.concat(" ");
                       }
-                      while (display_obj.printing)
-                        delay(1);
-                      display_obj.loading = true;
-                      display_obj.display_buffer->add(display_string);
-                      display_obj.loading = false;
+                      if (!display_obj.printing) {
+                        display_obj.loading = true;
+                        display_obj.display_buffer->add(display_string);
+                        display_obj.loading = false;
+                      }
                     }
                   #endif
                 }
@@ -1762,6 +1762,8 @@ void WiFiScan::RunSetup() {
     
     this->shutdownBLE();
 
+    Serial.println("Initializing WiFi...");
+
     esp_wifi_init(&cfg);
     #ifdef HAS_IDF_3
       esp_wifi_set_country(&country);
@@ -1773,7 +1775,9 @@ void WiFiScan::RunSetup() {
     esp_wifi_get_mac(WIFI_IF_STA, this->sta_mac);
     delay(10);
     esp_wifi_get_mac(WIFI_IF_AP, this->ap_mac);
+    Serial.println("Setting MAC...");
     this->setMac();
+    Serial.println("Shutting down WiFi...");
     this->shutdownWiFi();
   #endif
 
@@ -2360,6 +2364,10 @@ bool WiFiScan::shutdownBLE() {
       
       pBLEScan->clearResults();
 
+      delay(100);
+
+      Serial.println("Deinitializing NimBLE...");
+
       //#ifndef HAS_DUAL_BAND
         NimBLEDevice::deinit();
       //#endif
@@ -5030,7 +5038,7 @@ void WiFiScan::RunStationScan(uint8_t scan_mode, uint16_t color)
     display_obj.print_delay_2 = 10;
     display_obj.initScrollValues(true);
     display_obj.tft.setTextWrap(false);
-    display_obj.tft.setTextColor(TFT_WHITE, color);
+    display_obj.tft.setTextColor(TFT_BLACK, color);
     #ifdef HAS_FULL_SCREEN
       display_obj.tft.fillRect(0,16,TFT_WIDTH,16, color);
       display_obj.tft.drawCentreString(text_table1[59],TFT_WIDTH / 2,16,2);
@@ -5311,6 +5319,8 @@ void WiFiScan::RunProbeScan(uint8_t scan_mode, uint16_t color)
         display_obj.tft.drawCentreString(text_table4[40],TFT_WIDTH / 2,16,2);
       else if (scan_mode == WIFI_SCAN_DETECT_FOLLOW) 
         display_obj.tft.drawCentreString("MAC Monitor",TFT_WIDTH / 2,16,2);
+      else if (scan_mode == WIFI_SCAN_STATION_WAR_DRIVE)
+        display_obj.tft.drawCentreString("Station Wardrive",TFT_WIDTH / 2,16,2);
       else {
         Serial.println(F("Starting WiFi sniff for Flock..."));
         display_obj.tft.drawCentreString("Flock Sniff",TFT_WIDTH / 2,16,2);
@@ -7701,7 +7711,11 @@ void WiFiScan::beaconSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type
       
             Serial.print(F(" "));
       
-            display_obj.display_buffer->add(display_string);
+            if (!display_obj.printing) {
+              display_obj.loading = true;
+              display_obj.display_buffer->add(display_string);
+              display_obj.loading = false;
+            }
           #endif
 
           Serial.println();

esp32_marauder/configs.h

@@ -34,7 +34,7 @@
   //#define MARAUDER_V8
   //// END BOARD TARGETS
 
-  #define MARAUDER_VERSION "v1.10.0"
+  #define MARAUDER_VERSION "v1.10.2"
 
   #define GRAPH_REFRESH   100
 
@@ -42,6 +42,8 @@
 
   #define DUAL_BAND_CHANNELS 51
 
+  #define DISPLAY_BUFFER_LIMIT 20
+
   //// HARDWARE NAMES
   #ifdef MARAUDER_M5STICKC
     #define HARDWARE_NAME "M5Stick-C Plus"
@@ -163,6 +165,7 @@
     #define HAS_GPS
     #define HAS_NIMBLE_2
     #define HAS_IDF_3
+    #define HAS_C5_SD
   #endif
 
   #ifdef MARAUDER_V7_1
@@ -2599,6 +2602,12 @@
       #define SD_MOSI TFT_MOSI
       #define SD_SCK  TFT_SCLK
     #endif
+
+    #ifdef MARAUDER_V7
+      #define SD_MISO TFT_MISO
+      #define SD_MOSI TFT_MOSI
+      #define SD_SCK  TFT_SCLK
+    #endif
   #endif
   //// END STUPID CYD STUFF