v1.3.1 and many other fixes

Author: Fr4nkFletcher

README.md

@@ -6,10 +6,11 @@
 
 <p align="center">
   <img src="https://github.com/Fr4nkFletcher/Adafruit_WebSerial_ESPTool/actions/workflows/pages.yml/badge.svg" alt="GitHub Actions Badge" />
-  <img src="https://img.shields.io/badge/version-1.2.1-blue" alt="GitHub Release Version Badge" />
-  <img src="https://komarev.com/ghpvc/?username=Fr4nkFletcher&label=Views&color=0e75b6&style=flat" alt="Profile Views" />
+  <img src="https://img.shields.io/badge/version-1.2.1-000000?style=flat" alt="GitHub Release Version Badge" />
+  <img src="https://img.shields.io/github/issues/Fr4nkFletcher/ESP32-Marauder-Cheap-Yellow-Display?style=flat&color=2EA44F" alt="GitHub Issues" />
+  <br>
   <img src="https://img.shields.io/github/commits-since/Fr4nkFletcher/ESP32-Marauder-Cheap-Yellow-Display/latest?style=flat&color=1F285E" />
-  <img src="https://img.shields.io/github/issues/Fr4nkFletcher/ESP32-Marauder-Cheap-Yellow-Display?style=flat-square" alt="GitHub Issues" />
+  <img src="https://komarev.com/ghpvc/?username=Fr4nkFletcher&label=Views&color=333333&style=flat" alt="Profile Views" />
   <a href="https://twitter.com/Fr4nkFletcher">
     <img src="https://img.shields.io/badge/Follow-%231DA1F2.svg?style=flat&logo=x&logoColor=white&color=1F285E" alt="Follow me on X">
   </a>
@@ -19,8 +20,12 @@ The aim of this project is to port the ESP32-Marauder firmware to the Cheap Yell
 
 ---
 
-## 🏴‍☠️ Latest Update Highlights — added support for 2.4", 3.2" and 3.5" Capacitive Touch (03/20/25) 🏴‍☠️
- 
+## 🏴‍☠️ Latest Update Highlights — v1.3.1 with other significant improvements (03/29/25) 🏴‍☠️
+
+- Fixed sniffer output overlapping 
+- Reduced memory usage
+- Add index number to AP scan display
+- Add BLE analyzer 
 - Add support for ESP32-2432S024C 2.4" ILI9341/CST820 Capacitive Touch
 - Add support for ESP32-3248S035C 3.5" ST7796/GT911 Capacitive Touch
 - Add support for ESP32-2432S032C 3.2" ST7789/GT911 Capacitive Touch

esp32_marauder.7z

@@ -7,9 +7,10 @@
 #include "FS.h"
 #include "settings.h"
 #include "esp_wifi_types.h"
+#include "configs.h"
 
-#define BUF_SIZE 3 * 1024 // Had to reduce buffer size to save RAM. GG @spacehuhn
-#define SNAP_LEN 2324 // max len of each recieved packet
+//#define BUF_SIZE 3 * 1024 // Had to reduce buffer size to save RAM. GG @spacehuhn
+//#define SNAP_LEN 2324 // max len of each recieved packet
 
 //extern bool useSD;
 

esp32_marauder/Buffer.h

@@ -38,7 +38,7 @@ void Display::RunSetup()
       uint16_t calData[5] = { 350, 3465, 188, 3431, 2 };
     #elif defined(CYD_24)
       uint16_t calData[5] = { 481, 3053, 433, 3296, 3 };
-    #elif defined(CYD_24CAP)
+    #elif defined(CYD_24CAP) || defined(CYD_22CAP)
       uint16_t calData[5] = { 405, 3209, 297, 3314, 2 };
     #elif defined(CYD_24G)
       uint16_t calData[5] = { 405, 3209, 297, 3314, 2 };
@@ -122,6 +122,7 @@ void Display::tftDrawColorKey()
 
 void Display::tftDrawXScaleButtons(byte x_scale)
 {
+  tft.drawFastVLine(234, 0, 20, TFT_WHITE);
   tft.setCursor(208, 21); tft.setTextColor(TFT_WHITE); tft.setTextSize(1); tft.print("X Scale:"); tft.print(x_scale);
   key[0].initButton(&tft, 220, 10, 20, 20, TFT_BLACK, TFT_CYAN, TFT_BLACK, "-", 2);
   key[1].initButton(&tft, 249, 10, 20, 20, TFT_BLACK, TFT_CYAN, TFT_BLACK, "+", 2);
@@ -133,6 +134,7 @@ void Display::tftDrawXScaleButtons(byte x_scale)
 
 void Display::tftDrawYScaleButtons(byte y_scale)
 {
+  tft.drawFastVLine(290, 0, 20, TFT_WHITE);
   tft.setCursor(265, 21); tft.setTextColor(TFT_WHITE); tft.setTextSize(1); tft.print("Y Scale:"); tft.print(y_scale);
   key[2].initButton(&tft, 276, 10, 20, 20, TFT_BLACK, TFT_MAGENTA, TFT_BLACK, "-", 2);
   key[3].initButton(&tft, 305, 10, 20, 20, TFT_BLACK, TFT_MAGENTA, TFT_BLACK, "+", 2);
@@ -144,6 +146,7 @@ void Display::tftDrawYScaleButtons(byte y_scale)
 
 void Display::tftDrawChannelScaleButtons(int set_channel)
 {
+  tft.drawFastVLine(178, 0, 20, TFT_WHITE);
   tft.setCursor(145, 21); tft.setTextColor(TFT_WHITE); tft.setTextSize(1); tft.print(text10); tft.print(set_channel);
   key[4].initButton(&tft, 164, 10, 20, 20, TFT_BLACK, TFT_BLUE, TFT_BLACK, "-", 2);
   key[5].initButton(&tft, 193, 10, 20, 20, TFT_BLACK, TFT_BLUE, TFT_BLACK, "+", 2);

esp32_marauder/Display.cpp

@@ -16,7 +16,7 @@
 #include <Ticker.h>
 #include "SPIFFS.h"
 #include "Assets.h"
-#include <Wire.h>  // Added for I2C support (needed for capacitive touch)
+#include <Wire.h>
 #include <TFT_eSPI.h>
 
 

esp32_marauder/Display.h

@@ -52,8 +52,9 @@ struct AccessPoint {
   uint8_t bssid[6];
   bool selected;
   LinkedList<char>* beacon;
-  char rssi;
-  LinkedList<uint8_t>* stations;
+  int8_t rssi;
+  LinkedList<uint16_t>* stations;
+  uint16_t packets;
 };
 
 class CaptiveRequestHandler : public AsyncWebHandler {