From 15faac8cfee48fbb00d401fe56bfbd7755a96989 Mon Sep 17 00:00:00 2001 From: Just Call Me Koko Date: Fri, 7 Feb 2025 15:39:28 -0500 Subject: [PATCH 1/3] Fix status LED for bluetooth stuff --- esp32_marauder/WiFiScan.cpp | 54 +++++++++++++++++++++++++++++-------- esp32_marauder/configs.h | 2 +- 2 files changed, 44 insertions(+), 12 deletions(-) diff --git a/esp32_marauder/WiFiScan.cpp b/esp32_marauder/WiFiScan.cpp index 2db0e91dc..a32a53662 100644 --- a/esp32_marauder/WiFiScan.cpp +++ b/esp32_marauder/WiFiScan.cpp @@ -918,23 +918,23 @@ bool WiFiScan::shutdownBLE() { pBLEScan->clearResults(); NimBLEDevice::deinit(); - - #ifdef MARAUDER_FLIPPER - flipper_led.offLED(); - #elif defined(XIAO_ESP32_S3) - xiao_led.offLED(); - #elif defined(MARAUDER_M5STICKC) - stickc_led.offLED(); - #else - led_obj.setMode(MODE_OFF); - #endif this->ble_initialized = false; - return true; } else { return false; } + + #ifdef MARAUDER_FLIPPER + flipper_led.offLED(); + #elif defined(XIAO_ESP32_S3) + xiao_led.offLED(); + #elif defined(MARAUDER_M5STICKC) + stickc_led.offLED(); + #else + led_obj.setMode(MODE_OFF); + #endif + #endif return true; @@ -2712,6 +2712,17 @@ void WiFiScan::RunSourApple(uint8_t scan_mode, uint16_t color) { #endif this->ble_initialized; + + #ifdef MARAUDER_FLIPPER + flipper_led.sniffLED(); + #elif defined(XIAO_ESP32_S3) + xiao_led.sniffLED(); + #elif defined(MARAUDER_M5STICKC) + stickc_led.sniffLED(); + #else + led_obj.setMode(MODE_SNIFF); + #endif + #endif } @@ -2747,6 +2758,16 @@ void WiFiScan::RunSwiftpairSpam(uint8_t scan_mode, uint16_t color) { #endif this->ble_initialized; + + #ifdef MARAUDER_FLIPPER + flipper_led.attackLED(); + #elif defined(XIAO_ESP32_S3) + xiao_led.attackLED(); + #elif defined(MARAUDER_M5STICKC) + stickc_led.attackLED(); + #else + led_obj.setMode(MODE_ATTACK); + #endif #endif } @@ -2864,6 +2885,17 @@ void WiFiScan::RunBluetoothScan(uint8_t scan_mode, uint16_t color) pBLEScan->start(0, scanCompleteCB, false); Serial.println("Started BLE Scan"); this->ble_initialized = true; + + #ifdef MARAUDER_FLIPPER + flipper_led.sniffLED(); + #elif defined(XIAO_ESP32_S3) + xiao_led.sniffLED(); + #elif defined(MARAUDER_M5STICKC) + stickc_led.sniffLED(); + #else + led_obj.setMode(MODE_SNIFF); + #endif + initTime = millis(); #endif } diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index a19a1e28a..fef77ac7e 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -18,7 +18,7 @@ //#define GENERIC_ESP32 //#define MARAUDER_FLIPPER //#define ESP32_LDDB - //#define MARAUDER_DEV_BOARD_PRO + #define MARAUDER_DEV_BOARD_PRO //#define XIAO_ESP32_S3 //#define MARAUDER_REV_FEATHER //// END BOARD TARGETS From 19423871a829dd233d810f91f74dac027a6d6edc Mon Sep 17 00:00:00 2001 From: Just Call Me Koko Date: Fri, 7 Feb 2025 15:40:41 -0500 Subject: [PATCH 2/3] Update shop link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 249254c64..0786dc9c5 100644 --- a/README.md +++ b/README.md @@ -25,4 +25,4 @@ Download the [latest release](https://github.com/justcallmekoko/ESP32Marauder/re Check out the project [wiki](https://github.com/justcallmekoko/ESP32Marauder/wiki) for a full overview of the ESP32 Marauder # For Sale Now -You can buy the ESP32 Marauder using [this link](https://www.tindie.com/products/justcallmekoko/esp32-marauder/) +You can buy the ESP32 Marauder using [this link](https://www.justcallmekokollc.com) From 1bd452ed77aa7a0c8ed627b8bb655e5a11b21ed2 Mon Sep 17 00:00:00 2001 From: Just Call Me Koko Date: Fri, 7 Feb 2025 15:47:38 -0500 Subject: [PATCH 3/3] Comment board definitions --- esp32_marauder/configs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index fef77ac7e..a19a1e28a 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -18,7 +18,7 @@ //#define GENERIC_ESP32 //#define MARAUDER_FLIPPER //#define ESP32_LDDB - #define MARAUDER_DEV_BOARD_PRO + //#define MARAUDER_DEV_BOARD_PRO //#define XIAO_ESP32_S3 //#define MARAUDER_REV_FEATHER //// END BOARD TARGETS