From d7d2b28f9eaa4901e16afd568fb2be8cb06d76c4 Mon Sep 17 00:00:00 2001 From: Just Call Me Koko Date: Mon, 1 Dec 2025 18:37:43 -0500 Subject: [PATCH] Add 5ghz channels for c5 packet injection --- esp32_marauder/WiFiScan.cpp | 118 ++++++++++++++++++++++----------- esp32_marauder/utils.h | 129 +----------------------------------- 2 files changed, 84 insertions(+), 163 deletions(-) diff --git a/esp32_marauder/WiFiScan.cpp b/esp32_marauder/WiFiScan.cpp index 26995fb..aa0a78e 100644 --- a/esp32_marauder/WiFiScan.cpp +++ b/esp32_marauder/WiFiScan.cpp @@ -1835,7 +1835,11 @@ int WiFiScan::clearSSIDs() { } bool WiFiScan::addSSID(String essid) { - ssid s = {essid, random(1, 12), {random(256), random(256), random(256), random(256), random(256), random(256)}, false}; + #ifndef HAS_DUAL_BAND + ssid s = {essid, random(1, 12), {random(256), random(256), random(256), random(256), random(256), random(256)}, false}; + #else + ssid s = {essid, dual_band_channels[random(0, DUAL_BAND_CHANNELS)], {random(256), random(256), random(256), random(256), random(256), random(256)}, false}; + #endif ssids->add(s); Serial.println(ssids->get(ssids->size() - 1).essid); @@ -1850,7 +1854,11 @@ int WiFiScan::generateSSIDs(int count) { for (uint8_t i = 0; i < 6; i++) essid.concat(alfa[random(65)]); - ssid s = {essid, random(1, 12), {random(256), random(256), random(256), random(256), random(256), random(256)}, false}; + #ifndef HAS_DUAL_BAND + ssid s = {essid, random(1, 12), {random(256), random(256), random(256), random(256), random(256), random(256)}, false}; + #else + ssid s = {essid, dual_band_channels[random(0, DUAL_BAND_CHANNELS)], {random(256), random(256), random(256), random(256), random(256), random(256)}, false}; + #endif ssids->add(s); Serial.println(ssids->get(ssids->size() - 1).essid); } @@ -2252,7 +2260,8 @@ void WiFiScan::startWiFiAttacks(uint8_t scan_mode, uint16_t color, String title_ esp_wifi_set_config(WIFI_IF_AP, &ap_config); esp_wifi_start(); this->setMac(); - esp_wifi_set_channel(set_channel, WIFI_SECOND_CHAN_NONE); + this->changeChannel(this->set_channel); + //esp_wifi_set_channel(set_channel, WIFI_SECOND_CHAN_NONE); //WiFi.mode(WIFI_AP_STA); @@ -3289,7 +3298,8 @@ void WiFiScan::RunAPScan(uint8_t scan_mode, uint16_t color) esp_wifi_set_promiscuous(true); esp_wifi_set_promiscuous_filter(&filt); esp_wifi_set_promiscuous_rx_cb(&apSnifferCallbackFull); - esp_wifi_set_channel(set_channel, WIFI_SECOND_CHAN_NONE); + this->changeChannel(this->set_channel); + //esp_wifi_set_channel(set_channel, WIFI_SECOND_CHAN_NONE); this->wifi_initialized = true; initTime = millis(); } @@ -3987,7 +3997,8 @@ void WiFiScan::RunPacketMonitor(uint8_t scan_mode, uint16_t color) esp_wifi_set_promiscuous(true); esp_wifi_set_promiscuous_filter(&filt); esp_wifi_set_promiscuous_rx_cb(&wifiSnifferCallback); - esp_wifi_set_channel(set_channel, WIFI_SECOND_CHAN_NONE); + this->changeChannel(this->set_channel); + //esp_wifi_set_channel(set_channel, WIFI_SECOND_CHAN_NONE); this->wifi_initialized = true; uint32_t initTime = millis(); } @@ -4099,7 +4110,8 @@ void WiFiScan::RunEapolScan(uint8_t scan_mode, uint16_t color) esp_wifi_set_promiscuous_rx_cb(&activeEapolSnifferCallback); else esp_wifi_set_promiscuous_rx_cb(&eapolSnifferCallback); - esp_wifi_set_channel(set_channel, WIFI_SECOND_CHAN_NONE); + this->changeChannel(this->set_channel); + //esp_wifi_set_channel(set_channel, WIFI_SECOND_CHAN_NONE); this->wifi_initialized = true; initTime = millis(); } @@ -4190,7 +4202,8 @@ void WiFiScan::RunPineScan(uint8_t scan_mode, uint16_t color) esp_wifi_set_promiscuous(true); esp_wifi_set_promiscuous_filter(&filt); esp_wifi_set_promiscuous_rx_cb(&pineScanSnifferCallback); - esp_wifi_set_channel(set_channel, WIFI_SECOND_CHAN_NONE); + this->changeChannel(this->set_channel); + //esp_wifi_set_channel(set_channel, WIFI_SECOND_CHAN_NONE); this->wifi_initialized = true; initTime = millis(); } @@ -4243,7 +4256,8 @@ void WiFiScan::RunMultiSSIDScan(uint8_t scan_mode, uint16_t color) esp_wifi_set_promiscuous(true); esp_wifi_set_promiscuous_filter(&filt); esp_wifi_set_promiscuous_rx_cb(&multiSSIDSnifferCallback); - esp_wifi_set_channel(set_channel, WIFI_SECOND_CHAN_NONE); + this->changeChannel(this->set_channel); + //esp_wifi_set_channel(set_channel, WIFI_SECOND_CHAN_NONE); this->wifi_initialized = true; initTime = millis(); } @@ -4293,7 +4307,8 @@ void WiFiScan::RunPwnScan(uint8_t scan_mode, uint16_t color) esp_wifi_set_promiscuous(true); esp_wifi_set_promiscuous_filter(&filt); esp_wifi_set_promiscuous_rx_cb(&beaconSnifferCallback); - esp_wifi_set_channel(set_channel, WIFI_SECOND_CHAN_NONE); + this->changeChannel(this->set_channel); + //esp_wifi_set_channel(set_channel, WIFI_SECOND_CHAN_NONE); this->wifi_initialized = true; initTime = millis(); } @@ -4537,7 +4552,8 @@ void WiFiScan::RunBeaconScan(uint8_t scan_mode, uint16_t color) esp_wifi_set_promiscuous(true); esp_wifi_set_promiscuous_filter(&filt); esp_wifi_set_promiscuous_rx_cb(&beaconSnifferCallback); - esp_wifi_set_channel(set_channel, WIFI_SECOND_CHAN_NONE); + this->changeChannel(this->set_channel); + //esp_wifi_set_channel(set_channel, WIFI_SECOND_CHAN_NONE); } else { this->startWardriverWiFi(); @@ -4611,7 +4627,8 @@ void WiFiScan::RunStationScan(uint8_t scan_mode, uint16_t color) esp_wifi_set_promiscuous(true); esp_wifi_set_promiscuous_filter(&filt); esp_wifi_set_promiscuous_rx_cb(&stationSnifferCallback); - esp_wifi_set_channel(set_channel, WIFI_SECOND_CHAN_NONE); + this->changeChannel(this->set_channel); + //esp_wifi_set_channel(set_channel, WIFI_SECOND_CHAN_NONE); this->wifi_initialized = true; initTime = millis(); } @@ -4682,7 +4699,8 @@ void WiFiScan::RunRawScan(uint8_t scan_mode, uint16_t color) esp_wifi_set_promiscuous(true); esp_wifi_set_promiscuous_filter(&filt); esp_wifi_set_promiscuous_rx_cb(&beaconSnifferCallback); - esp_wifi_set_channel(set_channel, WIFI_SECOND_CHAN_NONE); + this->changeChannel(this->set_channel); + //esp_wifi_set_channel(set_channel, WIFI_SECOND_CHAN_NONE); this->wifi_initialized = true; initTime = millis(); } @@ -4733,7 +4751,8 @@ void WiFiScan::RunDeauthScan(uint8_t scan_mode, uint16_t color) esp_wifi_set_promiscuous(true); esp_wifi_set_promiscuous_filter(&filt); esp_wifi_set_promiscuous_rx_cb(&deauthSnifferCallback); - esp_wifi_set_channel(set_channel, WIFI_SECOND_CHAN_NONE); + this->changeChannel(this->set_channel); + //esp_wifi_set_channel(set_channel, WIFI_SECOND_CHAN_NONE); this->wifi_initialized = true; initTime = millis(); } @@ -4809,7 +4828,8 @@ void WiFiScan::RunProbeScan(uint8_t scan_mode, uint16_t color) esp_wifi_set_promiscuous(true); esp_wifi_set_promiscuous_filter(&filt); esp_wifi_set_promiscuous_rx_cb(&beaconSnifferCallback); - esp_wifi_set_channel(set_channel, WIFI_SECOND_CHAN_NONE); + this->changeChannel(this->set_channel); + //esp_wifi_set_channel(set_channel, WIFI_SECOND_CHAN_NONE); this->wifi_initialized = true; initTime = millis(); } @@ -7698,8 +7718,12 @@ void WiFiScan::beaconListSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t } void WiFiScan::broadcastCustomBeacon(uint32_t current_time, AccessPoint custom_ssid) { - set_channel = random(1,12); - esp_wifi_set_channel(set_channel, WIFI_SECOND_CHAN_NONE); + #ifndef HAS_DUAL_BAND + set_channel = random(1,12); + #else + set_channel = dual_band_channels[random(0, DUAL_BAND_CHANNELS)]; + #endif + this->changeChannel(this->set_channel); delay(1); //if (custom_ssid.beacon->size() == 0) @@ -7760,7 +7784,7 @@ void WiFiScan::broadcastCustomBeacon(uint32_t current_time, AccessPoint custom_s void WiFiScan::broadcastCustomBeacon(uint32_t current_time, ssid custom_ssid) { set_channel = custom_ssid.channel; - esp_wifi_set_channel(set_channel, WIFI_SECOND_CHAN_NONE); + this->changeChannel(this->set_channel); delay(1); // Randomize SRC MAC @@ -7806,8 +7830,13 @@ void WiFiScan::broadcastCustomBeacon(uint32_t current_time, ssid custom_ssid) { // Function to send beacons with random ESSID length void WiFiScan::broadcastSetSSID(uint32_t current_time, const char* ESSID) { - set_channel = random(1,12); - esp_wifi_set_channel(set_channel, WIFI_SECOND_CHAN_NONE); + #ifndef HAS_DUAL_BAND + set_channel = random(1,12); + #else + set_channel = dual_band_channels[random(0, DUAL_BAND_CHANNELS)]; + #endif + this->changeChannel(this->set_channel); + delay(1); // Randomize SRC MAC @@ -7852,8 +7881,12 @@ void WiFiScan::broadcastSetSSID(uint32_t current_time, const char* ESSID) { // Function for sending crafted beacon frames void WiFiScan::broadcastRandomSSID(uint32_t currentTime) { - set_channel = random(1,12); - esp_wifi_set_channel(set_channel, WIFI_SECOND_CHAN_NONE); + #ifndef HAS_DUAL_BAND + set_channel = random(1,12); + #else + set_channel = dual_band_channels[random(0, DUAL_BAND_CHANNELS)]; + #endif + this->changeChannel(this->set_channel); delay(1); // Randomize SRC MAC @@ -7901,7 +7934,7 @@ void WiFiScan::sendProbeAttack(uint32_t currentTime) { // Check if active if (access_points->get(i).selected) { this->set_channel = access_points->get(i).channel; - esp_wifi_set_channel(this->set_channel, WIFI_SECOND_CHAN_NONE); + this->changeChannel(this->set_channel); delay(1); // Build packet @@ -7956,7 +7989,7 @@ void WiFiScan::sendProbeAttack(uint32_t currentTime) { void WiFiScan::sendDeauthFrame(uint8_t bssid[6], int channel, uint8_t mac[6]) { WiFiScan::set_channel = channel; - esp_wifi_set_channel(channel, WIFI_SECOND_CHAN_NONE); + this->changeChannel(channel); delay(1); // Build AP source packet @@ -8022,7 +8055,7 @@ void WiFiScan::sendDeauthFrame(uint8_t bssid[6], int channel, String dst_mac_str // Itterate through all access points in list // Check if active WiFiScan::set_channel = channel; - esp_wifi_set_channel(channel, WIFI_SECOND_CHAN_NONE); + this->changeChannel(channel); delay(1); // Build packet @@ -8054,7 +8087,7 @@ void WiFiScan::sendDeauthFrame(uint8_t bssid[6], int channel, String dst_mac_str void WiFiScan::sendEapolBagMsg1(uint8_t bssid[6], int channel, uint8_t mac[6], uint8_t sec) { WiFiScan::set_channel = channel; - esp_wifi_set_channel(channel, WIFI_SECOND_CHAN_NONE); + this->changeChannel(channel); delay(1); uint8_t frame_size = 153; @@ -8106,7 +8139,7 @@ void WiFiScan::sendEapolBagMsg1(uint8_t bssid[6], int channel, uint8_t mac[6], u void WiFiScan::sendEapolBagMsg1(uint8_t bssid[6], int channel, String dst_mac_str, uint8_t sec) { WiFiScan::set_channel = channel; - esp_wifi_set_channel(channel, WIFI_SECOND_CHAN_NONE); + this->changeChannel(channel); delay(1); uint8_t frame_size = 153; @@ -8154,7 +8187,7 @@ void WiFiScan::sendEapolBagMsg1(uint8_t bssid[6], int channel, String dst_mac_st void WiFiScan::sendAssociationSleep(const char* ESSID, uint8_t bssid[6], int channel, uint8_t mac[6]) { WiFiScan::set_channel = channel; - esp_wifi_set_channel(channel, WIFI_SECOND_CHAN_NONE); + this->changeChannel(channel); delay(1); static uint16_t sequence_number = 0; @@ -8281,7 +8314,7 @@ void WiFiScan::sendAssociationSleep(const char* ESSID, uint8_t bssid[6], int cha void WiFiScan::sendAssociationSleep(const char* ESSID, uint8_t bssid[6], int channel, String dst_mac_str) { WiFiScan::set_channel = channel; - esp_wifi_set_channel(channel, WIFI_SECOND_CHAN_NONE); + this->changeChannel(channel); delay(1); static uint16_t sequence_number = 0; @@ -8465,7 +8498,7 @@ void WiFiScan::sendDeauthAttack(uint32_t currentTime, String dst_mac_str) { // Check if active if (access_points->get(i).selected) { this->set_channel = access_points->get(i).channel; - esp_wifi_set_channel(this->set_channel, WIFI_SECOND_CHAN_NONE); + this->changeChannel(this->set_channel); delay(1); // Build packet @@ -9363,7 +9396,8 @@ void WiFiScan::channelHop(bool filtered, bool ranged) #endif } - esp_wifi_set_channel(this->set_channel, WIFI_SECOND_CHAN_NONE); + //esp_wifi_set_channel(this->set_channel, WIFI_SECOND_CHAN_NONE); + this->changeChannel(this->set_channel); delay(1); } @@ -10479,13 +10513,23 @@ void WiFiScan::main(uint32_t currentTime) // Need this for loop because getTouch causes ~10ms delay // which makes beacon spam less effective for (int i = 0; i < access_points->size(); i++) { - if (access_points->get(i).selected) - this->broadcastCustomBeacon(currentTime, ssid{access_points->get(i).essid, random(1, 12), {random(256), - random(256), - random(256), - random(256), - random(256), - random(256)}}); + if (access_points->get(i).selected) { + #ifndef HAS_DUAL_BAND + this->broadcastCustomBeacon(currentTime, ssid{access_points->get(i).essid, random(1, 12), {random(256), + random(256), + random(256), + random(256), + random(256), + random(256)}}); + #else + this->broadcastCustomBeacon(currentTime, ssid{access_points->get(i).essid, dual_band_channels[random(0, DUAL_BAND_CHANNELS)], {random(256), + random(256), + random(256), + random(256), + random(256), + random(256)}}); + #endif + } } diff --git a/esp32_marauder/utils.h b/esp32_marauder/utils.h index d293e1a..8785636 100644 --- a/esp32_marauder/utils.h +++ b/esp32_marauder/utils.h @@ -8,7 +8,7 @@ #include "configs.h" -//#include "esp_heap_caps.h" +#include "esp_heap_caps.h" struct mac_addr { unsigned char bytes[6]; @@ -27,128 +27,6 @@ struct ProbeReqSsid { uint8_t requests; }; -/*const char apple_ouis[][9] PROGMEM = { - "00:17:F2", "00:1E:C2", "00:26:08", "F8:1E:DF", "BC:92:6B", - "28:E0:2C", "3C:07:54", "7C:D1:C3", "DC:A9:04", "F0:D1:A9", - "C0:2C:5C", "00:03:93", "00:03:94", "00:03:95", "00:03:96", - "00:03:97", "00:03:98", "00:03:99", "00:03:9A", "00:03:9B", - "00:03:9C", "00:03:9D", "00:03:9E", "00:03:9F", "00:03:A0", - "00:03:A1", "00:03:A2", "00:03:A3", "00:03:A4", "00:03:A5", - "00:03:A6", "00:03:A7", "00:03:A8", "00:03:A9", "00:03:AA", - "00:03:AB", "00:03:AC", "00:03:AD", "00:03:AE", "00:03:AF", - "00:03:B0", "00:03:B1", "00:03:B2", "00:03:B3", "00:03:B4", - "00:03:B5", "00:03:B6", "00:03:B7", "00:03:B8", "00:03:B9", - "00:03:BA", "00:03:BB", "00:03:BC", "00:03:BD", "00:03:BE", - "00:03:BF", "00:03:C0", "00:03:C1", "00:03:C2", "00:03:C3", - "00:03:C4", "00:03:C5", "00:03:C6", "00:03:C7", "00:03:C8", - "00:03:C9", "00:03:CA", "00:03:CB", "00:03:CC", "00:03:CD", - "00:03:CE", "00:03:CF", "00:03:D0", "00:03:D1", "00:03:D2", - "00:03:D3", "00:03:D4", "00:03:D5", "00:03:D6", "00:03:D7", - "00:03:D8", "00:03:D9", "00:03:DA", "00:03:DB", "00:03:DC", - "00:03:DD", "00:03:DE", "00:03:DF", "00:03:E0", "00:03:E1", - "00:03:E2", "00:03:E3", "00:03:E4", "00:03:E5", "00:03:E6", - "00:03:E7", "00:03:E8", "00:03:E9", "00:03:EA", "00:03:EB", - "00:03:EC", "00:03:ED", "00:03:EE", "00:03:EF", "00:03:F0", - "00:03:F1", "00:03:F2", "00:03:F3", "00:03:F4", "00:03:F5", - "00:03:F6", "00:03:F7", "00:03:F8", "00:03:F9", "00:03:FA", - "00:03:FB", "00:03:FC", "00:03:FD", "00:03:FE", "00:03:FF" -}; - -const char asus_ouis[][9] PROGMEM = { - "00:0C:6E", "00:0E:A6", "00:11:2F", "00:11:D8", "00:13:D4", "00:15:F2", "00:17:31", "00:18:F3", "00:1A:92", - "00:1B:FC", "00:1D:60", "00:1E:8C", "00:1F:C6", "00:22:15", "00:23:54", "00:24:8C", "00:26:18", "00:E0:18", - "04:42:1A", "04:92:26", "04:D4:C4", "04:D9:F5", "08:60:6E", "08:62:66", "08:BF:B8", "0C:9D:92", "10:7B:44", - "10:7C:61", "10:BF:48", "10:C3:7B", "14:DA:E9", "14:DD:A9", "18:31:BF", "1C:87:2C", "1C:B7:2C", "20:CF:30", - "24:4B:FE", "2C:4D:54", "2C:56:DC", "2C:FD:A1", "30:5A:3A", "30:85:A9", "34:97:F6", "38:2C:4A", "38:D5:47", - "3C:7C:3F", "40:16:7E", "40:B0:76", "48:5B:39", "4C:ED:FB", "50:46:5D", "50:EB:F6", "54:04:A6", "54:A0:50", - "58:11:22", "60:45:CB", "60:A4:4C", "60:CF:84", "70:4D:7B", "70:8B:CD", "74:D0:2B", "78:24:AF", "7C:10:C9", - "88:D7:F6", "90:E6:BA", "9C:5C:8E", "A0:36:BC", "A8:5E:45", "AC:22:0B", "AC:9E:17", "B0:6E:BF", "BC:AE:C5", - "BC:EE:7B", "C8:60:00", "C8:7F:54", "CC:28:AA", "D0:17:C2", "D4:5D:64", "D8:50:E6", "E0:3F:49", "E0:CB:4E", - "E8:9C:25", "F0:2F:74", "F0:79:59", "F4:6D:04", "F8:32:E4", "FC:34:97", "FC:C2:33" -}; - -const char belkin_ouis[][9] PROGMEM = { - "00:11:50", "00:17:3F", "00:30:BD", "08:BD:43", "14:91:82", "24:F5:A2", "30:23:03", "80:69:1A", "94:10:3E", - "94:44:52", "B4:75:0E", "C0:56:27", "C4:41:1E", "D8:EC:5E", "E8:9F:80", "EC:1A:59", "EC:22:80" -}; - -const char cisco_ouis[][9] PROGMEM = { - "00:1B:0D", "00:1D:45", "00:1E:7A", "00:25:9C", "00:50:56", - "40:55:39", "58:8D:09", "A4:4C:C8", "F8:0F:F9" -}; - -const char dlink_ouis[][9] PROGMEM = { - "00:05:5D", "00:0D:88", "00:0F:3D", "00:11:95", "00:13:46", "00:15:E9", "00:17:9A", "00:19:5B", "00:1B:11", - "00:1C:F0", "00:1E:58", "00:21:91", "00:22:B0", "00:24:01", "00:26:5A", "00:AD:24", "04:BA:D6", "08:5A:11", - "0C:0E:76", "0C:B6:D2", "10:62:EB", "10:BE:F5", "14:D6:4D", "18:0F:76", "1C:5F:2B", "1C:7E:E5", "1C:AF:F7", - "1C:BD:B9", "28:3B:82", "30:23:03", "34:08:04", "34:0A:33", "3C:1E:04", "3C:33:32", "40:86:CB", "40:9B:CD", - "54:B8:0A", "5C:D9:98", "60:63:4C", "64:29:43", "6C:19:8F", "6C:72:20", "74:44:01", "74:DA:DA", "78:32:1B", - "78:54:2E", "78:98:E8", "80:26:89", "84:C9:B2", "88:76:B9", "90:8D:78", "90:94:E4", "9C:D6:43", "A0:63:91", - "A0:AB:1B", "A4:2A:95", "A8:63:7D", "AC:F1:DF", "B4:37:D8", "B8:A3:86", "BC:0F:9A", "BC:22:28", "BC:F6:85", - "C0:A0:BB", "C4:A8:1D", "C4:E9:0A", "C8:78:7D", "C8:BE:19", "C8:D3:A3", "CC:B2:55", "D8:FE:E3", "DC:EA:E7", - "E0:1C:FC", "E4:6F:13", "E8:CC:18", "EC:22:80", "EC:AD:E0", "F0:7D:68", "F0:B4:D2", "F4:8C:EB", "F8:E9:03", - "FC:75:16" -}; - -const char google_ouis[][9] PROGMEM = { - "3C:5A:B4", "5C:BF:C0", "78:4F:43", "A4:77:33", "D4:97:0B", "F0:72:8C" -}; - -const char huawei_ouis[][9] PROGMEM = { - "00:1A:2B", "28:FF:3C", "5C:4C:A9", "8C:71:F8", "C8:D1:5E", - "E4:4C:A9", "F4:12:FA" -}; - -const char lg_ouis[][9] PROGMEM = { - "00:17:C0", "18:AF:8F", "38:2D:AE", "5C:87:9C", "68:27:37", - "78:5D:C8", "94:65:2D", "A4:77:33", "C4:43:8F" -}; - -const char linksys_ouis[][9] PROGMEM = { - "00:04:5A", "00:06:25", "00:0C:41", "00:0E:08", "00:0F:66", "00:12:17", "00:13:10", "00:14:BF", "00:16:B6", - "00:18:39", "00:18:F8", "00:1A:70", "00:1C:10", "00:1D:7E", "00:1E:E5", "00:21:29", "00:22:6B", "00:23:69", - "00:25:9C", "00:23:54", "00:24:B2", "00:31:92", "00:5F:67", "10:27:F5", "14:EB:B6", "1C:61:B4", "20:36:26", - "28:87:BA", "30:5A:3A", "2C:FD:A1", "30:23:03", "30:46:9A", "40:ED:00", "48:22:54", "50:91:E3", "54:AF:97", - "5C:A2:F4", "5C:A6:E6", "5C:E9:31", "60:A4:B7", "68:7F:F0", "6C:5A:B0", "78:8C:B5", "7C:C2:C6", "9C:53:22", - "9C:A2:F4", "A8:42:A1", "AC:15:A2", "B0:A7:B9", "B4:B0:24", "C0:06:C3", "CC:68:B6", "E8:48:B8", "F0:A7:31" -}; - -const char netgear_ouis[][9] PROGMEM = { - "00:09:5B", "00:0F:B5", "00:14:6C" -}; - -const char oneplus_ouis[][9] PROGMEM = { - "08:EC:A9", "30:9C:23", "38:78:62", "64:A2:F9", "74:AC:B9", - "A8:14:51", "B4:86:55", "D8:CB:8A", "F4:8C:50" -}; - -const char samsung_ouis[][9] PROGMEM = { - "00:12:47", "00:15:99", "00:16:6B", "00:1B:FC", "10:5F:06", - "18:59:36", "20:02:AF", "24:4B:03", "38:2D:3D", "40:B8:37", - "00:1F:12", "00:1D:0F", "00:1A:9A", "00:19:E1", "00:18:FF", - "00:17:77", "00:16:72", "00:14:69", "00:13:65", "00:12:60", - "30:37:0D", "40:8C:47", "50:55:5F", "60:47:A1", "70:0A:AD", - "80:61:43", "90:48:F7", "A0:4C:CB", "B0:5E:93", "C0:3D:F5", - "D0:31:AA", "E0:4F:02", "F0:3B:94" -}; - -const char sony_ouis[][9] PROGMEM = { - "00:19:C5", "00:1B:59", "00:1E:DC", "10:68:3F", "54:42:49", - "A8:E3:EE", "B8:F9:34", "CC:5D:4E", "E8:89:2F" -}; - -const char tplink_ouis[][9] PROGMEM = { - "00:31:92", "00:5F:67", "10:27:F5", "14:EB:B6", "1C:61:B4", "20:36:26", "28:87:BA", "30:DE:4B", "34:60:F9", - "3C:52:A1", "40:ED:00", "48:22:54", "50:91:E3", "54:AF:97", "5C:62:8B", "5C:A6:E6", "5C:E9:31", "60:A4:B7", - "68:7F:F0", "6C:5A:B0", "78:8C:B5", "7C:C2:C6", "9C:53:22", "9C:A2:F4", "A8:42:A1", "AC:15:A2", "B0:A7:B9", - "B4:B0:24", "C0:06:C3", "CC:68:B6", "E8:48:B8", "F0:A7:31" -}; - -const char xiaomi_ouis[][9] PROGMEM = { - "04:CF:8C", "18:59:36", "38:1A:2D", "64:B4:73", "78:02:F8", - "90:4E:91", "C4:0B:CB", "D0:DB:32" -};*/ - uint8_t getDRAMUsagePercent() { //size_t total = heap_caps_get_total_size(MALLOC_CAP_8BIT); //size_t free = heap_caps_get_free_size(MALLOC_CAP_8BIT); @@ -164,7 +42,7 @@ uint8_t getDRAMUsagePercent() { #ifdef HAS_PSRAM uint8_t getPSRAMUsagePercent() { - /*//size_t total = heap_caps_get_total_size(MALLOC_CAP_SPIRAM); + //size_t total = heap_caps_get_total_size(MALLOC_CAP_SPIRAM); //size_t free = heap_caps_get_free_size(MALLOC_CAP_SPIRAM); size_t total = ESP.getPsramSize(); @@ -174,8 +52,7 @@ uint8_t getDRAMUsagePercent() { size_t used = total - free; uint8_t percent = (used * 100) / total; - return percent;*/ - return getDRAMUsagePercent(); + return percent; } #endif