gitea-mirror/esp8266_deauther
1
0
Fork 0
mirror of https://github.com/SpacehuhnTech/esp8266_deauther.git synced 2025-12-23 07:29:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

DIGITAL_LED can now be turned off by config

Browse Source
This commit is contained in:
tobozo
2018-05-27 15:28:17 +02:00
parent 8daf8cc91b
commit d43845003e
2 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
esp8266_deauther/SerialInterface.cpp
View File

@@ -657,7 +657,9 @@ void SerialInterface::runCommand(String input) {
// ===== STOP ===== // // ===== STOP ===== //
// stop [<mode>] // stop [<mode>]
else if (eqlsCMD(0, CLI_STOP)) { else if (eqlsCMD(0, CLI_STOP)) {
#ifdef DIGITAL_LED
led.setMode(LED_MODE_IDLE, true); led.setMode(LED_MODE_IDLE, true);
#endif
if (list->size() >= 2 && !(eqlsCMD(1, CLI_ALL))) { if (list->size() >= 2 && !(eqlsCMD(1, CLI_ALL))) {
for (int i = 1; i < list->size(); i++) { for (int i = 1; i < list->size(); i++) {
if (eqlsCMD(i, CLI_SCAN)) scan.stop(); if (eqlsCMD(i, CLI_SCAN)) scan.stop();
@@ -930,30 +932,45 @@ void SerialInterface::runCommand(String input) {
// ===== LED ===== // // ===== LED ===== //
// led <r> <g> <b> [<brightness>] // led <r> <g> <b> [<brightness>]
else if (list->size() >= 4 && list->size() <= 5 && eqlsCMD(0, CLI_LED)) { else if (list->size() >= 4 && list->size() <= 5 && eqlsCMD(0, CLI_LED)) {
if (list->size() == 4) if (list->size() == 4) {
#ifdef DIGITAL_LED
led.setColor(list->get(1).toInt(), list->get(2).toInt(), list->get(3).toInt()); led.setColor(list->get(1).toInt(), list->get(2).toInt(), list->get(3).toInt());
else #endif
} else {
#ifdef DIGITAL_LED
led.setColor(list->get(1).toInt(), list->get(2).toInt(), list->get(3).toInt(), list->get(4).toInt()); led.setColor(list->get(1).toInt(), list->get(2).toInt(), list->get(3).toInt(), list->get(4).toInt());
#endif
}
} }
// led <#rrggbb> [<brightness>] // led <#rrggbb> [<brightness>]
else if (list->size() >= 2 && list->size() <= 3 && eqlsCMD(0, CLI_LED) && list->get(1).charAt(0) == HASHSIGN) { else if (list->size() >= 2 && list->size() <= 3 && eqlsCMD(0, CLI_LED) && list->get(1).charAt(0) == HASHSIGN) {
uint8_t c[3]; uint8_t c[3];
strToColor(list->get(1), c); strToColor(list->get(1), c);
if (list->size() == 2) if (list->size() == 2) {
#ifdef DIGITAL_LED
led.setColor(c[0], c[1], c[2]); led.setColor(c[0], c[1], c[2]);
else #endif
} else {
#ifdef DIGITAL_LED
led.setColor(c[0], c[1], c[2], list->get(2).toInt()); led.setColor(c[0], c[1], c[2], list->get(2).toInt());
#endif
}
} }
// led <enable/disable> // led <enable/disable>
else if (list->size() == 2 && eqlsCMD(0, CLI_LED)) { else if (list->size() == 2 && eqlsCMD(0, CLI_LED)) {
if (eqlsCMD(1, CLI_ENABLE)) if (eqlsCMD(1, CLI_ENABLE)) {
#ifdef DIGITAL_LED
led.tempEnable(); led.tempEnable();
else if (eqlsCMD(1, CLI_DISABLE)) #endif
} else if (eqlsCMD(1, CLI_DISABLE)) {
#ifdef DIGITAL_LED
led.tempDisable(); led.tempDisable();
else #endif
} else {
parameterError(list->get(1)); parameterError(list->get(1));
}
} }
@@ -968,7 +985,9 @@ void SerialInterface::runCommand(String input) {
scan.update(); // run scan scan.update(); // run scan
attack.update(); // run attacks attack.update(); // run attacks
ssids.update(); // run random mode, if enabled ssids.update(); // run random mode, if enabled
#ifdef DIGITAL_LED
led.update(); // update LED color led.update(); // update LED color
#endif
// auto-save // auto-save
if (settings.getAutosave() && currentTime - autosaveTime > settings.getAutosaveTime()) { if (settings.getAutosave() && currentTime - autosaveTime > settings.getAutosaveTime()) {

4
esp8266_deauther/esp8266_deauther.ino
View File

@@ -120,7 +120,9 @@ void setup() {
scan.setup(); scan.setup();
// set LED // set LED
#ifdef DIGITAL_LED
led.setup(); led.setup();
#endif
// set channel // set channel
setWifiChannel(settings.getChannel()); setWifiChannel(settings.getChannel());
@@ -157,7 +159,9 @@ void loop() {
serialInterface.update(); // read and run serial input serialInterface.update(); // read and run serial input
scan.update(); // run scan scan.update(); // run scan
ssids.update(); // run random mode, if enabled ssids.update(); // run random mode, if enabled
#ifdef DIGITAL_LED
led.update(); // update LED color led.update(); // update LED color
#endif
// auto-save // auto-save
if (settings.getAutosave() && currentTime - autosaveTime > settings.getAutosaveTime()) { if (settings.getAutosave() && currentTime - autosaveTime > settings.getAutosaveTime()) {