mirror of
https://github.com/justcallmekoko/ESP32Marauder.git
synced 2026-01-30 08:44:25 -08:00
Compare commits
37 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
b0a823ac6b | ||
|
|
1e70c04894 | ||
|
|
069ff0a475 | ||
|
|
4fb65cd186 | ||
|
|
44f51d2f70 | ||
|
|
a1b02691d0 | ||
|
|
a54a311995 | ||
|
|
ebcfc9392e | ||
|
|
64f6b4c582 | ||
|
|
467c58fef3 | ||
|
|
2430db99b3 | ||
|
|
0196c00220 | ||
|
|
af9938f8eb | ||
|
|
0ba3d0f60a | ||
|
|
140668448f | ||
|
|
961bcb6cf5 | ||
|
|
774d5f0707 | ||
|
|
07a684a03e | ||
|
|
e3fe40ede0 | ||
|
|
8e0ed07483 | ||
|
|
249ba6eabe | ||
|
|
88762063ff | ||
|
|
9d2a1ab3aa | ||
|
|
a20b25a39c | ||
|
|
a785a3b125 | ||
|
|
380875d32f | ||
|
|
d03c079080 | ||
|
|
8ef5cf3b92 | ||
|
|
1dd5502c1d | ||
|
|
f5375eedaf | ||
|
|
86e2fb206a | ||
|
|
1d419605f7 | ||
|
|
dfd556da30 | ||
|
|
03623e2985 | ||
|
|
4e7f48a036 | ||
|
|
722b9ad88e | ||
|
|
0a5e200294 |
@@ -505,26 +505,21 @@ 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)
|
||||
@@ -550,8 +545,6 @@ void Display::displayBuffer(bool do_clear)
|
||||
|
||||
print_count--;
|
||||
}
|
||||
|
||||
this->printing = false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -493,11 +493,11 @@ extern "C" {
|
||||
|
||||
Serial.println();
|
||||
|
||||
if (!display_obj.printing) {
|
||||
display_obj.loading = true;
|
||||
display_obj.display_buffer->add(display_string);
|
||||
display_obj.loading = false;
|
||||
}
|
||||
while (display_obj.printing)
|
||||
delay(1);
|
||||
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(" ");
|
||||
}
|
||||
if (!display_obj.printing) {
|
||||
display_obj.loading = true;
|
||||
display_obj.display_buffer->add(display_string);
|
||||
display_obj.loading = false;
|
||||
}
|
||||
while (display_obj.printing)
|
||||
delay(1);
|
||||
display_obj.loading = true;
|
||||
display_obj.display_buffer->add(display_string);
|
||||
display_obj.loading = false;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@@ -1194,11 +1194,11 @@ extern "C" {
|
||||
|
||||
Serial.println();
|
||||
|
||||
if (!display_obj.printing) {
|
||||
display_obj.loading = true;
|
||||
display_obj.display_buffer->add(display_string);
|
||||
display_obj.loading = false;
|
||||
}
|
||||
while (display_obj.printing)
|
||||
delay(1);
|
||||
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(" ");
|
||||
}
|
||||
if (!display_obj.printing) {
|
||||
display_obj.loading = true;
|
||||
display_obj.display_buffer->add(display_string);
|
||||
display_obj.loading = false;
|
||||
}
|
||||
while (display_obj.printing)
|
||||
delay(1);
|
||||
display_obj.loading = true;
|
||||
display_obj.display_buffer->add(display_string);
|
||||
display_obj.loading = false;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@@ -1762,8 +1762,6 @@ void WiFiScan::RunSetup() {
|
||||
|
||||
this->shutdownBLE();
|
||||
|
||||
Serial.println("Initializing WiFi...");
|
||||
|
||||
esp_wifi_init(&cfg);
|
||||
#ifdef HAS_IDF_3
|
||||
esp_wifi_set_country(&country);
|
||||
@@ -1775,9 +1773,7 @@ void WiFiScan::RunSetup() {
|
||||
esp_wifi_get_mac(WIFI_IF_STA, this->sta_mac);
|
||||
delay(10);
|
||||
esp_wifi_get_mac(WIFI_IF_AP, this->ap_mac);
|
||||
Serial.println("Setting MAC...");
|
||||
this->setMac();
|
||||
Serial.println("Shutting down WiFi...");
|
||||
this->shutdownWiFi();
|
||||
#endif
|
||||
|
||||
@@ -2364,10 +2360,6 @@ bool WiFiScan::shutdownBLE() {
|
||||
|
||||
pBLEScan->clearResults();
|
||||
|
||||
delay(100);
|
||||
|
||||
Serial.println("Deinitializing NimBLE...");
|
||||
|
||||
//#ifndef HAS_DUAL_BAND
|
||||
NimBLEDevice::deinit();
|
||||
//#endif
|
||||
@@ -5038,7 +5030,7 @@ void WiFiScan::RunStationScan(uint8_t scan_mode, uint16_t color)
|
||||
display_obj.print_delay_2 = 10;
|
||||
display_obj.initScrollValues(true);
|
||||
display_obj.tft.setTextWrap(false);
|
||||
display_obj.tft.setTextColor(TFT_BLACK, color);
|
||||
display_obj.tft.setTextColor(TFT_WHITE, color);
|
||||
#ifdef HAS_FULL_SCREEN
|
||||
display_obj.tft.fillRect(0,16,TFT_WIDTH,16, color);
|
||||
display_obj.tft.drawCentreString(text_table1[59],TFT_WIDTH / 2,16,2);
|
||||
@@ -5319,8 +5311,6 @@ void WiFiScan::RunProbeScan(uint8_t scan_mode, uint16_t color)
|
||||
display_obj.tft.drawCentreString(text_table4[40],TFT_WIDTH / 2,16,2);
|
||||
else if (scan_mode == WIFI_SCAN_DETECT_FOLLOW)
|
||||
display_obj.tft.drawCentreString("MAC Monitor",TFT_WIDTH / 2,16,2);
|
||||
else if (scan_mode == WIFI_SCAN_STATION_WAR_DRIVE)
|
||||
display_obj.tft.drawCentreString("Station Wardrive",TFT_WIDTH / 2,16,2);
|
||||
else {
|
||||
Serial.println(F("Starting WiFi sniff for Flock..."));
|
||||
display_obj.tft.drawCentreString("Flock Sniff",TFT_WIDTH / 2,16,2);
|
||||
@@ -7711,11 +7701,7 @@ void WiFiScan::beaconSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type
|
||||
|
||||
Serial.print(F(" "));
|
||||
|
||||
if (!display_obj.printing) {
|
||||
display_obj.loading = true;
|
||||
display_obj.display_buffer->add(display_string);
|
||||
display_obj.loading = false;
|
||||
}
|
||||
display_obj.display_buffer->add(display_string);
|
||||
#endif
|
||||
|
||||
Serial.println();
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
//#define MARAUDER_V8
|
||||
//// END BOARD TARGETS
|
||||
|
||||
#define MARAUDER_VERSION "v1.10.2"
|
||||
#define MARAUDER_VERSION "v1.10.1"
|
||||
|
||||
#define GRAPH_REFRESH 100
|
||||
|
||||
@@ -42,8 +42,6 @@
|
||||
|
||||
#define DUAL_BAND_CHANNELS 51
|
||||
|
||||
#define DISPLAY_BUFFER_LIMIT 20
|
||||
|
||||
//// HARDWARE NAMES
|
||||
#ifdef MARAUDER_M5STICKC
|
||||
#define HARDWARE_NAME "M5Stick-C Plus"
|
||||
|
||||
Reference in New Issue
Block a user