gitea-mirror/ESP32Marauder
1
0
Fork 0
mirror of https://github.com/justcallmekoko/ESP32Marauder.git synced 2026-03-12 21:22:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1148 from justcallmekoko/develop

Browse Source 
Remove MAC track buttons, fix dimming
This commit is contained in:
Just Call Me Koko
2026-03-03 22:33:40 -05:00
committed by GitHub
parent 422fdf68d4 78283833c4
commit 36035536c3
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
esp32_marauder/Display.cpp
View File

@@ -112,7 +112,7 @@ bool Display::isTouchHeld(uint16_t threshold) {
void Display::init() {
tft.init();
#ifdef HAS_DUAL_BAND
#if defined(HAS_DUAL_BAND) && !defined(MARAUDER_MINI_V3)
digitalWrite(TFT_BL, HIGH);
#endif
}
@@ -504,7 +504,7 @@ void Display::clearScreen()
#ifndef MARAUDER_V7
tft.fillScreen(TFT_BLACK);
tft.setCursor(0, 0);
#elif defined(MARAUDER_MINI)
#elif defined(MARAUDER_MINI) || defined(MARAUDER_MINI_V3)
tft.fillRect(0, 0, TFT_WIDTH, TFT_HEIGHT, TFT_BLACK);
tft.setCursor(0, 0);
#else

13
esp32_marauder/WiFiScan.cpp
View File

@@ -465,7 +465,9 @@ extern "C" {
else if (wifi_scan_obj.currentScanMode == BT_SCAN_ALL) {
if (buf >= 0)
{
display_string.concat(text_table4[0]);
#ifndef HAS_MINI_SCREEN
display_string.concat(text_table4[0]);
#endif
display_string.concat(advertisedDevice->getRSSI());
Serial.print(advertisedDevice->getRSSI());
@@ -1254,7 +1256,9 @@ extern "C" {
else if (wifi_scan_obj.currentScanMode == BT_SCAN_ALL) {
if (buf >= 0)
{
display_string.concat(text_table4[0]);
#ifndef HAS_MINI_SCREEN
display_string.concat(text_table4[0]);
#endif
display_string.concat(advertisedDevice->getRSSI());
Serial.print(advertisedDevice->getRSSI());
@@ -5411,9 +5415,11 @@ void WiFiScan::RunProbeScan(uint8_t scan_mode, uint16_t color) {
//if (scan_mode != WIFI_SCAN_PROBE)
// display_obj.setupScrollArea(display_obj.TOP_FIXED_AREA_2, BOT_FIXED_AREA);
//else {
if (scan_mode != WIFI_SCAN_DETECT_FOLLOW) {
display_obj.tftDrawChannelScaleButtons(set_channel, false);
display_obj.tftDrawExitScaleButtons(false);
display_obj.tftDrawChanHopButton(false, settings_obj.loadSetting<bool>("ChanHop"));
}
//}
#endif
@@ -10450,7 +10456,8 @@ void WiFiScan::channelHop(bool filtered, bool ranged) {
(this->currentScanMode == WIFI_SCAN_PROBE) ||
(this->currentScanMode == WIFI_SCAN_DEAUTH) ||
(this->currentScanMode == WIFI_SCAN_EAPOL) ||
(this->currentScanMode == WIFI_SCAN_RAW_CAPTURE)))
(this->currentScanMode == WIFI_SCAN_RAW_CAPTURE) ||
(this->currentScanMode == WIFI_SCAN_PACKET_RATE)))
return;
if (!filtered) {

2
esp32_marauder/configs.h
View File

@@ -490,7 +490,7 @@
#endif
#ifdef MARAUDER_MINI_V3
#define HAS_TOUCH
//#define HAS_TOUCH
//#define HAS_FLIPPER_LED
//#define FLIPPER_ZERO_HAT
//#define HAS_BATTERY