Beautified stuff

esp8266_deauther/A_config.h

@@ -11,7 +11,6 @@
 // =========================== //
 
 // ===================== LED CONFIG ==================== //
-
 /* = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
     Uncomment the type of LED  you're using
     Only one of them can be defined at a time!
@@ -20,6 +19,8 @@
 //#define RGB_LED
 //#define NEOPIXEL_LED
 
+#define HIGHLIGHT_LED 16
+
 /* = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
     Adjust following settings for your type of LED
     you can ignore the rest of the #define's
@@ -37,10 +38,11 @@
 // === Settings for Neopixel LED === //
 #define LED_NEOPIXEL_NUM 1
 #define LED_NEOPIXEL_PIN 15
-#define LED_NEOPIXEL_MODE NEO_GRB + NEO_KHZ800
+#define LED_NEOPIXEL_MODE NEO_GRBW + NEO_KHZ800
 //   NEO_KHZ800  800 KHz bitstream (most NeoPixel products w/WS2812 LEDs)
 //   NEO_KHZ400  400 KHz (classic 'v1' (not v2) FLORA pixels, WS2811 drivers)
 //   NEO_GRB     Pixels are wired for GRB bitstream (most NeoPixel products)
+//   NEO_GRBW    Pixels are wired for GRBW bitstream
 //   NEO_RGB     Pixels are wired for RGB bitstream (v1 FLORA pixels, not v2)
 //   NEO_RGBW    Pixels are wired for RGBW bitstream (NeoPixel RGBW products)
 
@@ -51,9 +53,9 @@
     Adjust the pins to match your setup
     Comment out the buttons you don't use.
    = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = */
-#define BUTTON_UP 14
+#define BUTTON_UP 12
-#define BUTTON_DOWN 12
+#define BUTTON_DOWN 13
-#define BUTTON_A 13
+#define BUTTON_A 14
 
 //#define BUTTON_LEFT 12
 //#define BUTTON_RIGHT 13
@@ -63,9 +65,11 @@
     Uncomment the type of display you're using
     Only one of them can be defined at a time!
    = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
- */
+    0x3c = I2C address
-#define DEAUTHER_DISPLAY SSD1306Wire display = SSD1306Wire(0x3c, 5, 4); // for 0.96" OLED
+    SDA = GPIO 5 (D1)  
-// #define DEAUTHER_DISPLAY SH1106Wire display = SH1106Wire(0x3c, 5, 4); // for 1.3" OLED
+    SCL/SCK = GPIO 4 (D2) */
+//#define DEAUTHER_DISPLAY SSD1306Wire display = SSD1306Wire(0x3c, 5, 4); // for 0.96" OLED
+#define DEAUTHER_DISPLAY SH1106Wire display = SH1106Wire(0x3c, 5, 4); // for 1.3" OLED
 
 /*  RST = GPIO 5 (D1)
     DC = GPIO 4 (D2)
@@ -78,4 +82,4 @@
 //#define FLIP_DIPLAY // uncomment that to flip the display vertically
 // ========================================================= //
 
-#endif // ifndef config_h
+#endif

esp8266_deauther/Accesspoints.cpp

@@ -7,7 +7,9 @@ Accesspoints::Accesspoints() {
 void Accesspoints::sort() {
     list->setCompare([](AP& a, AP& b) -> int {
         if (WiFi.RSSI(a.id) > WiFi.RSSI(b.id)) return -1;
+
         if (WiFi.RSSI(a.id) == WiFi.RSSI(b.id)) return 0;
+
         return 1;
     });
     list->sort();
@@ -17,7 +19,9 @@ void Accesspoints::sort() {
 void Accesspoints::sortAfterChannel() {
     list->setCompare([](AP& a, AP& b) -> int {
         if (WiFi.channel(a.id) < WiFi.channel(b.id)) return -1;
+
         if (WiFi.channel(a.id) == WiFi.channel(b.id)) return 0;
+
         return 1;
     });
     list->sort();

esp8266_deauther/LED.cpp

@@ -16,7 +16,7 @@ void LED::setup() {
   #elif defined(NEOPIXEL_LED)
     led = new LED::NeopixelLED(LED_NEOPIXEL_NUM, LED_NEOPIXEL_PIN, LED_MODE_BRIGHTNESS);
     led->setup();
-  #endif 
+  #endif // if defined(DIGITAL_LED)
 }
 
 void LED::update() {
@@ -40,15 +40,19 @@ void LED::setMode(uint8_t mode, bool force) {
         case LED_MODE::OFF:
             led->setColor(0, 0, 0);
             break;
+
         case LED_MODE::SCAN:
             led->setColor(0, 0, 255);
             break;
+
         case LED_MODE::ATTACK:
             led->setColor(255, 255, 0);
             break;
+
         case LED_MODE::DEAUTH:
             led->setColor(255, 0, 0);
             break;
+
         case LED_MODE::IDLE:
             led->setColor(0, 255, 0);
             break;
@@ -129,6 +133,7 @@ LED::AnalogRGBLED::AnalogRGBLED(uint8_t rPin, uint8_t gPin, uint8_t bPin, uint8_
     LED::AnalogRGBLED::rPin  = rPin;
     LED::AnalogRGBLED::gPin  = gPin;
     LED::AnalogRGBLED::bPin  = bPin;
+
     setBrightness(brightness);
 }
 

esp8266_deauther/Scan.cpp

@@ -412,14 +412,19 @@ String Scan::getMode(){
     switch (scanMode) {
     case SCAN_MODE_OFF:
         return String(SC_MODE_OFF);
+
     case SCAN_MODE_APS:
         return String(SC_MODE_AP);
+
     case SCAN_MODE_STATIONS:
         return String(SC_MODE_ST);
+
     case SCAN_MODE_ALL:
         return String(SC_MODE_ALL);
+
     case SCAN_MODE_SNIFFER:
         return String(SC_MODE_SNIFFER);
+
     default:
         return String();
     }

esp8266_deauther/Scan.h

@@ -39,8 +39,7 @@ class Scan {
         Scan();
 
         void sniffer(uint8_t* buf, uint16_t len);
-        void start(uint8_t mode, uint32_t time, uint8_t nextmode, uint32_t continueTime, bool channelHop,
+        void start(uint8_t mode, uint32_t time, uint8_t nextmode, uint32_t continueTime, bool channelHop, uint8_t channel);
-                   uint8_t channel);
         void start(uint8_t mode);
 
         void setup();

esp8266_deauther/Settings.cpp

@@ -19,57 +19,37 @@ void Settings::load() {
 
     // AP
     if (data.containsKey(keyword(S_SSID))) setSSID(data.get<String>(keyword(S_SSID)));
-
     if (data.containsKey(keyword(S_PASSWORD))) setPassword(data.get<String>(keyword(S_PASSWORD)));
-
     if (data.containsKey(keyword(S_CHANNEL))) setChannel(data.get<uint8_t>(keyword(S_CHANNEL)));
-
     if (data.containsKey(keyword(S_HIDDEN))) setHidden(data.get<bool>(keyword(S_HIDDEN)));
-
     if (data.containsKey(keyword(S_CAPTIVEPORTAL))) setCaptivePortal(data.get<bool>(keyword(S_CAPTIVEPORTAL)));
 
     // GENERAL
     if (data.containsKey(keyword(S_LANG))) setLang(data.get<String>(keyword(S_LANG)));
-
     if (data.containsKey(keyword(S_DISPLAYINTERFACE))) setDisplayInterface(data.get<bool>(keyword(S_DISPLAYINTERFACE)));
-
     if (data.containsKey(keyword(S_DISPLAY_TIMEOUT))) setDisplayTimeout(data.get<uint32_t>(keyword(S_DISPLAY_TIMEOUT)));
-
     if (data.containsKey(keyword(S_SERIALINTERFACE))) setCLI(data.get<bool>(keyword(S_SERIALINTERFACE)));
-
     if (data.containsKey(keyword(S_SERIAL_ECHO))) setSerialEcho(data.get<bool>(keyword(S_SERIAL_ECHO)));
-
     if (data.containsKey(keyword(S_WEBINTERFACE))) setWebInterface(data.get<bool>(keyword(S_WEBINTERFACE)));
-
     if (data.containsKey(keyword(S_WEB_SPIFFS))) setWebSpiffs(data.get<bool>(keyword(S_WEB_SPIFFS)));
-
     if (data.containsKey(keyword(S_LEDENABLED))) setLedEnabled(data.get<bool>(keyword(S_LEDENABLED)));
-
     if (data.containsKey(keyword(S_MACAP))) setMacAP(data.get<String>(keyword(S_MACAP)));
-
     if (data.containsKey(keyword(S_MACST))) setMacSt(data.get<String>(keyword(S_MACST)));
 
     // SCAN
     if (data.containsKey(keyword(S_CHTIME))) setChTime(data.get<uint16_t>(keyword(S_CHTIME)));
-
     if (data.containsKey(keyword(S_MIN_DEAUTHS))) setMinDeauths(data.get<uint16_t>(keyword(S_MIN_DEAUTHS)));
 
     // ATTACK
     if (data.containsKey(keyword(S_ATTACKTIMEOUT))) setAttackTimeout(data.get<uint32_t>(keyword(S_ATTACKTIMEOUT)));
-
     if (data.containsKey(keyword(S_FORCEPACKETS))) setForcePackets(data.get<uint8_t>(keyword(S_FORCEPACKETS)));
-
     if (data.containsKey(keyword(S_DEAUTHSPERTARGET))) setDeauthsPerTarget(data.get<uint16_t>(keyword(
                                                                                                   S_DEAUTHSPERTARGET)));
 
     if (data.containsKey(keyword(S_DEAUTHREASON))) setDeauthReason(data.get<uint8_t>(keyword(S_DEAUTHREASON)));
-
     if (data.containsKey(keyword(S_BEACONCHANNEL))) setBeaconChannel(data.get<bool>(keyword(S_BEACONCHANNEL)));
-
     if (data.containsKey(keyword(S_BEACONINTERVAL))) setBeaconInterval(data.get<bool>(keyword(S_BEACONINTERVAL)));
-
     if (data.containsKey(keyword(S_RANDOMTX))) setRandomTX(data.get<bool>(keyword(S_RANDOMTX)));
-
     if (data.containsKey(keyword(S_PROBESPERSSID))) setProbesPerSSID(data.get<uint8_t>(keyword(S_PROBESPERSSID)));
 
     if (version != VERSION) {
@@ -345,8 +325,6 @@ uint32_t Settings::getAutosaveTime() {
     return autosaveTime;
 }
 
-
-
 bool Settings::getBeaconInterval() {
     return beaconInterval;
 }
@@ -435,16 +413,19 @@ bool Settings::getWebSpiffs() {
 
 void Settings::setDeauthsPerTarget(uint16_t deauthsPerTarget) {
     Settings::deauthsPerTarget = deauthsPerTarget;
+
     changed = true;
 }
 
 void Settings::setDeauthReason(uint8_t deauthReason) {
     Settings::deauthReason = deauthReason;
+
     changed = true;
 }
 
 void Settings::setBeaconChannel(bool beaconChannel) {
     Settings::beaconChannel = beaconChannel;
+
     changed = true;
 }
 
@@ -457,16 +438,19 @@ void Settings::setForcePackets(uint8_t forcePackets) {
 
 void Settings::setAutosave(bool autosave) {
     Settings::autosave = autosave;
+
     changed = true;
 }
 
 void Settings::setAutosaveTime(uint32_t autosaveTime) {
     Settings::autosaveTime = autosaveTime;
+
     changed = true;
 }
 
 void Settings::setBeaconInterval(bool beaconInterval) {
     Settings::beaconInterval = beaconInterval;
+
     changed = true;
 }
 
@@ -504,21 +488,25 @@ void Settings::setPassword(String password) {
 
 void Settings::setCLI(bool cli) {
     Settings::cli = cli;
+
     changed = true;
 }
 
 void Settings::setDisplayInterface(bool displayInterface) {
     Settings::displayInterface = displayInterface;
+
     changed = true;
 }
 
 void Settings::setWebInterface(bool webInterface) {
     Settings::webInterface = webInterface;
+
     changed = true;
 }
 
 void Settings::setChTime(uint16_t chTime) {
     Settings::chTime = chTime;
+
     changed = true;
 }
 
@@ -560,16 +548,19 @@ bool Settings::setMacAP(uint8_t* macAP) {
 
 void Settings::setRandomTX(bool randomTX) {
     Settings::randomTX = randomTX;
+
     changed = true;
 }
 
 void Settings::setAttackTimeout(uint32_t attackTimeout) {
     Settings::attackTimeout = attackTimeout;
+
     changed = true;
 }
 
 void Settings::setLedEnabled(bool ledEnabled) {
     Settings::ledEnabled = ledEnabled;
+
     changed = true;
 }
 
@@ -582,35 +573,42 @@ void Settings::setProbesPerSSID(uint8_t probesPerSSID) {
 
 void Settings::setHidden(bool hidden) {
     Settings::hidden = hidden;
+
     changed = true;
 }
 
 void Settings::setCaptivePortal(bool captivePortal) {
     Settings::captivePortal = captivePortal;
+
     changed = true;
 }
 
 void Settings::setMinDeauths(uint16_t minDeauths) {
     Settings::minDeauths = minDeauths;
+
     changed = true;
 }
 
 void Settings::setDisplayTimeout(uint32_t displayTimeout) {
     Settings::displayTimeout = displayTimeout;
+
     changed = true;
 }
 
 void Settings::setLang(String lang) {
     Settings::lang = lang;
+
     changed = true;
 }
 
 void Settings::setSerialEcho(bool serialEcho) {
     Settings::serialEcho = serialEcho;
+
     changed = true;
 }
 
 void Settings::setWebSpiffs(bool webSpiffs) {
     Settings::webSpiffs = webSpiffs;
+
     changed = true;
 }

esp8266_deauther/Stations.cpp

@@ -29,7 +29,9 @@ int Stations::findStation(uint8_t* mac) {
 void Stations::sort() {
     list->setCompare([](Station& a, Station& b) -> int {
         if (*(a.pkts) > *(b.pkts)) return -1;
+
         if (*(a.pkts) == *(b.pkts)) return 0;
+
         return 1;
     });
     list->sort();
@@ -38,7 +40,9 @@ void Stations::sort() {
 void Stations::sortAfterChannel() {
     list->setCompare([](Station& a, Station& b) -> int {
         if (a.ch < b.ch) return -1;
+
         if (a.ch == b.ch) return 0;
+
         return 1;
     });
     list->sort();

esp8266_deauther/esp8266_deauther.ino

@@ -111,7 +111,7 @@ void setup() {
     // load Wifi settings: SSID, password,...
     #ifdef DEFAULT_SSID
     if (settings.getSSID() == "pwned") settings.setSSID(DEFAULT_SSID);
-    #endif
+    #endif // ifdef DEFAULT_SSID
     loadWifiConfigDefaults();
 
     // dis/enable serial command interface
@@ -162,6 +162,6 @@ void loop() {
         booted = true;
 #ifdef HIGHLIGHT_LED
         displayUI.setupLED();
-#endif
+#endif // ifdef HIGHLIGHT_LED
     }
 }

esp8266_deauther/functions.h

@@ -202,6 +202,7 @@ bool eqls(const char* str, const char* keywordPtr) {
     uint8_t lenKeyword = strlen(keyword);
 
     if (lenStr > lenKeyword) return false;  // string can't be longer than keyword (but can be smaller because of '/'
+
     // and ',')
 
     uint8_t a      = 0;
@@ -449,7 +450,6 @@ void strToColor(String str, uint8_t* buf) {
     for (uint8_t i = 0; i < 3; i++) buf[i] = strtoul((str.substring(i * 2, i * 2 + 2)).c_str(), NULL, 16);
 }
 
-
 String center(String a, int len) {
     int spaces = len - a.length();