Merge pull request #2279 from BruceDevices/dev

Dev
2026-03-13 10:12:21 +08:00 · 2026-03-10 21:30:50 -03:00
parent 371aae90ef 9934c5bbff
commit 3b180ab0bd
16 changed files with 607 additions and 386 deletions
--- a/boards/CYD-2432S028/CYD-2432S028.ini
+++ b/boards/CYD-2432S028/CYD-2432S028.ini
@@ -16,11 +16,9 @@ board_build.partitions = custom_4Mb_full.csv
 build_src_filter =${env.build_src_filter} +<../boards/CYD-2432S028>
 build_flags =
 	${env.build_flags}
+	${env_4mb.build_flags}
 	-Iboards/CYD-2432S028
-	-Os

-	-DCORE_DEBUG_LEVEL=0
-	-DCONFIG_ESP32_JTAG_SUPPORT_DISABLE=1
 	;-DARDUINO_USB_CDC_ON_BOOT=1  ; Used only in ESP32-S3 to make Serial Comands work

 	-DCYD=1 	;key for new device,
@@ -162,10 +160,10 @@ build_flags =

 lib_deps =
 	${env.lib_deps}
+
 lib_ignore =
-	FastLED
-	ESP8266Audio
-	ESP8266SAM
+	${env_4mb.lib_ignore}
+

 [CYD35_base]
 board = CYD-2432S028
@@ -174,11 +172,10 @@ board_build.partitions = custom_4Mb_full.csv
 build_src_filter =${env.build_src_filter} +<../boards/CYD-2432S028>
 build_flags =
 	${env.build_flags}
-	-Iboards/CYD-2432S028
-	-Os
+	${env_4mb.build_flags}
+
+	-Iboards/CYD-2432S028

-	-DCORE_DEBUG_LEVEL=0
-	-DCONFIG_ESP32_JTAG_SUPPORT_DISABLE=1
 	;-DARDUINO_USB_CDC_ON_BOOT=1  ; Used only in ESP32-S3 to make Serial Comands work

 	-DCYD=1 	;key for new device,
@@ -321,10 +318,10 @@ build_flags =

 lib_deps =
 	${env.lib_deps}
+
 lib_ignore =
-	FastLED
-	ESP8266Audio
-	ESP8266SAM
+	${env_4mb.lib_ignore}
+

 ##################################### CYD MODELS ####################################################
 [env:CYD-2432S028]
--- a/boards/lilygo-t-deck/lilygo-t-deck.ini
+++ b/boards/lilygo-t-deck/lilygo-t-deck.ini
@@ -170,7 +170,7 @@ build_flags =

 lib_deps =
 	${env.lib_deps}
-	lewisxhe/SensorLib
+	lewisxhe/SensorLib@0.3.4


 [env:lilygo-t-deck]
--- a/boards/lilygo-t-display-ttgo/lilygo-t-display-s3.ini
+++ b/boards/lilygo-t-display-ttgo/lilygo-t-display-s3.ini
@@ -4,10 +4,8 @@ board_build.partitions = custom_4Mb_full.csv
 build_src_filter =${env.build_src_filter} +<../boards/lilygo-t-display-ttgo>
 build_flags =
 	${env.build_flags}
+	${env_4mb.build_flags}
 	-Iboards/lilygo-t-display-ttgo
-	-Os
-	-DCORE_DEBUG_LEVEL=0
-	-DCONFIG_ESP32_JTAG_SUPPORT_DISABLE=1
 	-DREDRAW_DELAY=1 # Used to improve navigation on menus for this device

 	-DALLOW_ALL_GPIO_FOR_IR_RF=1 ; Set this option to make use of all GPIOs, from 1 to 44 to be chosen, except TFT and SD pins
@@ -19,3 +17,6 @@ build_flags =
 lib_deps =
 	${env.lib_deps}
 	https://github.com/bmorcelli/ESP32_Button
+
+lib_ignore =
+	${env_4mb.lib_ignore}
--- a/boards/lilygo-t-lora-pager/lilygo-t-lora-pager.ini
+++ b/boards/lilygo-t-lora-pager/lilygo-t-lora-pager.ini
@@ -15,7 +15,7 @@ build_flags =
 lib_deps =
 	${env.lib_deps}
 	lewisxhe/XPowersLib @0.3.0
-	lewisxhe/SensorLib
+	lewisxhe/SensorLib@0.3.4
 	mathertel/RotaryEncoder @1.5.3
 	adafruit/Adafruit TCA8418 @ ^1.0.2
 	# renovate: datasource=github-tags depName=pschatzmann_arduino-audio-driver packageName=pschatzmann/arduino-audio-driver
--- a/boards/lilygo-t-watch-s3/lilygo-t-watch-s3.ini
+++ b/boards/lilygo-t-watch-s3/lilygo-t-watch-s3.ini
@@ -180,4 +180,4 @@ build_flags =
 lib_deps =
 	${env.lib_deps}
 	lewisxhe/XPowersLib @0.2.7
-	https://github.com/lewisxhe/SensorLib
+	lewisxhe/SensorLib@0.3.4
--- a/boards/m5stack-core/m5stack-core.ini
+++ b/boards/m5stack-core/m5stack-core.ini
@@ -16,8 +16,6 @@ build_src_filter =${env.build_src_filter} +<../boards/m5stack-core>
 build_flags =
 	${env.build_flags}
 	-Iboards/m5stack-core
-	-DCORE_DEBUG_LEVEL=0
-	-DCONFIG_ESP32_JTAG_SUPPORT_DISABLE=1

 	;Features Enabled
 	;FM Radio
@@ -156,8 +154,12 @@ lib_deps =
 [env:m5stack-core4mb]
 extends=m5stack-core_base

+lib_ignore =
+	${env_4mb.lib_ignore}
+
 build_flags =
 	${m5stack-core_base.build_flags}
+	${env_4mb.build_flags}
 	-DLITE_VERSION=1 #limits some features to save space for M5Launcher Compatibility


--- a/boards/m5stack-cplus1_1/m5stack-cplus1_1.ini
+++ b/boards/m5stack-cplus1_1/m5stack-cplus1_1.ini
@@ -14,10 +14,9 @@ board_build.partitions = custom_4Mb_full.csv
 build_src_filter =${env.build_src_filter} +<../boards/m5stack-cplus1_1>
 build_flags =
 	${env.build_flags}
+	${env_4mb.build_flags}
+
 	-Iboards/m5stack-cplus1_1
-	-Os
-	-DCORE_DEBUG_LEVEL=0
-	-DCONFIG_ESP32_JTAG_SUPPORT_DISABLE=1

 	;Features Enabled
 	;-DLITE_VERSION=1 ;limits some features to save space for M5Launcher Compatibility
@@ -139,6 +138,9 @@ build_flags =
 lib_deps =
 	${env.lib_deps}

+lib_ignore =
+	${env_4mb.lib_ignore}
+
 [env:LAUNCHER_m5stack-cplus1_1]
 extends=env:m5stack-cplus1_1
 board_build.partitions = custom_4Mb.csv
--- a/boards/marauder-mini/marauder-mini.ini
+++ b/boards/marauder-mini/marauder-mini.ini
@@ -14,10 +14,10 @@ board_build.partitions = custom_4Mb_full.csv
 build_src_filter =${env.build_src_filter} +<../boards/marauder-mini>
 build_flags =
 	${env.build_flags}
+	${env_4mb.build_flags}
+
 	-Iboards/marauder-mini
-	-Os
-	-DCORE_DEBUG_LEVEL=0
-	-DCONFIG_ESP32_JTAG_SUPPORT_DISABLE=1
+
 	-D MARAUDER_MINI
 	-DUSER_SETUP_LOADED=1
 	-DST7735_DRIVER=1
@@ -44,6 +44,9 @@ build_flags =
 lib_deps =
 	${env.lib_deps}

+lib_ignore =
+	${env_4mb.lib_ignore}
+
 [env:Awok-Mini]
 extends = env:Marauder-Mini
 board_build.partitions = custom_16Mb.csv
@@ -56,10 +59,9 @@ board_build.partitions = custom_4Mb_full.csv
 build_src_filter =${env.build_src_filter} +<../boards/marauder-mini>
 build_flags =
 	${env.build_flags}
+	${env_4mb.build_flags}
 	-Iboards/marauder-mini
-	-Os
-	-DCORE_DEBUG_LEVEL=0
-	-DCONFIG_ESP32_JTAG_SUPPORT_DISABLE=1
+
 	-D MARAUDER_MINI
 	-DUSER_SETUP_LOADED=1
 	-DILI9341_DRIVER=1
@@ -82,6 +84,8 @@ build_flags =
 lib_deps =
 	${env.lib_deps}

+lib_ignore =
+	${env_4mb.lib_ignore}

 [env:LAUNCHER_Marauder-Mini]
 extends=env:Marauder-Mini
--- a/boards/marauder-touch/marauder-touch.ini
+++ b/boards/marauder-touch/marauder-touch.ini
@@ -14,11 +14,10 @@ board_build.partitions = custom_4Mb_full.csv
 build_src_filter =${env.build_src_filter} +<../boards/marauder-touch>
 build_flags =
 	${env.build_flags}
+	${env_4mb.build_flags}
+
 	-Iboards/marauder-touch
-	-Os
 	-DUSE_TFT_eSPI_TOUCH
-	-DCORE_DEBUG_LEVEL=0
-	-DCONFIG_ESP32_JTAG_SUPPORT_DISABLE=1

 	-D SDCARD_CS=12
 	-D MARAUDER_TOUCH
@@ -36,6 +35,9 @@ build_flags =
 lib_deps =
 	${env.lib_deps}

+lib_ignore =
+	${env_4mb.lib_ignore}
+
 [env:Marauder-v61]
 extends=env:Marauder-V4-V6
 build_flags =
--- a/boards/phantom/phantom.ini
+++ b/boards/phantom/phantom.ini
@@ -16,11 +16,8 @@ board_build.partitions = custom_4Mb_full.csv
 build_src_filter =${env.build_src_filter} +<../boards/phantom>
 build_flags =
 	${env.build_flags}
+	${env_4mb.build_flags}
 	-Iboards/phantom
-	-Os
-	-DCORE_DEBUG_LEVEL=0
-	-DCONFIG_ESP32_JTAG_SUPPORT_DISABLE=1
-	;-DARDUINO_USB_CDC_ON_BOOT=1  ; Used only in ESP32-S3 to make Serial Comands work

 	-DPHANTOM_BOARD=1 ;key for new device,
 					;mykeyboard.cpp: need map buttons an/or touchscreen and battery status value,
@@ -171,6 +168,9 @@ build_flags =
 lib_deps =
 	${env.lib_deps}

+lib_ignore =
+	${env_4mb.lib_ignore}
+

 [env:LAUNCHER_Phantom_S024R]
 extends = env:Phantom_S024R
--- a/custom_4Mb_full.csv
+++ b/custom_4Mb_full.csv
@@ -1,4 +1,4 @@
 # Name,   Type, SubType, Offset,  Size, Flags
 nvs,      data, nvs,     0x9000,  0x6000,
-app0,     app,  ota_0,   0x10000, 0x390000,
-spiffs,   data, spiffs,  0x3A0000,0x60000,
+app0,     app,  ota_0,   0x10000, 0x3C0000,
+spiffs,   data, spiffs,  0x3D0000,0x30000,
--- a/platformio.ini
+++ b/platformio.ini
@@ -262,3 +262,32 @@ lib_deps =
 	ESP32Async/AsyncTCP@3.4.10
 	ESP32Async/ESPAsyncWebServer@3.9.6
 	;https://github.com/bmorcelli/FastLED
+
+[env_4mb]
+extends = env
+build_flags =
+	-Os
+	-DCORE_DEBUG_LEVEL=0
+	-DCONFIG_ESP32_JTAG_SUPPORT_DISABLE=1
+	# Restrict IR protocols to save Flash on 4mb devices
+	-D_IR_ENABLE_DEFAULT_=false
+	-DDECODE_NEC=true
+	-DSEND_NEC=true
+	-DDECODE_SAMSUNG=true
+	-DSEND_SAMSUNG=true
+	-DDECODE_RC5=true
+	-DSEND_RC5=true
+	-DDECODE_RC6=true
+	-DSEND_RC6=true
+	-DDECODE_LG=true
+	-DSEND_LG=true
+	-DDECODE_SONY=true
+	-DSEND_SONY=true
+	-DSEND_PANASONIC=true
+	-DDECODE_PANASONIC=true
+	-DSEND_RAW=true
+
+lib_ignore =
+	FastLED
+	ESP8266Audio
+	ESP8266SAM
--- a/src/modules/ble/BLE_Suite.cpp
+++ b/src/modules/ble/BLE_Suite.cpp
@@ -7,7 +7,6 @@
 #include "fastpair_crypto.h"
 #include "modules/NRF24/nrf_jammer_api.h"
 #include <SD.h>
-#include <TFT_eSPI.h>
 #include <esp_heap_caps.h>
 #include <globals.h>

--- a/src/modules/others/mic.cpp
+++ b/src/modules/others/mic.cpp
@@ -1008,8 +1008,8 @@ bool mic_capture_samples(
                         .mclk = I2S_GPIO_UNUSED,
                         .bclk = (gpio_num_t)PIN_CLK,
                         .ws = (gpio_num_t)PIN_WS,
-                         .din = (gpio_num_t)PIN_DATA,
                         .dout = I2S_GPIO_UNUSED,
+                         .din = (gpio_num_t)PIN_DATA,
                         .invert_flags = {.mclk_inv = false, .bclk_inv = false, .ws_inv = false},
                         },
        };
--- a/src/modules/wifi/karma_attack.cpp
+++ b/src/modules/wifi/karma_attack.cpp
--- a/src/modules/wifi/karma_attack.h
+++ b/src/modules/wifi/karma_attack.h
@@ -25,7 +25,7 @@ struct BroadcastConfig {
    bool rotateChannels = true;         // Auto-rotate channels
    uint32_t channelHopInterval = 5000; // ms between channel hops
    bool respondToProbes = true;        // Launch attacks on probe responses
-    uint8_t maxActiveAttacks = 3;       // Max simultaneous attacks
+    uint8_t maxActiveAttacks = 3;       // Max queued auto-attacks
    bool prioritizeResponses = true;    // Focus on SSIDs that get responses
 };

@@ -56,16 +56,21 @@ typedef struct {
    uint8_t ieCount;            // Number of IEs
 } ClientFingerprint;

+constexpr size_t PROBE_MAC_STR_LEN = 18;
+constexpr size_t PROBE_SSID_MAX_LEN = 32;
+constexpr size_t PROBE_SSID_BUF_LEN = PROBE_SSID_MAX_LEN + 1;
+constexpr size_t PROBE_FRAME_CAPTURE_LEN = 128;
+
 // Probe request data structure
 typedef struct {
-    String mac;
-    String ssid;
-    int rssi;
-    unsigned long timestamp;
+    char mac[PROBE_MAC_STR_LEN];
+    char ssid[PROBE_SSID_BUF_LEN];
+    int8_t rssi;
+    uint32_t timestamp;
    uint8_t channel;
-    uint8_t frame[128];
    uint16_t frame_len;
    uint32_t fingerprint; // Hash of IE parameters for device tracking
+    uint8_t *frame;
 } ProbeRequest;

 // Client behavior tracking (keyed by fingerprint, not MAC)
@@ -134,7 +139,7 @@ typedef struct {
    uint32_t probeCount;
 } PendingPortal;

-// Background portal instance for multi-portal management
+// Single active portal instance
 struct BackgroundPortal {
    EvilPortal *instance;             // Portal instance
    String portalId;                  // Unique ID for file naming
@@ -144,10 +149,7 @@ struct BackgroundPortal {
    unsigned long launchTime;         // When portal was launched
    bool hasCreds;                    // Whether credentials captured
    String capturedPassword;          // Captured password if any
-    bool victimConnected;             // Whether a victim is actively connected
-    unsigned long lastClientActivity; // Last time victim interacted
    uint32_t clientFingerprint;       // Fingerprint of connected victim
-    bool markedForRemoval;            // Flag for cleanup after capture
 };

 // Karma configuration
@@ -237,10 +239,10 @@ private:
 // SSID Database class
 class SSIDDatabase {
 private:
-    static std::vector<String> ssidCache;
-    static bool cacheLoaded;
    static String currentFilename;
    static bool useLittleFS;
+    static FS *openSourceFs();
+    static bool readNextEntry(File &file, String &line);
    static bool loadFromFile();

 public:
@@ -306,22 +308,5 @@ String getDisplayName(const String &fullPath, bool isSD);
 void matchAPSignal(uint8_t channel);
 void setChannelWithSecond(uint8_t channel); // Helper for channel setting

-// External variables
-extern std::map<uint32_t, ClientBehavior> clientBehaviors; // Keyed by fingerprint
-extern ProbeRequest probeBuffer[200];
-extern uint16_t probeBufferIndex;
-extern bool bufferWrapped;
-extern KarmaConfig karmaConfig;
-extern AttackConfig attackConfig;
-extern ActiveBroadcastAttack broadcastAttack;
-extern bool screenNeedsRedraw;
-extern uint32_t pmkidCaptured;
-extern uint32_t assocBlocked;
-extern std::vector<BackgroundPortal *> activePortals; // Note: pointer vector
-extern KarmaMode currentMode;
-extern bool karmaPaused;
-extern bool handshakeCaptureEnabled;
-extern std::vector<HandshakeCapture> handshakeBuffer;
-
 #endif
 #endif