gitea-mirror/ESP32Marauder
1
0
Fork 0
mirror of https://github.com/justcallmekoko/ESP32Marauder.git synced 2025-12-10 14:51:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

Remove join/shutdown wifi

Browse Source
This commit is contained in:
Just Call Me Koko
2023-08-31 15:02:34 -04:00
parent bc3038c73b
commit 6a26ac2e04
8 changed files with 7 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
esp32_marauder/Assets.h
View File

@@ -183,12 +183,7 @@ PROGMEM static const unsigned char menu_icons[][66] = {
0x22, 0x29, 0x11, 0x22, 0x29, 0x11, 0xFE, 0xFF, 0x1F, 0x92, 0x40, 0x12, 0x22, 0x29, 0x11, 0x22, 0x29, 0x11, 0xFE, 0xFF, 0x1F, 0x92, 0x40, 0x12,
0x92, 0x40, 0x12, 0xFE, 0xFF, 0x1F, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x3F, 0x92, 0x40, 0x12, 0xFE, 0xFF, 0x1F, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x3F,
0xFF, 0xFF, 0x3F, 0xFF, 0xFF, 0x3F}, 0xFF, 0xFF, 0x3F, 0xFF, 0xFF, 0x3F},
{0xFF, 0xFF, 0x3F, 0xFF, 0xFF, 0x3F, 0xFF, 0xFF, 0x3F, 0xFF, 0xC0, 0x3F, // JOIN_WIFI: 30 {0x00}, // JOIN_WIFI 30
0x3F, 0x00, 0x3F, 0x1F, 0x00, 0x3E, 0x03, 0x00, 0x30, 0x01, 0xF0, 0x2F,
0x54, 0x12, 0x1A, 0x54, 0xD0, 0x1F, 0x7C, 0xD2, 0x1B, 0x7C, 0x12, 0x1B,
0x38, 0xD2, 0x1B, 0x28, 0xD0, 0x1B, 0x01, 0xF8, 0x2F, 0x03, 0x00, 0x30,
0x1F, 0x00, 0x3E, 0x3F, 0x00, 0x3F, 0xFF, 0xC0, 0x3F, 0xFF, 0xFF, 0x3F,
0xFF, 0xFF, 0x3F, 0xFF, 0xFF, 0x3F},
{0x7F, 0xFE,0xFF, 0x7F, 0xFC, 0xFF, 0xFF, 0xF8, 0xFF, 0x00, 0x00, 0xF8, // LANGUAGE: 31 {0x7F, 0xFE,0xFF, 0x7F, 0xFC, 0xFF, 0xFF, 0xF8, 0xFF, 0x00, 0x00, 0xF8, // LANGUAGE: 31
0x00, 0x00, 0xF8, 0xCF, 0x3F, 0xFF, 0xCF, 0x3F ,0xFF, 0x9F, 0x9F, 0xFF, 0x00, 0x00, 0xF8, 0xCF, 0x3F, 0xFF, 0xCF, 0x3F ,0xFF, 0x9F, 0x9F, 0xFF,
0x9F, 0x8F, 0xFF, 0x3F, 0xC7, 0xFF, 0x3F, 0xE2, 0xFF, 0xFF, 0xF0, 0xFF, 0x9F, 0x8F, 0xFF, 0x3F, 0xC7, 0xFF, 0x3F, 0xE2, 0xFF, 0xFF, 0xF0, 0xFF,

65
esp32_marauder/GpsInterface.cpp
View File

@@ -64,59 +64,6 @@ void GpsInterface::setGPSInfo() {
//nmea.clear(); //nmea.clear();
} }
void GpsInterface::showGPSInfo() {
Serial.print("Valid fix: ");
Serial.println(nmea.isValid() ? "yes" : "no");
Serial.print("Nav. system: ");
if (nmea.getNavSystem())
Serial.println(nmea.getNavSystem());
else
Serial.println("none");
Serial.print("Num. satellites: ");
Serial.println(nmea.getNumSatellites());
Serial.print("HDOP: ");
Serial.println(nmea.getHDOP() / 10., 1);
Serial.print("Date/time: ");
Serial.print(nmea.getYear());
Serial.print('-');
Serial.print(int(nmea.getMonth()));
Serial.print('-');
Serial.print(int(nmea.getDay()));
Serial.print('T');
Serial.print(int(nmea.getHour()));
Serial.print(':');
Serial.print(int(nmea.getMinute()));
Serial.print(':');
Serial.println(int(nmea.getSecond()));
long latitude_mdeg = nmea.getLatitude();
long longitude_mdeg = nmea.getLongitude();
Serial.print("Latitude (deg): ");
Serial.println(latitude_mdeg / 1000000., 6);
Serial.print("Longitude (deg): ");
Serial.println(longitude_mdeg / 1000000., 6);
long alt;
Serial.print("Altitude (m): ");
if (nmea.getAltitude(alt))
Serial.println(alt / 1000., 3);
else
Serial.println("not available");
Serial.print("Speed: ");
Serial.println(nmea.getSpeed() / 1000., 3);
Serial.print("Course: ");
Serial.println(nmea.getCourse() / 1000., 3);
Serial.println("-----------------------");
nmea.clear();
}
String GpsInterface::getNumSatsString() { String GpsInterface::getNumSatsString() {
return (String)num_sats; return (String)num_sats;
} }
@@ -140,19 +87,11 @@ void GpsInterface::main() {
uint8_t num_sat = nmea.getNumSatellites(); uint8_t num_sat = nmea.getNumSatellites();
if ((nmea.isValid()) && (num_sat > 0)) { if ((nmea.isValid()) && (num_sat > 0))
//this->good_fix = true;
//this->num_sats = nmea.getNumSatellites();
this->setGPSInfo(); this->setGPSInfo();
//Serial.print("Got fix: ");
//Serial.println(num_sats);
//this->showGPSInfo();
}
else if ((!nmea.isValid()) && (num_sat <= 0)) { else if ((!nmea.isValid()) && (num_sat <= 0)) {
//this->good_fix = false;
//this->num_sats = nmea.getNumSatellites();
this->setGPSInfo(); this->setGPSInfo();
//Serial.println("No fix");
} }
} }
#endif #endif

2
esp32_marauder/GpsInterface.h
View File

@@ -24,10 +24,8 @@ class GpsInterface {
bool gps_enabled = false; bool gps_enabled = false;
bool good_fix = false; bool good_fix = false;
uint8_t num_sats = 0; uint8_t num_sats = 0;
//MicroNMEA nmea(nmeaBuffer, sizeof(nmeaBuffer));
String dt_string_from_gps(); String dt_string_from_gps();
void showGPSInfo();
void setGPSInfo(); void setGPSInfo();
}; };

8
esp32_marauder/MenuFunctions.cpp
View File

@@ -1764,18 +1764,18 @@ void MenuFunctions::RunSetup()
addNodes(&wifiGeneralMenu, text09, TFT_LIGHTGREY, NULL, 0, [this]() { addNodes(&wifiGeneralMenu, text09, TFT_LIGHTGREY, NULL, 0, [this]() {
changeMenu(wifiGeneralMenu.parentMenu); changeMenu(wifiGeneralMenu.parentMenu);
}); });
#ifdef HAS_ILI9341 /*#ifdef HAS_ILI9341
addNodes(&wifiGeneralMenu, text_table1[55], TFT_DARKCYAN, NULL, JOIN_WIFI, [this](){ addNodes(&wifiGeneralMenu, text_table1[55], TFT_DARKCYAN, NULL, JOIN_WIFI, [this](){
display_obj.clearScreen(); display_obj.clearScreen();
wifi_scan_obj.currentScanMode = LV_JOIN_WIFI; wifi_scan_obj.currentScanMode = LV_JOIN_WIFI;
wifi_scan_obj.StartScan(LV_JOIN_WIFI, TFT_YELLOW); wifi_scan_obj.StartScan(LV_JOIN_WIFI, TFT_YELLOW);
joinWiFiGFX(); joinWiFiGFX();
}); });
#endif #endif*/
addNodes(&wifiGeneralMenu, text_table1[25], TFT_CYAN, NULL, SHUTDOWN, [this]() { /*addNodes(&wifiGeneralMenu, text_table1[25], TFT_CYAN, NULL, SHUTDOWN, [this]() {
changeMenu(&shutdownWiFiMenu); changeMenu(&shutdownWiFiMenu);
wifi_scan_obj.RunShutdownWiFi(); wifi_scan_obj.RunShutdownWiFi();
}); });*/
addNodes(&wifiGeneralMenu, text_table1[27], TFT_SKYBLUE, NULL, GENERATE, [this]() { addNodes(&wifiGeneralMenu, text_table1[27], TFT_SKYBLUE, NULL, GENERATE, [this]() {
changeMenu(&generateSSIDsMenu); changeMenu(&generateSSIDsMenu);
wifi_scan_obj.RunGenerateSSIDs(); wifi_scan_obj.RunGenerateSSIDs();

130
esp32_marauder/WiFiScan.cpp
View File

@@ -355,11 +355,6 @@ void WiFiScan::StartScan(uint8_t scan_mode, uint16_t color)
RunBluetoothScan(scan_mode, color); RunBluetoothScan(scan_mode, color);
#endif #endif
} }
else if (scan_mode == LV_JOIN_WIFI) {
#ifdef HAS_SCREEN
RunLvJoinWiFi(scan_mode, color);
#endif
}
else if (scan_mode == LV_ADD_SSID) { else if (scan_mode == LV_ADD_SSID) {
#ifdef HAS_SCREEN #ifdef HAS_SCREEN
RunLvJoinWiFi(scan_mode, color); RunLvJoinWiFi(scan_mode, color);
@@ -771,33 +766,6 @@ void WiFiScan::RunGenerateSSIDs(int count) {
#endif #endif
} }
void WiFiScan::RunShutdownWiFi() {
#ifdef HAS_SCREEN
display_obj.tft.setTextWrap(false);
display_obj.tft.setFreeFont(NULL);
display_obj.tft.setCursor(0, 100);
display_obj.tft.setTextSize(1);
display_obj.tft.setTextColor(TFT_CYAN);
display_obj.tft.print(F(text_table4[16]));
#endif
if (this->wifi_initialized) {
this->shutdownWiFi();
#ifdef HAS_SCREEN
display_obj.tft.setTextColor(TFT_GREEN);
display_obj.tft.println(F("OK"));
#endif
}
else {
#ifdef HAS_SCREEN
display_obj.tft.setTextColor(TFT_RED);
display_obj.tft.println(F(text17));
display_obj.tft.println(F(text_table4[17]));
#endif
}
}
void WiFiScan::RunShutdownBLE() { void WiFiScan::RunShutdownBLE() {
#ifdef HAS_SCREEN #ifdef HAS_SCREEN
display_obj.tft.setTextWrap(false); display_obj.tft.setTextWrap(false);
@@ -2698,7 +2666,6 @@ void WiFiScan::sendProbeAttack(uint32_t currentTime) {
// Set SSID length // Set SSID length
int ssidLen = access_points->get(i).essid.length(); int ssidLen = access_points->get(i).essid.length();
//int rand_len = sizeof(rand_reg);
int fullLen = ssidLen; int fullLen = ssidLen;
prob_req_packet[25] = fullLen; prob_req_packet[25] = fullLen;
@@ -2708,16 +2675,6 @@ void WiFiScan::sendProbeAttack(uint32_t currentTime) {
for(int i = 0; i < ssidLen; i++) for(int i = 0; i < ssidLen; i++)
prob_req_packet[26 + i] = buf[i]; prob_req_packet[26 + i] = buf[i];
/*
* 0x01, 0x08, 0x8c, 0x12, 0x18, 0x24,
0x30, 0x48, 0x60, 0x6c, 0x2d, 0x1a,
0xad, 0x01, 0x17, 0xff, 0xff, 0x00,
0x00, 0x7e, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00
*/
uint8_t postSSID[40] = {0x00, 0x00, 0x01, 0x08, 0x8c, 0x12, uint8_t postSSID[40] = {0x00, 0x00, 0x01, 0x08, 0x8c, 0x12,
0x18, 0x24, 0x30, 0x48, 0x60, 0x6c, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6c,
@@ -2981,14 +2938,6 @@ void WiFiScan::eapolSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type)
if (send_deauth) { if (send_deauth) {
if (snifferPacket->payload[0] == 0x80) { if (snifferPacket->payload[0] == 0x80) {
// Build packet // Build packet
/*uint8_t new_packet[26] = {
0xc0, 0x00, 0x3a, 0x01,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0xf0, 0xff, 0x02, 0x00
};*/
wifi_scan_obj.deauth_frame_default[10] = snifferPacket->payload[10]; wifi_scan_obj.deauth_frame_default[10] = snifferPacket->payload[10];
wifi_scan_obj.deauth_frame_default[11] = snifferPacket->payload[11]; wifi_scan_obj.deauth_frame_default[11] = snifferPacket->payload[11];
@@ -3005,8 +2954,6 @@ void WiFiScan::eapolSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type)
wifi_scan_obj.deauth_frame_default[21] = snifferPacket->payload[15]; wifi_scan_obj.deauth_frame_default[21] = snifferPacket->payload[15];
// Send packet // Send packet
//esp_wifi_80211_tx(WIFI_IF_AP, new_packet, sizeof(new_packet), false);
//esp_wifi_80211_tx(WIFI_IF_AP, new_packet, sizeof(new_packet), false);
esp_wifi_80211_tx(WIFI_IF_AP, wifi_scan_obj.deauth_frame_default, sizeof(wifi_scan_obj.deauth_frame_default), false); esp_wifi_80211_tx(WIFI_IF_AP, wifi_scan_obj.deauth_frame_default, sizeof(wifi_scan_obj.deauth_frame_default), false);
delay(1); delay(1);
} }
@@ -3043,19 +2990,6 @@ void WiFiScan::eapolSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type)
#else #else
Serial.println(addr); Serial.println(addr);
#endif #endif
// for (int i = 0; i < len; i++) {
// char hexCar[4];
// sprintf(hexCar, "%02X", snifferPacket->payload[i]);
// Serial.print(hexCar);
//Serial.print(snifferPacket->payload[i], HEX);
// if ((i + 1) % 16 == 0)
// Serial.print("\n");
// else
// Serial.print(" ");
// }
// Serial.print("\n");
} }
addPacket(snifferPacket, len); addPacket(snifferPacket, len);
@@ -3116,17 +3050,6 @@ void WiFiScan::activeEapolSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t
return; return;
} // End targeted stuff } // End targeted stuff
// Build packet // Build packet
//Serial.println("Recieved beacon frame");
/*uint8_t new_packet[26] = {
0xc0, 0x00, 0x3a, 0x01,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0xf0, 0xff, 0x02, 0x00
};*/
wifi_scan_obj.deauth_frame_default[10] = snifferPacket->payload[10]; wifi_scan_obj.deauth_frame_default[10] = snifferPacket->payload[10];
wifi_scan_obj.deauth_frame_default[11] = snifferPacket->payload[11]; wifi_scan_obj.deauth_frame_default[11] = snifferPacket->payload[11];
@@ -3143,8 +3066,6 @@ void WiFiScan::activeEapolSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t
wifi_scan_obj.deauth_frame_default[21] = snifferPacket->payload[15]; wifi_scan_obj.deauth_frame_default[21] = snifferPacket->payload[15];
// Send packet // Send packet
//esp_wifi_80211_tx(WIFI_IF_AP, new_packet, sizeof(new_packet), false);
//esp_wifi_80211_tx(WIFI_IF_AP, new_packet, sizeof(new_packet), false);
esp_wifi_80211_tx(WIFI_IF_AP, wifi_scan_obj.deauth_frame_default, sizeof(wifi_scan_obj.deauth_frame_default), false); esp_wifi_80211_tx(WIFI_IF_AP, wifi_scan_obj.deauth_frame_default, sizeof(wifi_scan_obj.deauth_frame_default), false);
delay(1); delay(1);
} }
@@ -3155,18 +3076,6 @@ void WiFiScan::activeEapolSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t
num_eapol++; num_eapol++;
Serial.println("Received EAPOL:"); Serial.println("Received EAPOL:");
// for (int i = 0; i < len; i++) {
// char hexCar[3];
// snprintf(hexCar, 3, "%02X", snifferPacket->payload[i]);
// Serial.print(hexCar);
//Serial.print(snifferPacket->payload[i], HEX);
// if ((i + 1) % 16 == 0)
// Serial.print("\n");
// else
// Serial.print(" ");
// }
// Serial.print("\n");
} }
addPacket(snifferPacket, len); addPacket(snifferPacket, len);
@@ -3185,22 +3094,6 @@ void WiFiScan::addPacket(wifi_promiscuous_pkt_t *snifferPacket, int len) {
} }
} }
/*void WiFiScan::addLog(String log, int len) {
uint8_t *buf;
log.getBytes(buf, log.length());
bool save_packet = settings_obj.loadSetting<bool>(text_table4[7]);
if (save_packet) {
Serial.println("Saving data...");
#ifdef WRITE_PACKETS_SERIAL
buffer_obj.addPacket(buf, len);
#elif defined(HAS_SD)
sd_obj.addPacket(buf, len);
#else
return;
#endif
}
}*/
#ifdef HAS_SCREEN #ifdef HAS_SCREEN
void WiFiScan::eapolMonitorMain(uint32_t currentTime) void WiFiScan::eapolMonitorMain(uint32_t currentTime)
{ {
@@ -3262,8 +3155,6 @@ void WiFiScan::addPacket(wifi_promiscuous_pkt_t *snifferPacket, int len) {
set_channel--; set_channel--;
delay(70); delay(70);
display_obj.tft.fillRect(127, 0, 193, 28, TFT_BLACK); display_obj.tft.fillRect(127, 0, 193, 28, TFT_BLACK);
//display_obj.tftDrawXScaleButtons(x_scale);
//display_obj.tftDrawYScaleButtons(y_scale);
display_obj.tftDrawChannelScaleButtons(set_channel); display_obj.tftDrawChannelScaleButtons(set_channel);
display_obj.tftDrawExitScaleButtons(); display_obj.tftDrawExitScaleButtons();
changeChannel(); changeChannel();
@@ -3278,8 +3169,6 @@ void WiFiScan::addPacket(wifi_promiscuous_pkt_t *snifferPacket, int len) {
set_channel++; set_channel++;
delay(70); delay(70);
display_obj.tft.fillRect(127, 0, 193, 28, TFT_BLACK); display_obj.tft.fillRect(127, 0, 193, 28, TFT_BLACK);
//display_obj.tftDrawXScaleButtons(x_scale);
//display_obj.tftDrawYScaleButtons(y_scale);
display_obj.tftDrawChannelScaleButtons(set_channel); display_obj.tftDrawChannelScaleButtons(set_channel);
display_obj.tftDrawExitScaleButtons(); display_obj.tftDrawExitScaleButtons();
changeChannel(); changeChannel();
@@ -3297,8 +3186,6 @@ void WiFiScan::addPacket(wifi_promiscuous_pkt_t *snifferPacket, int len) {
} }
if (currentTime - initTime >= (GRAPH_REFRESH * 5)) { if (currentTime - initTime >= (GRAPH_REFRESH * 5)) {
//Serial.println("-----------------------------------------");
//Serial.println("Time elapsed: " + (String)(currentTime - initTime) + "ms");
x_pos += x_scale; x_pos += x_scale;
initTime = millis(); initTime = millis();
y_pos_x = ((-num_eapol * (y_scale * 3)) + (HEIGHT_1 - 2)); // GREEN y_pos_x = ((-num_eapol * (y_scale * 3)) + (HEIGHT_1 - 2)); // GREEN
@@ -3306,27 +3193,12 @@ void WiFiScan::addPacket(wifi_promiscuous_pkt_t *snifferPacket, int len) {
Serial.println("Max EAPOL number reached. Adjusting..."); Serial.println("Max EAPOL number reached. Adjusting...");
num_eapol = 0; num_eapol = 0;
} }
//y_pos_y = ((-num_deauth * (y_scale * 3)) + (HEIGHT_1 - 2)); // RED
//y_pos_z = ((-num_probe * (y_scale * 3)) + (HEIGHT_1 - 2)); // BLUE
//Serial.println("num_beacon: " + (String)num_beacon);
//Serial.println("num_deauth: " + (String)num_deauth);
//Serial.println(" num_probe: " + (String)num_probe);
//num_beacon = 0;
//num_probe = 0;
//num_deauth = 0;
//CODE FOR PLOTTING CONTINUOUS LINES!!!!!!!!!!!! //CODE FOR PLOTTING CONTINUOUS LINES!!!!!!!!!!!!
//Plot "X" value //Plot "X" value
display_obj.tft.drawLine(x_pos - x_scale, y_pos_x_old, x_pos, y_pos_x, TFT_CYAN); display_obj.tft.drawLine(x_pos - x_scale, y_pos_x_old, x_pos, y_pos_x, TFT_CYAN);
//Plot "Z" value
//display_obj.tft.drawLine(x_pos - x_scale, y_pos_z_old, x_pos, y_pos_z, TFT_BLUE);
//Plot "Y" value
//display_obj.tft.drawLine(x_pos - x_scale, y_pos_y_old, x_pos, y_pos_y, TFT_RED);
//Draw preceding black 'boxes' to erase old plot lines, !!!WEIRD CODE TO COMPENSATE FOR BUTTONS AND COLOR KEY SO 'ERASER' DOESN'T ERASE BUTTONS AND COLOR KEY!!! //Draw preceding black 'boxes' to erase old plot lines, !!!WEIRD CODE TO COMPENSATE FOR BUTTONS AND COLOR KEY SO 'ERASER' DOESN'T ERASE BUTTONS AND COLOR KEY!!!
//if ((x_pos <= 90) || ((x_pos >= 198) && (x_pos <= 320))) //above x axis
if ((x_pos <= 90) || ((x_pos >= 117) && (x_pos <= 320))) //above x axis if ((x_pos <= 90) || ((x_pos >= 117) && (x_pos <= 320))) //above x axis
{ {
display_obj.tft.fillRect(x_pos+1, 28, 10, 93, TFT_BLACK); //compensate for buttons! display_obj.tft.fillRect(x_pos+1, 28, 10, 93, TFT_BLACK); //compensate for buttons!
@@ -3335,8 +3207,6 @@ void WiFiScan::addPacket(wifi_promiscuous_pkt_t *snifferPacket, int len) {
{ {
display_obj.tft.fillRect(x_pos+1, 0, 10, 121, TFT_BLACK); //don't compensate for buttons! display_obj.tft.fillRect(x_pos+1, 0, 10, 121, TFT_BLACK); //don't compensate for buttons!
} }
//if ((x_pos >= 254) && (x_pos <= 320)) //below x axis
//if (x_pos <= 90)
if (x_pos < 0) // below x axis if (x_pos < 0) // below x axis
{ {
//tft.fillRect(x_pos+1, 121, 10, 88, TFT_BLACK); //tft.fillRect(x_pos+1, 121, 10, 88, TFT_BLACK);

37
esp32_marauder/WiFiScan.h
View File

@@ -3,13 +3,8 @@
#include "configs.h" #include "configs.h"
//#include <BLEDevice.h>
//#include <BLEUtils.h>
//#include <BLEScan.h>
//#include <BLEAdvertisedDevice.h>
#include <ArduinoJson.h> #include <ArduinoJson.h>
// Testing NimBLE
#ifdef HAS_BT #ifdef HAS_BT
#include <NimBLEDevice.h> #include <NimBLEDevice.h>
#endif #endif
@@ -32,9 +27,6 @@
#ifdef HAS_BATTERY #ifdef HAS_BATTERY
#include "BatteryInterface.h" #include "BatteryInterface.h"
#endif #endif
//#ifdef HAS_TEMP_SENSOR
// #include "TemperatureInterface.h"
//#endif
#include "settings.h" #include "settings.h"
#include "Assets.h" #include "Assets.h"
#ifdef MARAUDER_FLIPPER #ifdef MARAUDER_FLIPPER
@@ -44,7 +36,6 @@
#else #else
#include "LedInterface.h" #include "LedInterface.h"
#endif #endif
//#include "MenuFunctions.h"
#define bad_list_length 3 #define bad_list_length 3
@@ -99,9 +90,6 @@ extern Buffer buffer_obj;
#ifdef HAS_BATTERY #ifdef HAS_BATTERY
extern BatteryInterface battery_obj; extern BatteryInterface battery_obj;
#endif #endif
//#ifdef HAS_TEMP_SENSOR
// extern TemperatureInterface temp_obj;
//#endif
extern Settings settings_obj; extern Settings settings_obj;
#ifdef MARAUDER_FLIPPER #ifdef MARAUDER_FLIPPER
extern flipperLED flipper_led; extern flipperLED flipper_led;
@@ -112,7 +100,6 @@ extern Settings settings_obj;
#endif #endif
esp_err_t esp_wifi_80211_tx(wifi_interface_t ifx, const void *buffer, int len, bool en_sys_seq); esp_err_t esp_wifi_80211_tx(wifi_interface_t ifx, const void *buffer, int len, bool en_sys_seq);
//int ieee80211_raw_frame_sanity_check(int32_t arg, int32_t arg2, int32_t arg3);
/*struct ssid { /*struct ssid {
String essid; String essid;
@@ -218,22 +205,6 @@ class WiFiScan
/* SSID */ /* SSID */
/*36*/ 0x00 /*36*/ 0x00
}; };
/*uint8_t auth_packet[128] = {0xB0, 0x00, 0x3C, 0x00, // Frame Control, Duration
0x01, 0x02, 0x03, 0x04, 0x05, 0x06, // Dest
0x01, 0x02, 0x03, 0x04, 0x05, 0x06, // Source
0x01, 0x02, 0x03, 0x04, 0x05, 0x06, // Dest BSSID
0x00, 0x01, // Sequence number
0x00, 0x00, // Algo
0x01, 0x00, // Auth sequence number
0x00, 0x00, // Status Code
0x7F, 0x08,
0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x40,
0xDD, 0x0B, 0x00, 0x17, 0xF2, 0x0A, 0x00, 0x01, // Say it was Apple
0x04, 0x00, 0x00, 0x00, 0x00, 0xDD, 0x0A, 0x00,
0x10, 0x18, 0x02, 0x00, 0x00, 0x10, 0x00, 0x00,
0x00
};*/
uint8_t auth_packet[65] = {0xb0, 0x00, 0x3c, 0x00, uint8_t auth_packet[65] = {0xb0, 0x00, 0x3c, 0x00,
0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06,
0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06,
@@ -282,12 +253,7 @@ class WiFiScan
void broadcastCustomBeacon(uint32_t current_time, AccessPoint custom_ssid); void broadcastCustomBeacon(uint32_t current_time, AccessPoint custom_ssid);
void broadcastSetSSID(uint32_t current_time, char* ESSID); void broadcastSetSSID(uint32_t current_time, char* ESSID);
void RunAPScan(uint8_t scan_mode, uint16_t color); void RunAPScan(uint8_t scan_mode, uint16_t color);
//void RunRickRoll(uint8_t scan_mode, uint16_t color);
//void RunBeaconSpam(uint8_t scan_mode, uint16_t color);
//void RunProbeFlood(uint8_t scan_mode, uint16_t color);
//void RunDeauthFlood(uint8_t scan_mode, uint16_t color);
void RunMimicFlood(uint8_t scan_mode, uint16_t color); void RunMimicFlood(uint8_t scan_mode, uint16_t color);
//void RunBeaconList(uint8_t scan_mode, uint16_t color);
void RunPwnScan(uint8_t scan_mode, uint16_t color); void RunPwnScan(uint8_t scan_mode, uint16_t color);
void RunBeaconScan(uint8_t scan_mode, uint16_t color); void RunBeaconScan(uint8_t scan_mode, uint16_t color);
void RunRawScan(uint8_t scan_mode, uint16_t color); void RunRawScan(uint8_t scan_mode, uint16_t color);
@@ -304,7 +270,6 @@ class WiFiScan
static void scanCompleteCB(BLEScanResults scanResults); static void scanCompleteCB(BLEScanResults scanResults);
#endif #endif
//int ieee80211_raw_frame_sanity_check(int32_t arg, int32_t arg2, int32_t arg3);
public: public:
WiFiScan(); WiFiScan();
@@ -328,7 +293,6 @@ class WiFiScan
String dst_mac = "ff:ff:ff:ff:ff:ff"; String dst_mac = "ff:ff:ff:ff:ff:ff";
byte src_mac[6] = {}; byte src_mac[6] = {};
//lv_obj_t * scr = lv_cont_create(NULL, NULL);
wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT(); wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
wifi_config_t ap_config; wifi_config_t ap_config;
@@ -350,7 +314,6 @@ class WiFiScan
void changeChannel(); void changeChannel();
void changeChannel(int chan); void changeChannel(int chan);
void RunInfo(); void RunInfo();
void RunShutdownWiFi();
void RunShutdownBLE(); void RunShutdownBLE();
void RunGenerateSSIDs(int count = 20); void RunGenerateSSIDs(int count = 20);
void RunClearSSIDs(); void RunClearSSIDs();

BIN
mechanical/V6/MARAUDER_V6_BOTTOM_GPS.stl Normal file
View File

Binary file not shown.

BIN
mechanical/V6/MARAUDER_V6_BOTTOM_GPS_BRASS.stl Normal file
View File

Binary file not shown.