diff --git a/README.md b/README.md index 968f152..7590000 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ -# ESP32 Marauder v0.10.3 +# ESP32 Marauder v0.10.4

Marauder logo

A suite of WiFi/Bluetooth offensive and defensive tools for the ESP32 diff --git a/User_Setup_Select.h b/User_Setup_Select.h index cdb15bb..dab0c7d 100644 --- a/User_Setup_Select.h +++ b/User_Setup_Select.h @@ -21,8 +21,8 @@ //#include // Default setup is root library folder -//#include -#include +#include +//#include //#include // Setup file configured for my ILI9341 //#include // Setup file configured for my ST7735 diff --git a/User_Setup_marauder_m5stickc.h b/User_Setup_marauder_m5stickc.h new file mode 100644 index 0000000..9956e05 --- /dev/null +++ b/User_Setup_marauder_m5stickc.h @@ -0,0 +1,316 @@ +// USER DEFINED SETTINGS +// Set driver type, fonts to be loaded, pins used and SPI control method etc +// +// See the User_Setup_Select.h file if you wish to be able to define multiple +// setups and then easily select which setup file is used by the compiler. +// +// If this file is edited correctly then all the library example sketches should +// run without the need to make any more changes for a particular hardware setup! +// Note that some sketches are designed for a particular TFT pixel width/height + + +// ################################################################################## +// +// Section 1. Call up the right driver file and any options for it +// +// ################################################################################## + +// Display type - only define if RPi display +//#define RPI_DRIVER + +// Only define one driver, the other ones must be commented out +//#define ILI9341_DRIVER // OG Marauder +//#define ST7735_DRIVER // Marauder Mini // Define additional parameters below for this display +//#define ILI9163_DRIVER // Define additional parameters below for this display +//#define S6D02A1_DRIVER +//#define RPI_ILI9486_DRIVER // 20MHz maximum SPI +//#define HX8357D_DRIVER +//#define ILI9481_DRIVER +//#define ILI9486_DRIVER +//#define ILI9488_DRIVER // WARNING: Do not connect ILI9488 display SDO to MISO if other devices share the SPI bus (TFT SDO does NOT tristate when CS is high) +//#define ST7789_DRIVER // Full configuration option, define additional parameters below for this display +#define ST7789_2_DRIVER // Minimal configuration option, define additional parameters below for this display +//#define R61581_DRIVER +//#define RM68140_DRIVER +//#define ST7796_DRIVER + +// Some displays support SPI reads via the MISO pin, other displays have a single +// bi-directional SDA pin and the library will try to read this via the MOSI line. +// To use the SDA line for reading data from the TFT uncomment the following line: + +// #define TFT_SDA_READ // This option is for ESP32 ONLY, tested with ST7789 display only + +// For ST7789 and ILI9341 ONLY, define the colour order IF the blue and red are swapped on your display +// Try ONE option at a time to find the correct colour order for your display + + #define TFT_RGB_ORDER TFT_RGB // Colour order Red-Green-Blue +// #define TFT_RGB_ORDER TFT_BGR // Colour order Blue-Green-Red + +// For M5Stack ESP32 module with integrated ILI9341 display ONLY, remove // in line below + +// #define M5STACK + +// For ST7789, ST7735 and ILI9163 ONLY, define the pixel width and height in portrait orientation +// #define TFT_WIDTH 80 + #define TFT_WIDTH 240 // Marauder Mini +// #define TFT_WIDTH 240 // ST7789 240 x 240 and 240 x 320 +// #define TFT_HEIGHT 160 + #define TFT_HEIGHT 135 // Marauder Mini +// #define TFT_HEIGHT 240 // ST7789 240 x 240 +// #define TFT_HEIGHT 320 // ST7789 240 x 320 + +// For ST7735 ONLY, define the type of display, originally this was based on the +// colour of the tab on the screen protector film but this is not always true, so try +// out the different options below if the screen does not display graphics correctly, +// e.g. colours wrong, mirror images, or tray pixels at the edges. +// Comment out ALL BUT ONE of these options for a ST7735 display driver, save this +// this User_Setup file, then rebuild and upload the sketch to the board again: + +// #define ST7735_INITB +// #define ST7735_GREENTAB +// #define ST7735_GREENTAB2 +// #define ST7735_GREENTAB3 +// #define ST7735_GREENTAB128 // For 128 x 128 display +// #define ST7735_GREENTAB160x80 // For 160 x 80 display (BGR, inverted, 26 offset) +// #define ST7735_REDTAB +// #define ST7735_BLACKTAB +// #define ST7735_REDTAB160x80 // For 160 x 80 display with 24 pixel offset + +// If colours are inverted (white shows as black) then uncomment one of the next +// 2 lines try both options, one of the options should correct the inversion. + +// #define TFT_INVERSION_ON +// #define TFT_INVERSION_OFF + +// If a backlight control signal is available then define the TFT_BL pin in Section 2 +// below. The backlight will be turned ON when tft.begin() is called, but the library +// needs to know if the LEDs are ON with the pin HIGH or LOW. If the LEDs are to be +// driven with a PWM signal or turned OFF/ON then this must be handled by the user +// sketch. e.g. with digitalWrite(TFT_BL, LOW); + + #define TFT_BACKLIGHT_ON LOW // HIGH or LOW are options + +// ################################################################################## +// +// Section 2. Define the pins that are used to interface with the display here +// +// ################################################################################## + +// We must use hardware SPI, a minimum of 3 GPIO pins is needed. +// Typical setup for ESP8266 NodeMCU ESP-12 is : +// +// Display SDO/MISO to NodeMCU pin D6 (or leave disconnected if not reading TFT) +// Display LED to NodeMCU pin VIN (or 5V, see below) +// Display SCK to NodeMCU pin D5 +// Display SDI/MOSI to NodeMCU pin D7 +// Display DC (RS/AO)to NodeMCU pin D3 +// Display RESET to NodeMCU pin D4 (or RST, see below) +// Display CS to NodeMCU pin D8 (or GND, see below) +// Display GND to NodeMCU pin GND (0V) +// Display VCC to NodeMCU 5V or 3.3V +// +// The TFT RESET pin can be connected to the NodeMCU RST pin or 3.3V to free up a control pin +// +// The DC (Data Command) pin may be labeled AO or RS (Register Select) +// +// With some displays such as the ILI9341 the TFT CS pin can be connected to GND if no more +// SPI devices (e.g. an SD Card) are connected, in this case comment out the #define TFT_CS +// line below so it is NOT defined. Other displays such at the ST7735 require the TFT CS pin +// to be toggled during setup, so in these cases the TFT_CS line must be defined and connected. +// +// The NodeMCU D0 pin can be used for RST +// +// +// Note: only some versions of the NodeMCU provide the USB 5V on the VIN pin +// If 5V is not available at a pin you can use 3.3V but backlight brightness +// will be lower. + + +// ###### EDIT THE PIN NUMBERS IN THE LINES FOLLOWING TO SUIT YOUR ESP8266 SETUP ###### + +// For NodeMCU - use pin numbers in the form PIN_Dx where Dx is the NodeMCU pin designation +//#define TFT_CS PIN_D8 // Chip select control pin D8 +//#define TFT_DC PIN_D3 // Data Command control pin +//#define TFT_RST PIN_D4 // Reset pin (could connect to NodeMCU RST, see next line) +//#define TFT_RST -1 // Set TFT_RST to -1 if the display RESET is connected to NodeMCU RST or 3.3V + +//#define TFT_BL PIN_D1 // LED back-light (only for ST7789 with backlight control pin) + +//#define TOUCH_CS PIN_D2 // Chip select pin (T_CS) of touch screen + +//#define TFT_WR PIN_D2 // Write strobe for modified Raspberry Pi TFT only + + +// ###### FOR ESP8266 OVERLAP MODE EDIT THE PIN NUMBERS IN THE FOLLOWING LINES ###### + +// Overlap mode shares the ESP8266 FLASH SPI bus with the TFT so has a performance impact +// but saves pins for other functions. It is best not to connect MISO as some displays +// do not tristate that line wjen chip select is high! +// On NodeMCU 1.0 SD0=MISO, SD1=MOSI, CLK=SCLK to connect to TFT in overlap mode +// On NodeMCU V3 S0 =MISO, S1 =MOSI, S2 =SCLK +// In ESP8266 overlap mode the following must be defined + +//#define TFT_SPI_OVERLAP + +// In ESP8266 overlap mode the TFT chip select MUST connect to pin D3 +//#define TFT_CS PIN_D3 +//#define TFT_DC PIN_D5 // Data Command control pin +//#define TFT_RST PIN_D4 // Reset pin (could connect to NodeMCU RST, see next line) +//#define TFT_RST -1 // Set TFT_RST to -1 if the display RESET is connected to NodeMCU RST or 3.3V + + +// ###### EDIT THE PIN NUMBERS IN THE LINES FOLLOWING TO SUIT YOUR ESP32 SETUP ###### + +// For ESP32 Dev board (only tested with ILI9341 display) +// The hardware SPI can be mapped to any pins + +// Marauder Mini +#define TFT_CS 5 // Chip select control pin D8 +#define TFT_DC 23 // Data Command control pin +#define TFT_RST 18 // Reset pin (could connect to NodeMCU RST, see next line) +#define TOUCH_CS -1 +//#define TFT_MISO 19 +#define TFT_MOSI 15 +#define TFT_SCLK 13 +//#define TFT_BL 32 + +/* +// ESP32 Marauder +#define TFT_MISO 19 +#define TFT_MOSI 23 +#define TFT_SCLK 18 +#define TFT_CS 17 // Chip select control pin +#define TFT_DC 16 // Data Command control pin +#define TFT_RST 5 // Reset pin (could connect to RST pin) +//#define TFT_RST -1 // Set TFT_RST to -1 if display RESET is connected to ESP32 board RST + +#define TFT_BL 32 // LED back-light (only for ST7789 with backlight control pin) + +#define TOUCH_CS 21 // Chip select pin (T_CS) of touch screen +*/ +///////////////////////////// + +// ESP32 Centauri +/* +#define TFT_MISO 19 +#define TFT_MOSI 23 +#define TFT_SCLK 18 +#define TFT_CS 27 // Chip select control pin +#define TFT_DC 26 // Data Command control pin +#define TFT_RST 5 // Reset pin (could connect to RST pin) +//#define TFT_RST -1 // Set TFT_RST to -1 if display RESET is connected to ESP32 board RST + +#define TFT_BL 32 // LED back-light (only for ST7789 with backlight control pin) + +#define TOUCH_CS 21 // Chip select pin (T_CS) of touch screen +*/ +///////////////////////////// + +//#define TFT_WR 22 // Write strobe for modified Raspberry Pi TFT only + +// For the M5Stack module use these #define lines +//#define TFT_MISO 19 +//#define TFT_MOSI 23 +//#define TFT_SCLK 18 +//#define TFT_CS 14 // Chip select control pin +//#define TFT_DC 27 // Data Command control pin +//#define TFT_RST 33 // Reset pin (could connect to Arduino RESET pin) +//#define TFT_BL 32 // LED back-light (required for M5Stack) + +// ###### EDIT THE PINs BELOW TO SUIT YOUR ESP32 PARALLEL TFT SETUP ###### + +// The library supports 8 bit parallel TFTs with the ESP32, the pin +// selection below is compatible with ESP32 boards in UNO format. +// Wemos D32 boards need to be modified, see diagram in Tools folder. +// Only ILI9481 and ILI9341 based displays have been tested! + +// Parallel bus is only supported on ESP32 +// Uncomment line below to use ESP32 Parallel interface instead of SPI + +//#define ESP32_PARALLEL + +// The ESP32 and TFT the pins used for testing are: +//#define TFT_CS 33 // Chip select control pin (library pulls permanently low +//#define TFT_DC 15 // Data Command control pin - must use a pin in the range 0-31 +//#define TFT_RST 32 // Reset pin, toggles on startup + +//#define TFT_WR 4 // Write strobe control pin - must use a pin in the range 0-31 +//#define TFT_RD 2 // Read strobe control pin + +//#define TFT_D0 12 // Must use pins in the range 0-31 for the data bus +//#define TFT_D1 13 // so a single register write sets/clears all bits. +//#define TFT_D2 26 // Pins can be randomly assigned, this does not affect +//#define TFT_D3 25 // TFT screen update performance. +//#define TFT_D4 17 +//#define TFT_D5 16 +//#define TFT_D6 27 +//#define TFT_D7 14 + + +// ################################################################################## +// +// Section 3. Define the fonts that are to be used here +// +// ################################################################################## + +// Comment out the #defines below with // to stop that font being loaded +// The ESP8366 and ESP32 have plenty of memory so commenting out fonts is not +// normally necessary. If all fonts are loaded the extra FLASH space required is +// about 17Kbytes. To save FLASH space only enable the fonts you need! + +#define LOAD_GLCD // Font 1. Original Adafruit 8 pixel font needs ~1820 bytes in FLASH +#define LOAD_FONT2 // Font 2. Small 16 pixel high font, needs ~3534 bytes in FLASH, 96 characters +#define LOAD_FONT4 // Font 4. Medium 26 pixel high font, needs ~5848 bytes in FLASH, 96 characters +#define LOAD_FONT6 // Font 6. Large 48 pixel font, needs ~2666 bytes in FLASH, only characters 1234567890:-.apm +#define LOAD_FONT7 // Font 7. 7 segment 48 pixel font, needs ~2438 bytes in FLASH, only characters 1234567890:-. +#define LOAD_FONT8 // Font 8. Large 75 pixel font needs ~3256 bytes in FLASH, only characters 1234567890:-. +//#define LOAD_FONT8N // Font 8. Alternative to Font 8 above, slightly narrower, so 3 digits fit a 160 pixel TFT +#define LOAD_GFXFF // FreeFonts. Include access to the 48 Adafruit_GFX free fonts FF1 to FF48 and custom fonts + +// Comment out the #define below to stop the SPIFFS filing system and smooth font code being loaded +// this will save ~20kbytes of FLASH +#define SMOOTH_FONT + + +// ################################################################################## +// +// Section 4. Other options +// +// ################################################################################## + +// Define the SPI clock frequency, this affects the graphics rendering speed. Too +// fast and the TFT driver will not keep up and display corruption appears. +// With an ILI9341 display 40MHz works OK, 80MHz sometimes fails +// With a ST7735 display more than 27MHz may not work (spurious pixels and lines) +// With an ILI9163 display 27 MHz works OK. + +// #define SPI_FREQUENCY 1000000 +//#define SPI_FREQUENCY 5000000 +// #define SPI_FREQUENCY 10000000 + #define SPI_FREQUENCY 20000000 +//#define SPI_FREQUENCY 27000000 // Marauder // Actually sets it to 26.67MHz = 80/3 +// #define SPI_FREQUENCY 40000000 +// #define SPI_FREQUENCY 80000000 + +// Optional reduced SPI frequency for reading TFT +#define SPI_READ_FREQUENCY 20000000 + +// The XPT2046 requires a lower SPI clock rate of 2.5MHz so we define that here: +#define SPI_TOUCH_FREQUENCY 2500000 + +// The ESP32 has 2 free SPI ports i.e. VSPI and HSPI, the VSPI is the default. +// If the VSPI port is in use and pins are not accessible (e.g. TTGO T-Beam) +// then uncomment the following line: +//#define USE_HSPI_PORT + +// Comment out the following #define if "SPI Transactions" do not need to be +// supported. When commented out the code size will be smaller and sketches will +// run slightly faster, so leave it commented out unless you need it! + +// Transaction support is needed to work with SD library but not needed with TFT_SdFat +// Transaction support is required if other SPI devices are connected. + +// Transactions are automatically enabled by the library for an ESP32 (to use HAL mutex) +// so changing it here has no effect + +// #define SUPPORT_TRANSACTIONS diff --git a/esp32_marauder/AXP192.cpp b/esp32_marauder/AXP192.cpp new file mode 100644 index 0000000..33210cd --- /dev/null +++ b/esp32_marauder/AXP192.cpp @@ -0,0 +1,435 @@ +#include "AXP192.h" + +AXP192::AXP192() { +} + +void AXP192::begin(void) { + Wire1.begin(21, 22); + Wire1.setClock(400000); + + // Set LDO2 & LDO3(TFT_LED & TFT) 3.0V + Write1Byte(0x28, 0xcc); + + // Set ADC to All Enable + Write1Byte(0x82, 0xff); + + // Bat charge voltage to 4.2, Current 100MA + Write1Byte(0x33, 0xc0); + + // Enable Bat,ACIN,VBUS,APS adc + Write1Byte(0x82, 0xff); + + // Enable Ext, LDO2, LDO3, DCDC1 + Write1Byte(0x12, Read8bit(0x12) | 0x4D); + + // 128ms power on, 4s power off + Write1Byte(0x36, 0x0C); + + // Set RTC voltage to 3.3V + Write1Byte(0x91, 0xF0); + + // Set GPIO0 to LDO + Write1Byte(0x90, 0x02); + + // Disable vbus hold limit + Write1Byte(0x30, 0x80); + + // Set temperature protection + Write1Byte(0x39, 0xfc); + + // Enable RTC BAT charge + Write1Byte(0x35, 0xa2); + + // Enable bat detection + Write1Byte(0x32, 0x46); + + // ScreenBreath(80); +} + +void AXP192::Write1Byte(uint8_t Addr, uint8_t Data) { + Wire1.beginTransmission(0x34); + Wire1.write(Addr); + Wire1.write(Data); + Wire1.endTransmission(); +} + +uint8_t AXP192::Read8bit(uint8_t Addr) { + Wire1.beginTransmission(0x34); + Wire1.write(Addr); + Wire1.endTransmission(); + Wire1.requestFrom(0x34, 1); + return Wire1.read(); +} + +uint16_t AXP192::Read12Bit(uint8_t Addr) { + uint16_t Data = 0; + uint8_t buf[2]; + ReadBuff(Addr, 2, buf); + Data = ((buf[0] << 4) + buf[1]); // + return Data; +} + +uint16_t AXP192::Read13Bit(uint8_t Addr) { + uint16_t Data = 0; + uint8_t buf[2]; + ReadBuff(Addr, 2, buf); + Data = ((buf[0] << 5) + buf[1]); // + return Data; +} + +uint16_t AXP192::Read16bit(uint8_t Addr) { + uint16_t ReData = 0; + Wire1.beginTransmission(0x34); + Wire1.write(Addr); + Wire1.endTransmission(); + Wire1.requestFrom(0x34, 2); + for (int i = 0; i < 2; i++) { + ReData <<= 8; + ReData |= Wire1.read(); + } + return ReData; +} + +uint32_t AXP192::Read24bit(uint8_t Addr) { + uint32_t ReData = 0; + Wire1.beginTransmission(0x34); + Wire1.write(Addr); + Wire1.endTransmission(); + Wire1.requestFrom(0x34, 3); + for (int i = 0; i < 3; i++) { + ReData <<= 8; + ReData |= Wire1.read(); + } + return ReData; +} + +uint32_t AXP192::Read32bit(uint8_t Addr) { + uint32_t ReData = 0; + Wire1.beginTransmission(0x34); + Wire1.write(Addr); + Wire1.endTransmission(); + Wire1.requestFrom(0x34, 4); + for (int i = 0; i < 4; i++) { + ReData <<= 8; + ReData |= Wire1.read(); + } + return ReData; +} + +void AXP192::ReadBuff(uint8_t Addr, uint8_t Size, uint8_t *Buff) { + Wire1.beginTransmission(0x34); + Wire1.write(Addr); + Wire1.endTransmission(); + Wire1.requestFrom(0x34, (int)Size); + for (int i = 0; i < Size; i++) { + *(Buff + i) = Wire1.read(); + } +} + +void AXP192::ScreenBreath(int brightness) { + if (brightness > 100 || brightness < 0) return; + int vol = map(brightness, 0, 100, 2500, 3200); + vol = (vol < 1800) ? 0 : (vol - 1800) / 100; + uint8_t buf = Read8bit(0x28); + Write1Byte(0x28, ((buf & 0x0f) | ((uint16_t)vol << 4))); +} + +void AXP192::ScreenSwitch(bool state) { + uint8_t brightness; + if (state == false) { + brightness = 0; + } else if (state == true) { + brightness = 12; + } + uint8_t buf = Read8bit(0x28); + Write1Byte(0x28, ((buf & 0x0f) | (brightness << 4))); +} + +bool AXP192::GetBatState() { + if (Read8bit(0x01) | 0x20) + return true; + else + return false; +} +//---------coulombcounter_from_here--------- +// enable: void EnableCoulombcounter(void); +// disable: void DisableCOulombcounter(void); +// stop: void StopCoulombcounter(void); +// clear: void ClearCoulombcounter(void); +// get charge data: uint32_t GetCoulombchargeData(void); +// get discharge data: uint32_t GetCoulombdischargeData(void); +// get coulomb val affter calculation: float GetCoulombData(void); +//------------------------------------------ +void AXP192::EnableCoulombcounter(void) { + Write1Byte(0xB8, 0x80); +} + +void AXP192::DisableCoulombcounter(void) { + Write1Byte(0xB8, 0x00); +} + +void AXP192::StopCoulombcounter(void) { + Write1Byte(0xB8, 0xC0); +} + +void AXP192::ClearCoulombcounter(void) { + Write1Byte(0xB8, 0xA0); +} + +uint32_t AXP192::GetCoulombchargeData(void) { + return Read32bit(0xB0); +} + +uint32_t AXP192::GetCoulombdischargeData(void) { + return Read32bit(0xB4); +} + +float AXP192::GetCoulombData(void) { + uint32_t coin = 0; + uint32_t coout = 0; + + coin = GetCoulombchargeData(); + coout = GetCoulombdischargeData(); + + // c = 65536 * current_LSB * (coin - coout) / 3600 / ADC rate + // Adc rate can be read from 84H ,change this variable if you change the ADC + // reate + float ccc = 65536 * 0.5 * (int32_t)(coin - coout) / 3600.0 / 25.0; + + return ccc; +} +//----------coulomb_end_at_here---------- + +uint16_t AXP192::GetVbatData(void) { + uint16_t vbat = 0; + uint8_t buf[2]; + ReadBuff(0x78, 2, buf); + vbat = ((buf[0] << 4) + buf[1]); // V + return vbat; +} + +uint16_t AXP192::GetVinData(void) { + uint16_t vin = 0; + uint8_t buf[2]; + ReadBuff(0x56, 2, buf); + vin = ((buf[0] << 4) + buf[1]); // V + return vin; +} + +uint16_t AXP192::GetIinData(void) { + uint16_t iin = 0; + uint8_t buf[2]; + ReadBuff(0x58, 2, buf); + iin = ((buf[0] << 4) + buf[1]); + return iin; +} + +uint16_t AXP192::GetVusbinData(void) { + uint16_t vin = 0; + uint8_t buf[2]; + ReadBuff(0x5a, 2, buf); + vin = ((buf[0] << 4) + buf[1]); // V + return vin; +} + +uint16_t AXP192::GetIusbinData(void) { + uint16_t iin = 0; + uint8_t buf[2]; + ReadBuff(0x5C, 2, buf); + iin = ((buf[0] << 4) + buf[1]); + return iin; +} + +uint16_t AXP192::GetIchargeData(void) { + uint16_t icharge = 0; + uint8_t buf[2]; + ReadBuff(0x7A, 2, buf); + icharge = (buf[0] << 5) + buf[1]; + return icharge; +} + +uint16_t AXP192::GetIdischargeData(void) { + uint16_t idischarge = 0; + uint8_t buf[2]; + ReadBuff(0x7C, 2, buf); + idischarge = (buf[0] << 5) + buf[1]; + return idischarge; +} + +uint16_t AXP192::GetTempData(void) { + uint16_t temp = 0; + uint8_t buf[2]; + ReadBuff(0x5e, 2, buf); + temp = ((buf[0] << 4) + buf[1]); + return temp; +} + +uint32_t AXP192::GetPowerbatData(void) { + uint32_t power = 0; + uint8_t buf[3]; + ReadBuff(0x70, 2, buf); + power = (buf[0] << 16) + (buf[1] << 8) + buf[2]; + return power; +} + +uint16_t AXP192::GetVapsData(void) { + uint16_t vaps = 0; + uint8_t buf[2]; + ReadBuff(0x7e, 2, buf); + vaps = ((buf[0] << 4) + buf[1]); + return vaps; +} + +void AXP192::SetSleep(void) { + uint8_t buf = Read8bit(0x31); + buf = (1 << 3) | buf; + Write1Byte(0x31, buf); + Write1Byte(0x90, 0x00); + Write1Byte(0x12, 0x09); + // Write1Byte(0x12, 0x00); + Write1Byte(0x12, Read8bit(0x12) & 0xA1); // Disable all outputs but DCDC1 +} + +uint8_t AXP192::GetWarningLeve(void) { + Wire1.beginTransmission(0x34); + Wire1.write(0x47); + Wire1.endTransmission(); + Wire1.requestFrom(0x34, 1); + uint8_t buf = Wire1.read(); + return (buf & 0x01); +} + +// -- sleep +void AXP192::DeepSleep(uint64_t time_in_us) { + SetSleep(); + + if (time_in_us > 0) { + esp_sleep_enable_timer_wakeup(time_in_us); + } else { + esp_sleep_disable_wakeup_source(ESP_SLEEP_WAKEUP_TIMER); + } + (time_in_us == 0) ? esp_deep_sleep_start() : esp_deep_sleep(time_in_us); +} + +void AXP192::LightSleep(uint64_t time_in_us) { + SetSleep(); + + if (time_in_us > 0) { + esp_sleep_enable_timer_wakeup(time_in_us); + } else { + esp_sleep_disable_wakeup_source(ESP_SLEEP_WAKEUP_TIMER); + } + esp_light_sleep_start(); +} + +// 0 not press, 0x01 long press, 0x02 press +uint8_t AXP192::GetBtnPress() { + uint8_t state = Read8bit(0x46); + if (state) { + Write1Byte(0x46, 0x03); + } + return state; +} + +uint8_t AXP192::GetWarningLevel(void) { + return Read8bit(0x47) & 0x01; +} + +float AXP192::GetBatVoltage() { + float ADCLSB = 1.1 / 1000.0; + uint16_t ReData = Read12Bit(0x78); + return ReData * ADCLSB; +} + +float AXP192::GetBatCurrent() { + float ADCLSB = 0.5; + uint16_t CurrentIn = Read13Bit(0x7A); + uint16_t CurrentOut = Read13Bit(0x7C); + return (CurrentIn - CurrentOut) * ADCLSB; +} + +float AXP192::GetVinVoltage() { + float ADCLSB = 1.7 / 1000.0; + uint16_t ReData = Read12Bit(0x56); + return ReData * ADCLSB; +} + +float AXP192::GetVinCurrent() { + float ADCLSB = 0.625; + uint16_t ReData = Read12Bit(0x58); + return ReData * ADCLSB; +} + +float AXP192::GetVBusVoltage() { + float ADCLSB = 1.7 / 1000.0; + uint16_t ReData = Read12Bit(0x5A); + return ReData * ADCLSB; +} + +float AXP192::GetVBusCurrent() { + float ADCLSB = 0.375; + uint16_t ReData = Read12Bit(0x5C); + return ReData * ADCLSB; +} + +float AXP192::GetTempInAXP192() { + float ADCLSB = 0.1; + const float OFFSET_DEG_C = -144.7; + uint16_t ReData = Read12Bit(0x5E); + return OFFSET_DEG_C + ReData * ADCLSB; +} + +float AXP192::GetBatPower() { + float VoltageLSB = 1.1; + float CurrentLCS = 0.5; + uint32_t ReData = Read24bit(0x70); + return VoltageLSB * CurrentLCS * ReData / 1000.0; +} + +float AXP192::GetBatChargeCurrent() { + float ADCLSB = 0.5; + uint16_t ReData = Read12Bit(0x7A); + return ReData * ADCLSB; +} +float AXP192::GetAPSVoltage() { + float ADCLSB = 1.4 / 1000.0; + uint16_t ReData = Read12Bit(0x7E); + return ReData * ADCLSB; +} + +float AXP192::GetBatCoulombInput() { + uint32_t ReData = Read32bit(0xB0); + return ReData * 65536 * 0.5 / 3600 / 25.0; +} + +float AXP192::GetBatCoulombOut() { + uint32_t ReData = Read32bit(0xB4); + return ReData * 65536 * 0.5 / 3600 / 25.0; +} + +void AXP192::SetCoulombClear() { + Write1Byte(0xB8, 0x20); +} + +void AXP192::SetLDO2(bool State) { + uint8_t buf = Read8bit(0x12); + if (State == true) + buf = (1 << 2) | buf; + else + buf = ~(1 << 2) & buf; + Write1Byte(0x12, buf); +} + +// Cut all power, except for LDO1 (RTC) +void AXP192::PowerOff() { + Write1Byte(0x32, Read8bit(0x32) | 0x80); // MSB for Power Off +} + +void AXP192::SetPeripherialsPower(uint8_t state) { + if (!state) + Write1Byte(0x10, Read8bit(0x10) & 0XFB); + else if (state) + Write1Byte(0x10, Read8bit(0x10) | 0X04); + // uint8_t data; + // Set EXTEN to enable 5v boost +} \ No newline at end of file diff --git a/esp32_marauder/AXP192.h b/esp32_marauder/AXP192.h new file mode 100644 index 0000000..157ac69 --- /dev/null +++ b/esp32_marauder/AXP192.h @@ -0,0 +1,81 @@ +#ifndef __AXP192_H__ +#define __AXP192_H__ + +#include +#include + +#define SLEEP_MSEC(us) (((uint64_t)us) * 1000L) +#define SLEEP_SEC(us) (((uint64_t)us) * 1000000L) +#define SLEEP_MIN(us) (((uint64_t)us) * 60L * 1000000L) +#define SLEEP_HR(us) (((uint64_t)us) * 60L * 60L * 1000000L) + +class AXP192 { + public: + AXP192(); + void begin(void); + void ScreenBreath(int brightness); + void ScreenSwitch(bool state); + + bool GetBatState(); + + void EnableCoulombcounter(void); + void DisableCoulombcounter(void); + void StopCoulombcounter(void); + void ClearCoulombcounter(void); + uint32_t GetCoulombchargeData(void); + uint32_t GetCoulombdischargeData(void); + float GetCoulombData(void); + + uint16_t GetVbatData(void) __attribute__((deprecated)); + uint16_t GetIchargeData(void) __attribute__((deprecated)); + uint16_t GetIdischargeData(void) __attribute__((deprecated)); + uint16_t GetTempData(void) __attribute__((deprecated)); + uint32_t GetPowerbatData(void) __attribute__((deprecated)); + uint16_t GetVinData(void) __attribute__((deprecated)); + uint16_t GetIinData(void) __attribute__((deprecated)); + uint16_t GetVusbinData(void) __attribute__((deprecated)); + uint16_t GetIusbinData(void) __attribute__((deprecated)); + uint16_t GetVapsData(void) __attribute__((deprecated)); + uint8_t GetBtnPress(void); + + // -- sleep + void SetSleep(void); + void DeepSleep(uint64_t time_in_us = 0); + void LightSleep(uint64_t time_in_us = 0); + uint8_t GetWarningLeve(void); + + public: + // void SetChargeVoltage( uint8_t ); + // void SetChargeCurrent( uint8_t ); + float GetBatVoltage(); + float GetBatCurrent(); + float GetVinVoltage(); + float GetVinCurrent(); + float GetVBusVoltage(); + float GetVBusCurrent(); + float GetTempInAXP192(); + float GetBatPower(); + float GetBatChargeCurrent(); + float GetAPSVoltage(); + float GetBatCoulombInput(); + float GetBatCoulombOut(); + uint8_t GetWarningLevel(void); + void SetCoulombClear(); + void SetLDO2(bool State); + void SetPeripherialsPower(uint8_t state); + + // -- Power Off + void PowerOff(); + + public: + void Write1Byte(uint8_t Addr, uint8_t Data); + uint8_t Read8bit(uint8_t Addr); + uint16_t Read12Bit(uint8_t Addr); + uint16_t Read13Bit(uint8_t Addr); + uint16_t Read16bit(uint8_t Addr); + uint32_t Read24bit(uint8_t Addr); + uint32_t Read32bit(uint8_t Addr); + void ReadBuff(uint8_t Addr, uint8_t Size, uint8_t *Buff); +}; + +#endif diff --git a/esp32_marauder/Display.cpp b/esp32_marauder/Display.cpp index e75839f..eb40c88 100644 --- a/esp32_marauder/Display.cpp +++ b/esp32_marauder/Display.cpp @@ -20,11 +20,17 @@ void Display::RunSetup() #endif tft.init(); - tft.setRotation(0); // Portrait + #ifndef MARAUDER_M5STICKC + tft.setRotation(0); // Portrait + #endif + + #ifdef MARAUDER_M5STICKC + tft.setRotation(3); + #endif tft.setCursor(0, 0); - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 #ifdef TFT_SHIELD uint16_t calData[5] = { 275, 3494, 361, 3528, 4 }; // tft.setRotation(0); // Portrait with TFT Shield @@ -380,7 +386,7 @@ void Display::setupScrollArea(uint16_t tfa, uint16_t bfa) { //Serial.println(" tfa: " + (String)tfa); //Serial.println(" bfa: " + (String)bfa); //Serial.println("yStart: " + (String)this->yStart); - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 tft.writecommand(ILI9341_VSCRDEF); // Vertical scroll definition tft.writedata(tfa >> 8); // Top Fixed Area line count tft.writedata(tfa); @@ -393,7 +399,7 @@ void Display::setupScrollArea(uint16_t tfa, uint16_t bfa) { void Display::scrollAddress(uint16_t vsp) { - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 tft.writecommand(ILI9341_VSCRSADD); // Vertical scrolling pointer tft.writedata(vsp>>8); tft.writedata(vsp); diff --git a/esp32_marauder/MenuFunctions.cpp b/esp32_marauder/MenuFunctions.cpp index 30f1ee1..db12d21 100644 --- a/esp32_marauder/MenuFunctions.cpp +++ b/esp32_marauder/MenuFunctions.cpp @@ -17,7 +17,7 @@ MenuFunctions::MenuFunctions() // LVGL Stuff /* Interrupt driven periodic handler */ -#ifndef MARAUDER_MINI +#ifdef HAS_ILI9341 void MenuFunctions::lv_tick_handler() { lv_tick_inc(LVGL_TICK_PERIOD); @@ -860,7 +860,7 @@ void MenuFunctions::main(uint32_t currentTime) this->orientDisplay(); wifi_scan_obj.orient_display = false; } - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 if ((wifi_scan_obj.currentScanMode != LV_JOIN_WIFI) && (wifi_scan_obj.currentScanMode != LV_ADD_SSID)) display_obj.updateBanner(current_menu->name); @@ -873,7 +873,7 @@ void MenuFunctions::main(uint32_t currentTime) if ((wifi_scan_obj.currentScanMode != LV_JOIN_WIFI) && (wifi_scan_obj.currentScanMode != LV_ADD_SSID)) this->updateStatusBar(); - #ifdef MARAUDER_MINI + #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) display_obj.updateBanner(current_menu->name); #endif } @@ -901,13 +901,13 @@ void MenuFunctions::main(uint32_t currentTime) int pre_getTouch = millis(); // getTouch causes a 10ms delay which makes beacon spam less effective - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 pressed = display_obj.tft.getTouch(&t_x, &t_y); #endif // This is if there are scans/attacks going on - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 if ((wifi_scan_obj.currentScanMode != WIFI_SCAN_OFF) && (pressed) && (wifi_scan_obj.currentScanMode != OTA_UPDATE) && @@ -953,7 +953,7 @@ void MenuFunctions::main(uint32_t currentTime) } #endif - #ifdef MARAUDER_MINI + #ifdef HAS_BUTTONS bool c_btn_press = c_btn.justPressed(); @@ -1010,7 +1010,7 @@ void MenuFunctions::main(uint32_t currentTime) // Check if any key coordinate boxes contain the touch coordinates // This is for when on a menu - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 if ((wifi_scan_obj.currentScanMode != WIFI_ATTACK_BEACON_SPAM) && (wifi_scan_obj.currentScanMode != WIFI_ATTACK_AP_SPAM) && (wifi_scan_obj.currentScanMode != WIFI_ATTACK_AUTH) && @@ -1070,23 +1070,25 @@ void MenuFunctions::main(uint32_t currentTime) y = -1; #endif - #ifdef MARAUDER_MINI - if (u_btn.justPressed()){ - if ((wifi_scan_obj.currentScanMode == WIFI_SCAN_OFF) || - (wifi_scan_obj.currentScanMode == OTA_UPDATE)) { - if (current_menu->selected > 0) { - current_menu->selected--; - this->buttonSelected(current_menu->selected); - if (!current_menu->list->get(current_menu->selected + 1).selected) - this->buttonNotSelected(current_menu->selected + 1); + #ifdef HAS_BUTTONS + #ifndef MARAUDER_M5STICKC + if (u_btn.justPressed()){ + if ((wifi_scan_obj.currentScanMode == WIFI_SCAN_OFF) || + (wifi_scan_obj.currentScanMode == OTA_UPDATE)) { + if (current_menu->selected > 0) { + current_menu->selected--; + this->buttonSelected(current_menu->selected); + if (!current_menu->list->get(current_menu->selected + 1).selected) + this->buttonNotSelected(current_menu->selected + 1); + } + } + else if ((wifi_scan_obj.currentScanMode == WIFI_PACKET_MONITOR) || + (wifi_scan_obj.currentScanMode == WIFI_SCAN_EAPOL)) { + if (wifi_scan_obj.set_channel < 14) + wifi_scan_obj.changeChannel(wifi_scan_obj.set_channel + 1); } } - else if ((wifi_scan_obj.currentScanMode == WIFI_PACKET_MONITOR) || - (wifi_scan_obj.currentScanMode == WIFI_SCAN_EAPOL)) { - if (wifi_scan_obj.set_channel < 14) - wifi_scan_obj.changeChannel(wifi_scan_obj.set_channel + 1); - } - } + #endif if (d_btn.justPressed()){ if ((wifi_scan_obj.currentScanMode == WIFI_SCAN_OFF) || (wifi_scan_obj.currentScanMode == OTA_UPDATE)) { @@ -1096,6 +1098,12 @@ void MenuFunctions::main(uint32_t currentTime) if (!current_menu->list->get(current_menu->selected - 1).selected) this->buttonNotSelected(current_menu->selected - 1); } + else { + current_menu->selected = 0; + this->buttonSelected(current_menu->selected); + if (!current_menu->list->get(current_menu->list->size() - 1).selected) + this->buttonNotSelected(current_menu->list->size() - 1); + } } else if ((wifi_scan_obj.currentScanMode == WIFI_PACKET_MONITOR) || (wifi_scan_obj.currentScanMode == WIFI_SCAN_EAPOL)) { @@ -1214,7 +1222,7 @@ void MenuFunctions::updateStatusBar() { display_obj.tft.setTextSize(1); - #ifdef MARAUDER_MINI + #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) display_obj.tft.setFreeFont(NULL); #endif @@ -1236,11 +1244,11 @@ void MenuFunctions::updateStatusBar() if (temp_obj.current_temp != temp_obj.old_temp) { temp_obj.old_temp = temp_obj.current_temp; display_obj.tft.fillRect(0, 0, 50, STATUS_BAR_WIDTH, STATUSBAR_COLOR); - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 display_obj.tft.drawString((String)temp_obj.current_temp + " C", 4, 0, 2); #endif - #ifdef MARAUDER_MINI + #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) display_obj.tft.drawString((String)temp_obj.current_temp + " C", 0, 0, 1); #endif } @@ -1250,11 +1258,11 @@ void MenuFunctions::updateStatusBar() if (wifi_scan_obj.set_channel != wifi_scan_obj.old_channel) { wifi_scan_obj.old_channel = wifi_scan_obj.set_channel; display_obj.tft.fillRect(50, 0, 50, STATUS_BAR_WIDTH, STATUSBAR_COLOR); - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 display_obj.tft.drawString("CH: " + (String)wifi_scan_obj.set_channel, 50, 0, 2); #endif - #ifdef MARAUDER_MINI + #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) display_obj.tft.drawString("CH: " + (String)wifi_scan_obj.set_channel, TFT_WIDTH/4, 0, 1); #endif } @@ -1264,11 +1272,11 @@ void MenuFunctions::updateStatusBar() if (wifi_scan_obj.free_ram != wifi_scan_obj.old_free_ram) { wifi_scan_obj.old_free_ram = wifi_scan_obj.free_ram; display_obj.tft.fillRect(100, 0, 60, STATUS_BAR_WIDTH, STATUSBAR_COLOR); - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 display_obj.tft.drawString((String)wifi_scan_obj.free_ram + "B", 100, 0, 2); #endif - #ifdef MARAUDER_MINI + #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) display_obj.tft.drawString((String)wifi_scan_obj.free_ram + "B", TFT_WIDTH/1.75, 0, 1); #endif } @@ -1286,7 +1294,7 @@ void MenuFunctions::updateStatusBar() the_color = TFT_RED; #endif - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 display_obj.tft.drawXBitmap(170, 0, menu_icons[STATUS_SD], @@ -1296,7 +1304,7 @@ void MenuFunctions::updateStatusBar() the_color); #endif - #ifdef MARAUDER_MINI + #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) display_obj.tft.setTextColor(the_color, STATUSBAR_COLOR); display_obj.tft.drawString("SD", TFT_WIDTH - 12, 0, 1); #endif @@ -1305,7 +1313,7 @@ void MenuFunctions::updateStatusBar() void MenuFunctions::drawStatusBar() { display_obj.tft.setTextSize(1); - #ifdef MARAUDER_MINI + #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) display_obj.tft.setFreeFont(NULL); #endif display_obj.tft.fillRect(0, 0, 240, STATUS_BAR_WIDTH, STATUSBAR_COLOR); @@ -1330,11 +1338,11 @@ void MenuFunctions::drawStatusBar() display_obj.tft.setTextColor(the_color, STATUSBAR_COLOR); temp_obj.old_temp = temp_obj.current_temp; display_obj.tft.fillRect(0, 0, 50, STATUS_BAR_WIDTH, STATUSBAR_COLOR); - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 display_obj.tft.drawString((String)temp_obj.current_temp + " C", 4, 0, 2); #endif - #ifdef MARAUDER_MINI + #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) display_obj.tft.drawString((String)temp_obj.current_temp + " C", 0, 0, 1); #endif display_obj.tft.setTextColor(TFT_WHITE, STATUSBAR_COLOR); @@ -1343,11 +1351,11 @@ void MenuFunctions::drawStatusBar() // WiFi Channel Stuff wifi_scan_obj.old_channel = wifi_scan_obj.set_channel; display_obj.tft.fillRect(50, 0, 50, STATUS_BAR_WIDTH, STATUSBAR_COLOR); - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 display_obj.tft.drawString("CH: " + (String)wifi_scan_obj.set_channel, 50, 0, 2); #endif - #ifdef MARAUDER_MINI + #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) display_obj.tft.drawString("CH: " + (String)wifi_scan_obj.set_channel, TFT_WIDTH/4, 0, 1); #endif @@ -1355,11 +1363,11 @@ void MenuFunctions::drawStatusBar() wifi_scan_obj.freeRAM(); wifi_scan_obj.old_free_ram = wifi_scan_obj.free_ram; display_obj.tft.fillRect(100, 0, 60, STATUS_BAR_WIDTH, STATUSBAR_COLOR); - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 display_obj.tft.drawString((String)wifi_scan_obj.free_ram + "B", 100, 0, 2); #endif - #ifdef MARAUDER_MINI + #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) display_obj.tft.drawString((String)wifi_scan_obj.free_ram + "B", TFT_WIDTH/1.75, 0, 1); #endif @@ -1376,7 +1384,7 @@ void MenuFunctions::drawStatusBar() the_color = TFT_RED; #endif - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 display_obj.tft.drawXBitmap(170, 0, menu_icons[STATUS_SD], @@ -1386,7 +1394,7 @@ void MenuFunctions::drawStatusBar() the_color); #endif - #ifdef MARAUDER_MINI + #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) display_obj.tft.setTextColor(the_color, STATUSBAR_COLOR); display_obj.tft.drawString("SD", TFT_WIDTH - 12, 0, 1); #endif @@ -1400,7 +1408,7 @@ void MenuFunctions::orientDisplay() display_obj.tft.setCursor(0, 0); - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 #ifdef TFT_SHIELD uint16_t calData[5] = { 275, 3494, 361, 3528, 4 }; // tft.setRotation(0); // Portrait with TFT Shield //Serial.println("Using TFT Shield"); @@ -1467,7 +1475,7 @@ void MenuFunctions::RunSetup() { extern LinkedList* access_points; - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 this->initLVGL(); #endif @@ -1596,7 +1604,7 @@ void MenuFunctions::RunSetup() this->drawStatusBar(); wifi_scan_obj.StartScan(WIFI_SCAN_DEAUTH, TFT_RED); }); - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 addNodes(&wifiSnifferMenu, text_table1[46], TFT_VIOLET, NULL, EAPOL, [this]() { wifi_scan_obj.StartScan(WIFI_SCAN_EAPOL, TFT_VIOLET); }); @@ -1692,7 +1700,7 @@ void MenuFunctions::RunSetup() addNodes(&wifiGeneralMenu, text09, TFT_LIGHTGREY, NULL, 0, [this]() { changeMenu(wifiGeneralMenu.parentMenu); }); - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 addNodes(&wifiGeneralMenu, text_table1[55], TFT_DARKCYAN, NULL, JOIN_WIFI, [this](){ display_obj.clearScreen(); wifi_scan_obj.currentScanMode = LV_JOIN_WIFI; @@ -1708,7 +1716,7 @@ void MenuFunctions::RunSetup() changeMenu(&generateSSIDsMenu); wifi_scan_obj.RunGenerateSSIDs(); }); - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 addNodes(&wifiGeneralMenu, text_table1[1], TFT_NAVY, NULL, KEYBOARD_ICO, [this](){ display_obj.clearScreen(); //wifi_scan_obj.currentScanMode = LV_ADD_SSID; @@ -1728,7 +1736,7 @@ void MenuFunctions::RunSetup() changeMenu(&clearAPsMenu); wifi_scan_obj.RunClearStations(); }); - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 // Select APs on OG addNodes(&wifiGeneralMenu, text_table1[56], TFT_NAVY, NULL, KEYBOARD_ICO, [this](){ display_obj.clearScreen(); @@ -1869,7 +1877,7 @@ void MenuFunctions::RunSetup() addNodes(&badusbMenu, text_table1[36], TFT_PURPLE, NULL, TEST_BAD_USB_ICO, [this]() { a32u4_obj.test(); }); - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 addNodes(&badusbMenu, text_table1[37], TFT_RED, NULL, BAD_USB_ICO, [this](){ display_obj.clearScreen(); wifi_scan_obj.currentScanMode = LV_ADD_SSID; @@ -2096,17 +2104,17 @@ void MenuFunctions::displayCurrentMenu() if (current_menu->list != NULL) { - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 display_obj.tft.setFreeFont(MENU_FONT); #endif - #ifdef MARAUDER_MINI + #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) display_obj.tft.setFreeFont(NULL); display_obj.tft.setTextSize(1); #endif for (uint8_t i = 0; i < current_menu->list->size(); i++) { - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 if (!current_menu->list->get(i).selected) display_obj.key[i].drawButton(false, current_menu->list->get(i).name); else @@ -2123,7 +2131,7 @@ void MenuFunctions::displayCurrentMenu() #endif - #ifdef MARAUDER_MINI + #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) if ((current_menu->selected == i) || (current_menu->list->get(i).selected)) display_obj.key[i].drawButton(true, current_menu->list->get(i).name); else diff --git a/esp32_marauder/MenuFunctions.h b/esp32_marauder/MenuFunctions.h index ca251d8..ad5ec64 100644 --- a/esp32_marauder/MenuFunctions.h +++ b/esp32_marauder/MenuFunctions.h @@ -16,7 +16,7 @@ #include "a32u4_interface.h" #include "settings.h" -#ifdef MARAUDER_MINI +#ifdef HAS_BUTTONS #include extern SwitchLib u_btn; extern SwitchLib d_btn; diff --git a/esp32_marauder/WiFiScan.cpp b/esp32_marauder/WiFiScan.cpp index 3ad3de0..c7b3171 100644 --- a/esp32_marauder/WiFiScan.cpp +++ b/esp32_marauder/WiFiScan.cpp @@ -590,7 +590,7 @@ void WiFiScan::RunAPScan(uint8_t scan_mode, uint16_t color) display_obj.initScrollValues(true); display_obj.tft.setTextWrap(false); display_obj.tft.setTextColor(TFT_WHITE, color); - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 display_obj.tft.fillRect(0,16,240,16, color); display_obj.tft.drawCentreString(text_table4[44],120,16,2); display_obj.touchToExit(); @@ -889,7 +889,7 @@ void WiFiScan::RunPacketMonitor(uint8_t scan_mode, uint16_t color) sd_obj.openCapture("packet_monitor"); #endif - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 #ifdef HAS_SCREEN display_obj.tft.init(); @@ -931,7 +931,7 @@ void WiFiScan::RunPacketMonitor(uint8_t scan_mode, uint16_t color) display_obj.initScrollValues(true); display_obj.tft.setTextWrap(false); display_obj.tft.setTextColor(TFT_WHITE, color); - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 display_obj.tft.fillRect(0,16,240,16, color); display_obj.tft.drawCentreString(text_table4[38],120,16,2); display_obj.touchToExit(); @@ -964,7 +964,7 @@ void WiFiScan::RunEapolScan(uint8_t scan_mode, uint16_t color) num_eapol = 0; - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 #ifdef HAS_SCREEN display_obj.tft.init(); display_obj.tft.setRotation(1); @@ -1014,7 +1014,7 @@ void WiFiScan::RunEapolScan(uint8_t scan_mode, uint16_t color) display_obj.initScrollValues(true); display_obj.tft.setTextWrap(false); display_obj.tft.setTextColor(TFT_WHITE, color); - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 display_obj.tft.fillRect(0,16,240,16, color); display_obj.tft.drawCentreString(text_table4[38],120,16,2); display_obj.touchToExit(); @@ -1077,7 +1077,7 @@ void WiFiScan::RunMimicFlood(uint8_t scan_mode, uint16_t color) { display_obj.initScrollValues(true); display_obj.tft.setTextWrap(false); display_obj.tft.setTextColor(TFT_BLACK, color); - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 display_obj.tft.fillRect(0,16,240,16, color); display_obj.tft.drawCentreString(" Mimic Flood ",120,16,2); display_obj.touchToExit(); @@ -1119,7 +1119,7 @@ void WiFiScan::RunPwnScan(uint8_t scan_mode, uint16_t color) display_obj.initScrollValues(true); display_obj.tft.setTextWrap(false); display_obj.tft.setTextColor(TFT_WHITE, color); - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 display_obj.tft.fillRect(0,16,240,16, color); display_obj.tft.drawCentreString(text_table4[37],120,16,2); display_obj.touchToExit(); @@ -1163,7 +1163,7 @@ void WiFiScan::RunBeaconScan(uint8_t scan_mode, uint16_t color) display_obj.initScrollValues(true); display_obj.tft.setTextWrap(false); display_obj.tft.setTextColor(TFT_WHITE, color); - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 display_obj.tft.fillRect(0,16,240,16, color); display_obj.tft.drawCentreString(text_table4[38],120,16,2); display_obj.touchToExit(); @@ -1206,7 +1206,7 @@ void WiFiScan::RunStationScan(uint8_t scan_mode, uint16_t color) display_obj.initScrollValues(true); display_obj.tft.setTextWrap(false); display_obj.tft.setTextColor(TFT_WHITE, color); - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 display_obj.tft.fillRect(0,16,240,16, color); display_obj.tft.drawCentreString(text_table1[59],120,16,2); display_obj.touchToExit(); @@ -1249,7 +1249,7 @@ void WiFiScan::RunRawScan(uint8_t scan_mode, uint16_t color) display_obj.initScrollValues(true); display_obj.tft.setTextWrap(false); display_obj.tft.setTextColor(TFT_WHITE, color); - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 display_obj.tft.fillRect(0,16,240,16, color); display_obj.tft.drawCentreString(text_table1[58],120,16,2); display_obj.touchToExit(); @@ -1292,7 +1292,7 @@ void WiFiScan::RunDeauthScan(uint8_t scan_mode, uint16_t color) display_obj.initScrollValues(true); display_obj.tft.setTextWrap(false); display_obj.tft.setTextColor(TFT_BLACK, color); - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 display_obj.tft.fillRect(0,16,240,16, color); display_obj.tft.drawCentreString(text_table4[39],120,16,2); display_obj.touchToExit(); @@ -1337,7 +1337,7 @@ void WiFiScan::RunProbeScan(uint8_t scan_mode, uint16_t color) display_obj.initScrollValues(true); display_obj.tft.setTextWrap(false); display_obj.tft.setTextColor(TFT_BLACK, color); - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 display_obj.tft.fillRect(0,16,240,16, color); display_obj.tft.drawCentreString(text_table4[40],120,16,2); display_obj.touchToExit(); @@ -1379,7 +1379,7 @@ void WiFiScan::RunBluetoothScan(uint8_t scan_mode, uint16_t color) display_obj.initScrollValues(true); display_obj.tft.setTextWrap(false); display_obj.tft.setTextColor(TFT_BLACK, color); - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 display_obj.tft.fillRect(0,16,240,16, color); display_obj.tft.drawCentreString(text_table4[41],120,16,2); display_obj.touchToExit(); @@ -2812,7 +2812,7 @@ void WiFiScan::wifiSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type) const WifiMgmtHdr *hdr = &ipkt->hdr; // If we dont the buffer size is not 0, don't write or else we get CORRUPT_HEAP - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 if (snifferPacket->payload[0] == 0x80) { num_beacon++; @@ -3547,7 +3547,7 @@ void WiFiScan::main(uint32_t currentTime) else if (currentScanMode == WIFI_PACKET_MONITOR) { #ifdef HAS_SCREEN - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 packetMonitorMain(currentTime); #endif #endif @@ -3555,7 +3555,7 @@ void WiFiScan::main(uint32_t currentTime) else if (currentScanMode == WIFI_SCAN_EAPOL) { #ifdef HAS_SCREEN - #ifndef MARAUDER_MINI + #ifdef HAS_ILI9341 eapolMonitorMain(currentTime); #endif #endif diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index 8a06d57..2880fed 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -8,19 +8,27 @@ //If not defined, will write packages to SD card if supported //#define WRITE_PACKETS_SERIAL + #define MARAUDER_M5STICKC //#define MARAUDER_MINI //#define MARAUDER_V4 //#define MARAUDER_V6 //#define MARAUDER_KIT //#define GENERIC_ESP32 - #define MARAUDER_FLIPPER + //#define MARAUDER_FLIPPER //#define ESP32_LDDB //#define MARAUDER_DEV_BOARD_PRO - #define MARAUDER_VERSION "v0.10.4" + #define MARAUDER_VERSION "v0.10.5" + + //// POWER MANAGEMENT + #ifdef MARAUDER_M5STICKC + #include "AXP192.h" + #endif //// BUTTON DEFINITIONS #ifdef MARAUDER_MINI + #define HAS_BUTTONS + #define L_BTN 13 #define C_BTN 34 #define U_BTN 36 @@ -28,12 +36,89 @@ #define D_BTN 35 #endif + #ifdef MARAUDER_M5STICKC + #define HAS_BUTTONS + + #define L_BTN -1 + #define C_BTN 37 + #define U_BTN -1 + #define R_BTN -1 + #define D_BTN 39 + #endif + #ifdef MARAUDER_V4 #endif //// END BUTTON DEFINITIONS //// DISPLAY DEFINITIONS + #ifdef MARAUDER_M5STICKC + //#define TFT_MISO 19 + #define TFT_MOSI 15 + #define TFT_SCLK 13 + #define TFT_CS 5 + #define TFT_DC 23 + #define TFT_RST 18 + #define TFT_BL 10 + #define TOUCH_CS 10 + //#define SD_CS 1 + + #define SCREEN_BUFFER + + #define MAX_SCREEN_BUFFER 9 + + #define BANNER_TEXT_SIZE 1 + + #ifndef TFT_WIDTH + #define TFT_WIDTH 135 + #endif + + #ifndef TFT_HEIGHT + #define TFT_HEIGHT 240 + #endif + + #define CHAR_WIDTH 6 + #define SCREEN_WIDTH TFT_HEIGHT // Originally 240 + #define SCREEN_HEIGHT TFT_WIDTH // Originally 320 + #define HEIGHT_1 TFT_WIDTH + #define WIDTH_1 TFT_WIDTH + #define STANDARD_FONT_CHAR_LIMIT (TFT_WIDTH/6) // number of characters on a single line with normal font + #define TEXT_HEIGHT (TFT_HEIGHT/10) // Height of text to be printed and scrolled + #define BOT_FIXED_AREA 0 // Number of lines in bottom fixed area (lines counted from bottom of screen) + #define TOP_FIXED_AREA 48 // Number of lines in top fixed area (lines counted from top of screen) + #define YMAX TFT_HEIGHT // Bottom of screen area + #define minimum(a,b) (((a) < (b)) ? (a) : (b)) + //#define MENU_FONT NULL + #define MENU_FONT &FreeMono9pt7b // Winner + //#define MENU_FONT &FreeMonoBold9pt7b + //#define MENU_FONT &FreeSans9pt7b + //#define MENU_FONT &FreeSansBold9pt7b + #define BUTTON_ARRAY_LEN 10 + #define STATUS_BAR_WIDTH (TFT_HEIGHT/16) + #define LVGL_TICK_PERIOD 6 + + #define FRAME_X 100 + #define FRAME_Y 64 + #define FRAME_W 120 + #define FRAME_H 50 + + // Red zone size + #define REDBUTTON_X FRAME_X + #define REDBUTTON_Y FRAME_Y + #define REDBUTTON_W (FRAME_W/2) + #define REDBUTTON_H FRAME_H + + // Green zone size + #define GREENBUTTON_X (REDBUTTON_X + REDBUTTON_W) + #define GREENBUTTON_Y FRAME_Y + #define GREENBUTTON_W (FRAME_W/2) + #define GREENBUTTON_H FRAME_H + + #define STATUSBAR_COLOR 0x4A49 + + #endif + #ifdef MARAUDER_V4 + #define HAS_ILI9341 #define BANNER_TEXT_SIZE 2 #ifndef TFT_WIDTH @@ -88,6 +173,8 @@ #endif #ifdef MARAUDER_V6 + #define HAS_ILI9341 + #define BANNER_TEXT_SIZE 2 #ifndef TFT_WIDTH @@ -142,6 +229,8 @@ #endif #ifdef MARAUDER_KIT + #define HAS_ILI9341 + #define BANNER_TEXT_SIZE 2 #ifndef TFT_WIDTH @@ -337,6 +426,24 @@ #define ICON_H 22 #define BUTTON_PADDING 10 #endif + + #ifdef MARAUDER_M5STICKC + #define BANNER_TIME 50 + + #define COMMAND_PREFIX "!" + + // Keypad start position, key sizes and spacing + #define KEY_X (TFT_WIDTH/2) // Centre of key + #define KEY_Y (TFT_HEIGHT/5) + #define KEY_W TFT_HEIGHT // Width and height + #define KEY_H (TFT_HEIGHT/17) + #define KEY_SPACING_X 0 // X and Y gap + #define KEY_SPACING_Y 1 + #define KEY_TEXTSIZE 1 // Font size multiplier + #define ICON_W 22 + #define ICON_H 22 + #define BUTTON_PADDING 10 + #endif //// END MENU DEFINITIONS //// SD DEFINITIONS @@ -356,6 +463,10 @@ #define SD_CS 4 #endif + #ifdef MARAUDER_M5STICKC + #define SD_CS 10 + #endif + #ifdef MARAUDER_FLIPPER #define SD_CS 10 #endif @@ -375,6 +486,10 @@ #define HAS_BT #endif + #ifdef MARAUDER_M5STICKC + #define HAS_SCREEN + #endif + #ifdef MARAUDER_V4 #define HAS_SCREEN #define HAS_BT diff --git a/esp32_marauder/esp32_marauder.ino b/esp32_marauder/esp32_marauder.ino index edfa18b..8b78e82 100644 --- a/esp32_marauder/esp32_marauder.ino +++ b/esp32_marauder/esp32_marauder.ino @@ -42,13 +42,25 @@ https://www.online-utility.org/image/convert/to/XBM #include "a32u4_interface.h" #endif -#ifdef MARAUDER_MINI +#ifdef HAS_BUTTONS #include - SwitchLib u_btn = SwitchLib(U_BTN, 1000, true); - SwitchLib d_btn = SwitchLib(D_BTN, 1000, true); - SwitchLib l_btn = SwitchLib(L_BTN, 1000, true); - SwitchLib r_btn = SwitchLib(R_BTN, 1000, true); - SwitchLib c_btn = SwitchLib(C_BTN, 1000, true); + + #if (U_BTN >= 0) + SwitchLib u_btn = SwitchLib(U_BTN, 1000, true); + #endif + #if (D_BTN >= 0) + SwitchLib d_btn = SwitchLib(D_BTN, 1000, true); + #endif + #if (L_BTN >= 0) + SwitchLib l_btn = SwitchLib(L_BTN, 1000, true); + #endif + #if (R_BTN >= 0) + SwitchLib r_btn = SwitchLib(R_BTN, 1000, true); + #endif + #if (C_BTN >= 0) + SwitchLib c_btn = SwitchLib(C_BTN, 1000, true); + #endif + #endif WiFiScan wifi_scan_obj; @@ -69,6 +81,10 @@ flipperLED flipper_led; A32u4Interface a32u4_obj; #endif +#ifdef MARAUDER_M5STICKC + AXP192 axp192_obj; +#endif + const String PROGMEM version_number = MARAUDER_VERSION; Adafruit_NeoPixel strip = Adafruit_NeoPixel(Pixels, PIN, NEO_GRB + NEO_KHZ800); @@ -103,6 +119,10 @@ void backlightOff() { void setup() { + #ifdef MARAUDER_M5STICKC + axp192_obj.begin(); + #endif + pinMode(FLASH_BUTTON, INPUT); #ifdef HAS_SCREEN