Merge pull request #1089 from justcallmekoko/develop

justcallmekoko · web-flow · commit a7bc611eded0 · 2026-01-28T16:03:59.000-05:00
Add soft display buffer cap
diff --git a/esp32_marauder/Display.cpp b/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;
   }
 }
 
diff --git a/esp32_marauder/WiFiScan.cpp b/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
                 }
@@ -7701,7 +7701,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();
diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h
@@ -34,14 +34,16 @@
   //#define MARAUDER_V8
   //// END BOARD TARGETS
 
-  #define MARAUDER_VERSION "v1.10.1"
+  #define MARAUDER_VERSION "v1.10.2"
 
   #define GRAPH_REFRESH   100
 
   #define TRACK_EVICT_SEC 90 // Seconds before marking tracked MAC as tombstone
 
   #define DUAL_BAND_CHANNELS 51
 
+  #define DISPLAY_BUFFER_LIMIT 20
+
   //// HARDWARE NAMES
   #ifdef MARAUDER_M5STICKC
     #define HARDWARE_NAME "M5Stick-C Plus"

Original file line number	Diff line number	Diff line change
`@@ -505,21 +505,26 @@ void Display::displayBuffer(bool do_clear)`
`505`	`505`	`{`
`506`	`506`	`if (this->display_buffer->size() > 0)`
`507`	`507`	`{`
	`508`	`+`
`508`	`509`	`int print_count = 10;`
	`510`	`+`
`509`	`511`	`while ((display_buffer->size() > 0) && (print_count > 0))`
`510`	`512`	`{`
	`513`	`+ // Freeze adding to display buffer`
	`514`	`+ if (display_buffer->size() > DISPLAY_BUFFER_LIMIT)`
	`515`	`+ this->printing = true;`
`511`	`516`
`512`	`517`	`#ifndef SCREEN_BUFFER`
`513`	`518`	`xPos = 0;`
`514`	`519`	`if ((display_buffer->size() > 0) && (!loading))`
`515`	`520`	`{`
`516`		`- printing = true;`
	`521`	`+ //printing = true;`
`517`	`522`	`delay(print_delay_1);`
`518`	`523`	`yDraw = scroll_line(TFT_RED);`
`519`	`524`	`tft.setCursor(xPos, yDraw);`
`520`	`525`	`tft.setTextColor(TFT_GREEN, TFT_BLACK);`
`521`	`526`	`tft.print(display_buffer->shift());`
`522`		`- printing = false;`
	`527`	`+ //printing = false;`
`523`	`528`	`delay(print_delay_2);`
`524`	`529`	`}`
`525`	`530`	`if (!tteBar)`
`@@ -545,6 +550,8 @@ void Display::displayBuffer(bool do_clear)`
`545`	`550`
`546`	`551`	`print_count--;`
`547`	`552`	`}`
	`553`	`+`
	`554`	`+ this->printing = false;`
`548`	`555`	`}`
`549`	`556`	`}`
`550`	`557`