Skip to content

Reduce frame buffer size for non-PSRAM #1093

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
justcallmekoko merged 2 commits into from
Jan 30, 2026
Merged

Reduce frame buffer size for non-PSRAM #1093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01f21e0
Reduce frame buffer size for non-PSRAM
justcallmekoko Jan 30, 2026
29b6783
Fix for LDDB
justcallmekoko Jan 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions esp32_marauder/WiFiScan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
static const uint8_t *g_filter_bssid = nullptr;
uint8_t *current_act = nullptr;

MacEntry WiFiScan::mac_entries[mac_history_len];
uint8_t WiFiScan::mac_entry_state[mac_history_len];
MacEntry WiFiScan::mac_entries[mac_history_len_half];
uint8_t WiFiScan::mac_entry_state[mac_history_len_half];

int num_beacon = 0;
int num_deauth = 0;
Expand Down Expand Up @@ -1721,7 +1721,7 @@ void WiFiScan::RunSetup() {
mac_history = (struct mac_addr*) ps_malloc(mac_history_len * sizeof(struct mac_addr));
#endif

for (int i = 0; i < mac_history_len; i++)
for (int i = 0; i < mac_history_len_half; i++)
mac_entry_state[i] = 0;

#ifdef HAS_BT
Expand Down Expand Up @@ -2637,7 +2637,7 @@ int16_t WiFiScan::seen_mac_int(unsigned char* mac, bool simple) {
tmp[x] = mac[x];
}

for (int x = 0; x < mac_history_len; x++) {
for (int x = 0; x < mac_history_len_half; x++) {
if (this->mac_cmp(tmp, mac_entries[x].mac)) {
return x;
}
Expand All @@ -2658,12 +2658,12 @@ inline uint32_t WiFiScan::hash_mac(const uint8_t mac[6]) {

int WiFiScan::update_mac_entry(const uint8_t mac[6], int8_t rssi, bool bt) {
const uint32_t now_ms = millis();
const uint32_t start_idx = hash_mac(mac) & (mac_history_len - 1);
const uint32_t start_idx = hash_mac(mac) & (mac_history_len_half - 1);

int32_t first_tombstone = -1;

for (uint32_t probe = 0; probe < mac_history_len; probe++) {
const uint32_t idx = (start_idx + probe) & (mac_history_len - 1);
for (uint32_t probe = 0; probe < mac_history_len_half; probe++) {
const uint32_t idx = (start_idx + probe) & (mac_history_len_half - 1);

switch (mac_entry_state[idx]) {

Expand Down Expand Up @@ -2699,7 +2699,7 @@ int WiFiScan::update_mac_entry(const uint8_t mac[6], int8_t rssi, bool bt) {

mac_entries[idx].rssi = rssi;

return idx + mac_history_len;
return idx + mac_history_len_half;
}
break;
}
Expand Down Expand Up @@ -2737,7 +2737,7 @@ void WiFiScan::evict_and_insert(const uint8_t mac[6], uint32_t now_ms) {
const uint32_t EVICT_AGE_MS = TRACK_EVICT_SEC * 1000UL;

// 1) Prefer reusing a tombstone if any exist.
for (uint32_t i = 0; i < mac_history_len; i++) {
for (uint32_t i = 0; i < mac_history_len_half; i++) {
if (mac_entry_state[i] == TOMBSTONE_ENTRY) {
insert_mac_entry(i, mac, now_ms);
return;
Expand All @@ -2754,7 +2754,7 @@ void WiFiScan::evict_and_insert(const uint8_t mac[6], uint32_t now_ms) {
uint16_t victim_any_frames = 0xFFFF;
uint32_t victim_any_age = 0;

for (uint32_t i = 0; i < mac_history_len; i++) {
for (uint32_t i = 0; i < mac_history_len_half; i++) {
if (mac_entry_state[i] != VALID_ENTRY) continue;

const uint32_t age = (uint32_t)(now_ms - mac_entries[i].last_seen_ms);
Expand Down Expand Up @@ -2890,7 +2890,7 @@ uint8_t WiFiScan::build_top10_for_ui(MacEntry* out_top10, MacSortMode mode) {
}
};

for (uint32_t i = 0; i < mac_history_len; i++) {
for (uint32_t i = 0; i < mac_history_len_half; i++) {
if (mac_entry_state[i] != VALID_ENTRY)
continue;

Expand Down Expand Up @@ -8085,12 +8085,12 @@ void WiFiScan::beaconSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type
else if (wifi_scan_obj.currentScanMode == WIFI_SCAN_DETECT_FOLLOW) {
int frame_check = wifi_scan_obj.update_mac_entry(src_addr, snifferPacket->rx_ctrl.rssi);

if (frame_check >= mac_history_len) {
if (frame_check >= mac_history_len_half) {
int32_t dloc = 0;
bool is_following = is_following_candidate_light(wifi_scan_obj.mac_entries[frame_check - mac_history_len], millis(), &dloc);
bool is_following = is_following_candidate_light(wifi_scan_obj.mac_entries[frame_check - mac_history_len_half], millis(), &dloc);
if (is_following) {
wifi_scan_obj.mac_entries[frame_check - mac_history_len].dloc = dloc;
wifi_scan_obj.mac_entries[frame_check - mac_history_len].following = is_following;
wifi_scan_obj.mac_entries[frame_check - mac_history_len_half].dloc = dloc;
wifi_scan_obj.mac_entries[frame_check - mac_history_len_half].following = is_following;
buffer_obj.append(snifferPacket, len);
}
}
Expand Down
4 changes: 2 additions & 2 deletions esp32_marauder/WiFiScan.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,8 +662,8 @@ class WiFiScan
volatile bool bt_pending_clear = false;


static MacEntry mac_entries[mac_history_len];
static uint8_t mac_entry_state[mac_history_len];
static MacEntry mac_entries[mac_history_len_half];
static uint8_t mac_entry_state[mac_history_len_half];

// Stuff for RAW stats
uint32_t mgmt_frames = 0;
Expand Down
11 changes: 7 additions & 4 deletions esp32_marauder/configs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
#define HAS_BT
#define HAS_BT_REMOTE
#define HAS_BUTTONS
#define HAS_NEOPIXEL_LED
//#define HAS_NEOPIXEL_LED
//#define HAS_PWR_MGMT
#define HAS_SCREEN
#define HAS_FULL_SCREEN
Expand Down Expand Up @@ -2334,6 +2334,8 @@
#define mac_history_len 100
#endif

#define mac_history_len_half (mac_history_len / 2)

#if defined(MARAUDER_V6) || defined(MARAUDER_V6_1)
#define GPS_SERIAL_INDEX 2
#define GPS_TX 4
Expand Down Expand Up @@ -2409,6 +2411,7 @@
#endif
#else
#define mac_history_len 100
#define mac_history_len_half (mac_history_len / 2)
#endif
//// END GPS STUFF

Expand Down Expand Up @@ -2519,9 +2522,9 @@
#ifdef HAS_PSRAM
#define BUF_SIZE 8 * 1024 // Had to reduce buffer size to save RAM. GG @spacehuhn
#define SNAP_LEN 1 * 4096 // max len of each recieved packet
#elif !defined(HAS_ILI9341)
#define BUF_SIZE 8 * 1024 // Had to reduce buffer size to save RAM. GG @spacehuhn
#define SNAP_LEN 4096 // max len of each recieved packet
//#elif !defined(HAS_ILI9341)
// #define BUF_SIZE 8 * 1024 // Had to reduce buffer size to save RAM. GG @spacehuhn
// #define SNAP_LEN 4096 // max len of each recieved packet
#else
#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
Expand Down