diff --git a/configs/deauther_boy.txt b/configs/DSTIKE_Deauther_OLED_v1-v1.5/A_config.h similarity index 82% rename from configs/deauther_boy.txt rename to configs/DSTIKE_Deauther_OLED_v1-v1.5/A_config.h index 7c56c09..644f369 100644 --- a/configs/deauther_boy.txt +++ b/configs/DSTIKE_Deauther_OLED_v1-v1.5/A_config.h @@ -15,9 +15,9 @@ Uncomment the type of LED you're using Only one of them can be defined at a time! = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = */ -//#define DIGITAL_LED +#define DIGITAL_LED //#define RGB_LED -#define NEOPIXEL_LED +//#define NEOPIXEL_LED /* = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = Adjust following settings for your type of LED @@ -30,9 +30,9 @@ // === Settings for Digital LED and RGB LED === // #define LED_CATHODE false // common ground (GND) -#define LED_PIN_R 2 // ESP-12 LED +#define LED_PIN_R 16 // NodeMCU on-board LED #define LED_PIN_G 0 -#define LED_PIN_B 16 // NodeMCU on-board LED +#define LED_PIN_B 2 // ESP-12 LED // === Settings for RGB LED and Neopixel LED === // #define LED_MODE_BRIGHTNESS 10 // brightness of LED modes @@ -40,7 +40,7 @@ // === Settings for Neopixel LED === // #define LED_NEOPIXEL_NUM 1 -#define LED_NEOPIXEL_PIN 15 +#define LED_NEOPIXEL_PIN 9 // if it doesn't work try changing NEO_GRB to NEO_GRBW #define LED_NEOPIXEL Adafruit_NeoPixel(LED_NEOPIXEL_NUM, LED_NEOPIXEL_PIN, NEO_GRB + NEO_KHZ800) @@ -51,12 +51,13 @@ Adjust the pins to match your setup Comment out the buttons you don't use. = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = */ -#define BUTTON_UP 10 -#define BUTTON_DOWN 9 -#define BUTTON_LEFT 0 -#define BUTTON_RIGHT 13 +#define BUTTON_UP 12 +#define BUTTON_DOWN 13 #define BUTTON_A 14 -#define BUTTON_B 12 + +//#define BUTTON_LEFT 12 +//#define BUTTON_RIGHT 13 +//#define BUTTON_B 10 /* = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = Uncomment the type of display you're using @@ -65,8 +66,8 @@ 0x3c = I2C address SDA = GPIO 5 (D1) 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 +#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) diff --git a/configs/DSTIKE_Deauther_OLED_v1-v1.5/README.md b/configs/DSTIKE_Deauther_OLED_v1-v1.5/README.md new file mode 100644 index 0000000..947574b --- /dev/null +++ b/configs/DSTIKE_Deauther_OLED_v1-v1.5/README.md @@ -0,0 +1,18 @@ +# DSTIKE Deauther OLED v1 - v1.5 + +| | | +| - | - | +| LED Type | Digital | +| LED R | GPIO 2 | +| LED G | disabled | +| LED B | GPIO 16 | +| Display and buttons enabled | YES | +| Display Driver | SSD1306 | +| Display SDA | GPIO 5 (D1) | +| Display SCL | GPIO 4 (D2) | +| Button Up |GPIO 12 | +| Button Down | GPIO 13 | +| Button Left | disabled | +| Button Right | disabled | +| Button A | GPIO 14 | +| Button B |disabled | \ No newline at end of file diff --git a/configs/deauther_board_oled.txt b/configs/DSTIKE_Deauther_OLED_v2-v3/A_config.h similarity index 100% rename from configs/deauther_board_oled.txt rename to configs/DSTIKE_Deauther_OLED_v2-v3/A_config.h diff --git a/configs/DSTIKE_Deauther_OLED_v2-v3/README.md b/configs/DSTIKE_Deauther_OLED_v2-v3/README.md new file mode 100644 index 0000000..a991438 --- /dev/null +++ b/configs/DSTIKE_Deauther_OLED_v2-v3/README.md @@ -0,0 +1,18 @@ +# DSTIKE Deauther OLED v2 - v3 + +| | | +| - | - | +| LED Type | Digital | +| LED R | GPIO 2 | +| LED G | disabled | +| LED B | GPIO 16 | +| Display and buttons enabled | YES | +| Display Driver | SH1106 | +| Display SDA | GPIO 5 (D1) | +| Display SCL | GPIO 4 (D2) | +| Button Up |GPIO 12 | +| Button Down | GPIO 13 | +| Button Left | disabled | +| Button Right | disabled | +| Button A | GPIO 14 | +| Button B |disabled | \ No newline at end of file diff --git a/configs/deauther_board_oled_RGB.txt b/configs/DSTIKE_Deauther_OLED_v3.5/A_config.h similarity index 100% rename from configs/deauther_board_oled_RGB.txt rename to configs/DSTIKE_Deauther_OLED_v3.5/A_config.h diff --git a/configs/DSTIKE_Deauther_OLED_v3.5/README.md b/configs/DSTIKE_Deauther_OLED_v3.5/README.md new file mode 100644 index 0000000..a1b4412 --- /dev/null +++ b/configs/DSTIKE_Deauther_OLED_v3.5/README.md @@ -0,0 +1,17 @@ +# DSTIKE Deauther OLED v3.5 + +| | | +| - | - | +| LED Type | Neopixel (WS2812) | +| LED Pin | GPIO 15 | +| Number of LEDs | 1 | +| Display and buttons enabled | YES | +| Display Driver | SH1106 | +| Display SDA | GPIO 5 (D1) | +| Display SCL | GPIO 4 (D2) | +| Button Up |GPIO 12 | +| Button Down | GPIO 13 | +| Button Left | disabled | +| Button Right | disabled | +| Button A | GPIO 14 | +| Button B |disabled | \ No newline at end of file diff --git a/configs/deauther_board_RGB.txt b/configs/DSTIKE_Deauther_v3_&_DSTIKE_NodeMCU-07_v2/A_config.h similarity index 100% rename from configs/deauther_board_RGB.txt rename to configs/DSTIKE_Deauther_v3_&_DSTIKE_NodeMCU-07_v2/A_config.h diff --git a/configs/DSTIKE_Deauther_v3_&_DSTIKE_NodeMCU-07_v2/README.md b/configs/DSTIKE_Deauther_v3_&_DSTIKE_NodeMCU-07_v2/README.md new file mode 100644 index 0000000..83cb66f --- /dev/null +++ b/configs/DSTIKE_Deauther_v3_&_DSTIKE_NodeMCU-07_v2/README.md @@ -0,0 +1,17 @@ +# DSTIKE Deauther v3 & DSTIKE NodeMCU-07 v2 + +| | | +| - | - | +| LED Type | Neopixel (WS2812b) | +| LED Pin | GPIO 15 | +| Number of LEDs | 1 | +| Display and buttons enabled | NO | +| Display Driver | SH1106 | +| Display SDA | GPIO 5 (D1) | +| Display SCL | GPIO 4 (D2) | +| Button Up |GPIO 12 | +| Button Down | GPIO 13 | +| Button Left | disabled | +| Button Right | disabled | +| Button A | GPIO 14 | +| Button B |disabled | \ No newline at end of file diff --git a/configs/default.txt b/configs/Default/A_config.h similarity index 94% rename from configs/default.txt rename to configs/Default/A_config.h index 8068c9b..c731e7b 100644 --- a/configs/default.txt +++ b/configs/Default/A_config.h @@ -51,9 +51,9 @@ Adjust the pins to match your setup Comment out the buttons you don't use. = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = */ -#define BUTTON_UP 14 -#define BUTTON_DOWN 12 -#define BUTTON_A 13 +#define BUTTON_UP 14 // D5 +#define BUTTON_DOWN 12 // D6 +#define BUTTON_A 13 // D7 //#define BUTTON_LEFT 12 //#define BUTTON_RIGHT 13 diff --git a/configs/Default/README.md b/configs/Default/README.md new file mode 100644 index 0000000..3da359a --- /dev/null +++ b/configs/Default/README.md @@ -0,0 +1,20 @@ +# Default Config +Default configuration for all boards without using a display or RGB LED. +The display can be enabled over the settings. + +| | | +| - | - | +| LED Type | Digital | +| LED R | GPIO 2 | +| LED G | disabled | +| LED B | GPIO 16 | +| Display and buttons enabled | NO | +| Display Driver | SSD1306 | +| Display SDA | GPIO 5 (D1) | +| Display SCL | GPIO 4 (D2) | +| Button Up |GPIO 14 (D5) | +| Button Down | GPIO 12 (D6) | +| Button Left | disabled | +| Button Right | disabled | +| Button A | GPIO 13 (D7) | +| Button B |disabled | \ No newline at end of file diff --git a/configs/README.md b/configs/README.md index 0017cc5..b46117c 100644 --- a/configs/README.md +++ b/configs/README.md @@ -1,10 +1,4 @@ Here you find a bunch of modified config files for different boards. -Those are meant to be copy and replaced in the A_config.h file in the Arduino sektch. +Those are meant to be copy and replaced in the Arduino sektch. -The default config should be fine for all boards that don't have a display or a RGB LED (like the NodeMCU). - -- [Default config](https://github.com/spacehuhn/esp8266_deauther/blob/master/configs/default.txt) -- [DSTIKE NodeMCU-07 v2 & Deauther v3 (without OLED)](https://github.com/spacehuhn/esp8266_deauther/blob/master/configs/deauther_board_RGB.txt) -- [DSTIKE Deauther OLED v1 - v3](https://github.com/spacehuhn/esp8266_deauther/blob/master/configs/deauther_board_oled.txt) -- [DSTIKE Deauther OLED v3.5 (or newer) & WiFi Deauther Monster](https://github.com/spacehuhn/esp8266_deauther/blob/master/configs/deauther_board_oled_RGB.txt) -- [DSTIKE Deauther Boy](https://github.com/spacehuhn/esp8266_deauther/blob/master/configs/deauther_boy.txt) +The default config should be fine for all boards that don't have a display or a RGB LED (like the NodeMCU). \ No newline at end of file diff --git a/configs/diy_esp_boy.txt b/configs/diy_esp_boy.txt deleted file mode 100644 index 80f6db1..0000000 --- a/configs/diy_esp_boy.txt +++ /dev/null @@ -1,81 +0,0 @@ -#ifndef config_h -#define config_h - -// ===== DISPLAY LIBRARY ===== // -#include -#include -#include "SH1106Wire.h" -#include "SSD1306Wire.h" -#include "SH1106Spi.h" -#include "SSD1306Spi.h" -// =========================== // - -// ===================== LED CONFIG ==================== // -/* = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - Uncomment the type of LED you're using - Only one of them can be defined at a time! - = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = */ -//#define DIGITAL_LED -#define RGB_LED -//#define NEOPIXEL_LED - -/* = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - Adjust following settings for your type of LED - you can ignore the rest of the #define's - = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = */ -// === Settings for Digital LED === // -#define LED_ENABLE_R true -#define LED_ENABLE_G false -#define LED_ENABLE_B true - -// === Settings for Digital LED and RGB LED === // -#define LED_CATHODE false // common ground (GND) -#define LED_PIN_R 13 // D7 -#define LED_PIN_G 15 // D8 -#define LED_PIN_B 16 // D0 - -// === Settings for RGB LED and Neopixel LED === // -#define LED_MODE_BRIGHTNESS 1 // brightness of LED modes -#define LED_DYNAMIC_BRIGHTNESS false // brightness in scan mode depending on packet rate and deauths per second - -// === Settings for Neopixel LED === // -#define LED_NEOPIXEL_NUM 1 -#define LED_NEOPIXEL_PIN 9 -// if it doesn't work try changing NEO_GRB to NEO_GRBW -#define LED_NEOPIXEL Adafruit_NeoPixel(LED_NEOPIXEL_NUM, LED_NEOPIXEL_PIN, NEO_GRB + NEO_KHZ800) - -// ===================== DISPLAY CONFIG ==================== // -#define USE_DISPLAY true // will force display on - -/* = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - Adjust the pins to match your setup - Comment out the buttons you don't use. - = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = */ -#define BUTTON_UP 2 -#define BUTTON_DOWN 14 -#define BUTTON_A 10 - -#define BUTTON_LEFT 12 -#define BUTTON_RIGHT 0 -#define BUTTON_B 9 - -/* = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - Uncomment the type of display you're using - Only one of them can be defined at a time! - = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - 0x3c = I2C address - SDA = GPIO 5 (D1) - 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) - CS = GPIO 15 (D8) or GND - SCK/SCL = GPIO 14 (D5) - SDA/MOSI = GPIO 13 (D7) */ -//#define DISPLAY SSD1306Spi display = SSD1306Spi display = SSD1306Spi(5, 4, 15); // for 0.96" OLED with SPI -//#define DISPLAY SH1106Spi display = SH1106Spi(5, 4); // for 1.3" OLED with SPI -// ========================================================= // - -#endif \ No newline at end of file diff --git a/esp8266_deauther/A_config.h b/esp8266_deauther/A_config.h index ed7fc4d..f381eaf 100644 --- a/esp8266_deauther/A_config.h +++ b/esp8266_deauther/A_config.h @@ -30,9 +30,9 @@ // === Settings for Digital LED and RGB LED === // #define LED_CATHODE false // common ground (GND) -#define LED_PIN_R 2 // ESP-12 LED +#define LED_PIN_R 16 // NodeMCU on-board LED #define LED_PIN_G 0 -#define LED_PIN_B 16 // NodeMCU on-board LED +#define LED_PIN_B 2 // ESP-12 LED // === Settings for RGB LED and Neopixel LED === // #define LED_MODE_BRIGHTNESS 10 // brightness of LED modes @@ -45,15 +45,15 @@ #define LED_NEOPIXEL Adafruit_NeoPixel(LED_NEOPIXEL_NUM, LED_NEOPIXEL_PIN, NEO_GRB + NEO_KHZ800) // ===================== DISPLAY CONFIG ==================== // -#define USE_DISPLAY false // will force display on +#define USE_DISPLAY true // will force display on /* = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = Adjust the pins to match your setup Comment out the buttons you don't use. = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = */ -#define BUTTON_UP 14 -#define BUTTON_DOWN 12 -#define BUTTON_A 13 +#define BUTTON_UP 12 +#define BUTTON_DOWN 13 +#define BUTTON_A 14 //#define BUTTON_LEFT 12 //#define BUTTON_RIGHT 13 @@ -63,9 +63,7 @@ Uncomment the type of display you're using Only one of them can be defined at a time! = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - 0x3c = I2C address - SDA = GPIO 5 (D1) - 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 @@ -78,5 +76,4 @@ //#define DISPLAY SH1106Spi display = SH1106Spi(5, 4); // for 1.3" OLED with SPI // ========================================================= // -#endif - +#endif