Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #660

Merged
merged 5 commits into from
Feb 7, 2025
Merged

Develop #660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0eb03ce
Merge pull request #655 from justcallmekoko/master
justcallmekoko Feb 5, 2025
c2fb967
Merge pull request #659 from justcallmekoko/master
justcallmekoko Feb 7, 2025
15faac8
Fix status LED for bluetooth stuff
justcallmekoko Feb 7, 2025
1942387
Update shop link
justcallmekoko Feb 7, 2025
1bd452e
Comment board definitions
justcallmekoko Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
54 changes: 43 additions & 11 deletions esp32_marauder/WiFiScan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
}

Expand Down Expand Up @@ -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
}

Expand Down Expand Up @@ -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
}
Expand Down