gitea-mirror/ESP32Marauder
1
0
Fork 0
mirror of https://github.com/justcallmekoko/ESP32Marauder.git synced 2025-12-05 20:40:25 -08:00
Code Issues Packages Projects Releases Wiki Activity

Add support for M5 Cardputer

Browse Source
This commit is contained in:
Just Call Me Koko
2025-07-21 18:47:57 -04:00
parent 3d9b91a80b
commit 530a30c6d7
15 changed files with 1261 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/build_parallel.yml vendored
View File

@@ -34,6 +34,7 @@ jobs:
- { name: "Marauder CYD 2432S024 GUITION", flag: "MARAUDER_CYD_GUITION", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "cyd_2432S024_guition", tft: true, tft_file: "User_Setup_cyd_guition.h", build_dir: "d32", addr: "0x1000" } - { name: "Marauder CYD 2432S024 GUITION", flag: "MARAUDER_CYD_GUITION", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "cyd_2432S024_guition", tft: true, tft_file: "User_Setup_cyd_guition.h", build_dir: "d32", addr: "0x1000" }
- { name: "Marauder CYD 2432S028 2 USB", flag: "MARAUDER_CYD_2USB", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "cyd_2432S028_2usb", tft: true, tft_file: "User_Setup_cyd_2usb.h", build_dir: "d32", addr: "0x1000" } - { name: "Marauder CYD 2432S028 2 USB", flag: "MARAUDER_CYD_2USB", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "cyd_2432S028_2usb", tft: true, tft_file: "User_Setup_cyd_2usb.h", build_dir: "d32", addr: "0x1000" }
- { name: "Marauder v7.1", flag: "MARAUDER_V7_1", fbqn: "esp32:esp32:dfrobot_firebeetle2_esp32e:FlashSize=16M,PartitionScheme=min_spiffs,PSRAM=enabled", file_name: "marauder_v7_1", tft: true, tft_file: "User_Setup_dual_nrf24.h", build_dir: "dfrobot_firebeetle2_esp32e", addr: "0x1000" } - { name: "Marauder v7.1", flag: "MARAUDER_V7_1", fbqn: "esp32:esp32:dfrobot_firebeetle2_esp32e:FlashSize=16M,PartitionScheme=min_spiffs,PSRAM=enabled", file_name: "marauder_v7_1", tft: true, tft_file: "User_Setup_dual_nrf24.h", build_dir: "dfrobot_firebeetle2_esp32e", addr: "0x1000" }
- { name: "M5Cardputer", flag: "MARAUDER_CARDPUTER", fbqn: "esp32:esp32:esp32s3:PartitionScheme=min_spiffs,FlashSize=8M,PSRAM=disabled", file_name: "m5cardputer", tft: true, tft_file: "User_Setup_marauder_m5cardputer.h", build_dir: "esp32s3", addr: "0x1000" }
steps: steps:
- name: Checkout Code - name: Checkout Code

1
User_Setup_Select.h
View File

@@ -34,6 +34,7 @@
//#include <User_Setup_cyd_micro.h> //#include <User_Setup_cyd_micro.h>
//#include <User_Setup_cyd_guition.h> //#include <User_Setup_cyd_guition.h>
//#include <User_Setup_cyd_2usb.h> //#include <User_Setup_cyd_2usb.h>
//#include <User_Setup_marauder_m5cardputer.h>
//#include <User_Setups/Setup1_ILI9341.h> // Setup file configured for my ILI9341 //#include <User_Setups/Setup1_ILI9341.h> // Setup file configured for my ILI9341
//#include <User_Setups/Setup2_ST7735.h> // Setup file configured for my ST7735 //#include <User_Setups/Setup2_ST7735.h> // Setup file configured for my ST7735

328
User_Setup_marauder_m5cardputer.h Normal file
View File

@@ -0,0 +1,328 @@
// 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
#define CGRAM_OFFSET
// 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 135 // Marauder Mini
// #define TFT_WIDTH 240 // ST7789 240 x 240 and 240 x 320
// #define TFT_HEIGHT 160
#define TFT_HEIGHT 240 // 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 HIGH // 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
// M5 Cardputer
#define TFT_BL 38
#define TFT_RST 33 // Reset pin (could connect to NodeMCU RST, see next line)
#define TFT_DC 34 // Data Command control pin
#define TFT_MOSI 35
#define TFT_SCLK 36
#define TFT_CS 37 // Chip select control pin D8
#define TOUCH_CS -1
// #define TFT_MISO -1
// 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
/*
// 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

38
esp32_marauder/Display.cpp
View File

@@ -131,22 +131,6 @@ void Display::RunSetup()
tft.setRotation(SCREEN_ORIENTATION); tft.setRotation(SCREEN_ORIENTATION);
/*#ifndef MARAUDER_M5STICKC
tft.setRotation(0); // Portrait
#endif
#ifdef HAS_CYD_PORTRAIT
tft.setRotation(3); // Bro these CYDs are so stupid
#endif
#ifdef MARAUDER_M5STICKC
tft.setRotation(1);
#endif
#ifdef MARAUDER_REV_FEATHER
tft.setRotation(1);
#endif*/
tft.setCursor(0, 0); tft.setCursor(0, 0);
#ifdef HAS_ILI9341 #ifdef HAS_ILI9341
@@ -154,23 +138,16 @@ void Display::RunSetup()
#ifndef HAS_CYD_TOUCH #ifndef HAS_CYD_TOUCH
#ifdef TFT_SHIELD #ifdef TFT_SHIELD
uint16_t calData[5] = { 275, 3494, 361, 3528, 4 }; // tft.setRotation(0); // Portrait with TFT Shield uint16_t calData[5] = { 275, 3494, 361, 3528, 4 }; // tft.setRotation(0); // Portrait with TFT Shield
//Serial.println(F("Using TFT Shield"));
#elif defined(TFT_DIY) #elif defined(TFT_DIY)
uint16_t calData[5] = { 339, 3470, 237, 3438, 2 }; // tft.setRotation(0); // Portrait with DIY TFT uint16_t calData[5] = { 339, 3470, 237, 3438, 2 }; // tft.setRotation(0); // Portrait with DIY TFT
//Serial.println(F("Using TFT DIY"));
#endif #endif
tft.setTouch(calData); tft.setTouch(calData);
#endif #endif
#endif #endif
//tft.fillScreen(TFT_BLACK);
clearScreen(); clearScreen();
//Serial.println("SPI_FREQUENCY: " + (String)SPI_FREQUENCY);
//Serial.println("SPI_READ_FREQUENCY:" + (String)SPI_READ_FREQUENCY);
//Serial.println("SPI_TOUCH_FREQUENCY: " + (String)SPI_TOUCH_FREQUENCY);
#ifdef KIT #ifdef KIT
pinMode(KIT_LED_BUILTIN, OUTPUT); pinMode(KIT_LED_BUILTIN, OUTPUT);
#endif #endif
@@ -734,7 +711,7 @@ void Display::drawStylus()
//==================================================================================== //====================================================================================
// Decode and render the Jpeg image onto the TFT screen // Decode and render the Jpeg image onto the TFT screen
//==================================================================================== //====================================================================================
void Display::jpegRender(int xpos, int ypos) { /*void Display::jpegRender(int xpos, int ypos) {
// retrieve infomration about the image // retrieve infomration about the image
uint16_t *pImg; uint16_t *pImg;
@@ -801,13 +778,13 @@ void Display::jpegRender(int xpos, int ypos) {
// calculate how long it took to draw the image // calculate how long it took to draw the image
drawTime = millis() - drawTime; // Calculate the time it took drawTime = millis() - drawTime; // Calculate the time it took
} }*/
//==================================================================================== //====================================================================================
// Print information decoded from the Jpeg image // Print information decoded from the Jpeg image
//==================================================================================== //====================================================================================
void Display::jpegInfo() { /*void Display::jpegInfo() {
/*
Serial.println("==============="); Serial.println("===============");
Serial.println("JPEG image info"); Serial.println("JPEG image info");
Serial.println("==============="); Serial.println("===============");
@@ -821,13 +798,12 @@ void Display::jpegInfo() {
Serial.print ("MCU height :"); Serial.println(JpegDec.MCUHeight); Serial.print ("MCU height :"); Serial.println(JpegDec.MCUHeight);
Serial.println("==============="); Serial.println("===============");
Serial.println(""); Serial.println("");
*/ }*/
}
//==================================================================================== //====================================================================================
// Open a Jpeg file and send it to the Serial port in a C array compatible format // Open a Jpeg file and send it to the Serial port in a C array compatible format
//==================================================================================== //====================================================================================
void createArray(const char *filename) { /*void createArray(const char *filename) {
// Open the named file // Open the named file
fs::File jpgFile = SPIFFS.open( filename, "r"); // File handle reference for SPIFFS fs::File jpgFile = SPIFFS.open( filename, "r"); // File handle reference for SPIFFS
@@ -867,7 +843,7 @@ void createArray(const char *filename) {
Serial.println("};\r\n"); Serial.println("};\r\n");
jpgFile.close(); jpgFile.close();
} }*/
// End JPEG_functions // End JPEG_functions

6
esp32_marauder/Display.h
View File

@@ -9,7 +9,7 @@
#include <FS.h> #include <FS.h>
#include <functional> #include <functional>
#include <JPEGDecoder.h> //#include <JPEGDecoder.h>
#include <LinkedList.h> #include <LinkedList.h>
#include <SPI.h> #include <SPI.h>
#include <lvgl.h> #include <lvgl.h>
@@ -136,8 +136,8 @@ class Display
//void drawJpeg(const char *filename, int xpos, int ypos); //void drawJpeg(const char *filename, int xpos, int ypos);
void getTouchWhileFunction(bool pressed); void getTouchWhileFunction(bool pressed);
void initScrollValues(bool tte = false); void initScrollValues(bool tte = false);
void jpegInfo(); //void jpegInfo();
void jpegRender(int xpos, int ypos); //void jpegRender(int xpos, int ypos);
void listDir(fs::FS &fs, const char * dirname, uint8_t levels); void listDir(fs::FS &fs, const char * dirname, uint8_t levels);
void listFiles(); void listFiles();
void main(uint8_t scan_mode); void main(uint8_t scan_mode);

269
esp32_marauder/Keyboard.cpp Normal file
View File

@@ -0,0 +1,269 @@
#include "Keyboard.h"
#ifdef MARAUDER_CARDPUTER
#include <driver/gpio.h>
#include <Arduino.h>
#define digitalWrite(pin, level) gpio_set_level((gpio_num_t)pin, level)
#define digitalRead(pin) gpio_get_level((gpio_num_t)pin)
void Keyboard_Class::_set_output(const std::vector<int> &pinList,
uint8_t output)
{
output = output & 0B00000111;
digitalWrite(pinList[0], (output & 0B00000001));
digitalWrite(pinList[1], (output & 0B00000010));
digitalWrite(pinList[2], (output & 0B00000100));
}
uint8_t Keyboard_Class::_get_input(const std::vector<int> &pinList)
{
uint8_t buffer = 0x00;
uint8_t pin_value = 0x00;
for (int i = 0; i < 7; i++)
{
pin_value = (digitalRead(pinList[i]) == 1) ? 0x00 : 0x01;
pin_value = pin_value << i;
buffer = buffer | pin_value;
}
return buffer;
}
void Keyboard_Class::begin()
{
for (auto i : output_list)
{
gpio_reset_pin((gpio_num_t)i);
gpio_set_direction((gpio_num_t)i, GPIO_MODE_OUTPUT);
gpio_set_pull_mode((gpio_num_t)i, GPIO_PULLUP_PULLDOWN);
digitalWrite(i, 0);
}
for (auto i : input_list)
{
gpio_reset_pin((gpio_num_t)i);
gpio_set_direction((gpio_num_t)i, GPIO_MODE_INPUT);
gpio_set_pull_mode((gpio_num_t)i, GPIO_PULLUP_ONLY);
}
_set_output(output_list, 0);
}
uint8_t Keyboard_Class::getKey(Point2D_t keyCoor)
{
uint8_t ret = 0;
if ((keyCoor.x < 0) || (keyCoor.y < 0))
{
return 0;
}
if (_keys_state_buffer.ctrl || _keys_state_buffer.shift ||
_is_caps_locked)
{
ret = _key_value_map[keyCoor.y][keyCoor.x].value_second;
}
else
{
ret = _key_value_map[keyCoor.y][keyCoor.x].value_first;
}
return ret;
}
void Keyboard_Class::updateKeyList()
{
_key_list_buffer.clear();
Point2D_t coor;
uint8_t input_value = 0;
for (int i = 0; i < 8; i++)
{
_set_output(output_list, i);
input_value = _get_input(input_list);
/* If key pressed */
if (input_value)
{
/* Get X */
for (int j = 0; j < 7; j++)
{
if (input_value & (0x01 << j))
{
coor.x = (i > 3) ? X_map_chart[j].x_1 : X_map_chart[j].x_2;
/* Get Y */
coor.y = (i > 3) ? (i - 4) : i;
// printf("%d,%d\t", coor.x, coor.y);
/* Keep the same as picture */
coor.y = -coor.y;
coor.y = coor.y + 3;
_key_list_buffer.push_back(coor);
}
}
}
}
}
uint8_t Keyboard_Class::isPressed()
{
return _key_list_buffer.size();
}
bool Keyboard_Class::isChange()
{
if (_last_key_size != _key_list_buffer.size())
{
_last_key_size = _key_list_buffer.size();
return true;
}
else
{
return false;
}
}
String Keyboard_Class::getPressedKeysString() {
updateKeyList();
String pressed = "";
for (auto &keyCoor : _key_list_buffer) {
pressed += getKey(keyCoor);
}
return pressed;
}
bool Keyboard_Class::isKeyPressed(char c)
{
if (_key_list_buffer.size())
{
for (const auto &i : _key_list_buffer)
{
if (getKey(i) == c)
return true;
}
}
return false;
}
#include <cstring>
void Keyboard_Class::updateKeysState()
{
_keys_state_buffer.reset();
_key_pos_print_keys.clear();
_key_pos_hid_keys.clear();
_key_pos_modifier_keys.clear();
// Get special keys
for (auto &i : _key_list_buffer)
{
// modifier
if (getKeyValue(i).value_first == KEY_FN)
{
_keys_state_buffer.fn = true;
continue;
}
if (getKeyValue(i).value_first == KEY_OPT)
{
_keys_state_buffer.opt = true;
continue;
}
if (getKeyValue(i).value_first == KEY_LEFT_CTRL)
{
_keys_state_buffer.ctrl = true;
_key_pos_modifier_keys.push_back(i);
continue;
}
if (getKeyValue(i).value_first == KEY_LEFT_SHIFT)
{
_keys_state_buffer.shift = true;
_key_pos_modifier_keys.push_back(i);
continue;
}
if (getKeyValue(i).value_first == KEY_LEFT_ALT)
{
_keys_state_buffer.alt = true;
_key_pos_modifier_keys.push_back(i);
continue;
}
// function
if (getKeyValue(i).value_first == KEY_TAB)
{
_keys_state_buffer.tab = true;
_key_pos_hid_keys.push_back(i);
continue;
}
if (getKeyValue(i).value_first == KEY_BACKSPACE)
{
_keys_state_buffer.del = true;
_key_pos_hid_keys.push_back(i);
continue;
}
if (getKeyValue(i).value_first == KEY_ENTER)
{
_keys_state_buffer.enter = true;
_key_pos_hid_keys.push_back(i);
continue;
}
if (getKeyValue(i).value_first == ' ')
{
_keys_state_buffer.space = true;
}
_key_pos_hid_keys.push_back(i);
_key_pos_print_keys.push_back(i);
}
for (auto &i : _key_pos_modifier_keys)
{
uint8_t key = getKeyValue(i).value_first;
_keys_state_buffer.modifier_keys.push_back(key);
}
for (auto &k : _keys_state_buffer.modifier_keys)
{
_keys_state_buffer.modifiers |= (1 << (k - 0x80));
}
for (auto &i : _key_pos_hid_keys)
{
uint8_t k = getKeyValue(i).value_first;
if (k == KEY_TAB || k == KEY_BACKSPACE || k == KEY_ENTER)
{
_keys_state_buffer.hid_keys.push_back(k);
continue;
}
uint8_t key = _kb_asciimap[k];
if (key)
{
_keys_state_buffer.hid_keys.push_back(key);
}
}
// Deal what left
for (auto &i : _key_pos_print_keys)
{
if (_keys_state_buffer.ctrl || _keys_state_buffer.shift ||
_is_caps_locked)
{
_keys_state_buffer.word.push_back(getKeyValue(i).value_second);
}
else
{
_keys_state_buffer.word.push_back(getKeyValue(i).value_first);
}
}
}
#endif

206
esp32_marauder/Keyboard.h Normal file
View File

@@ -0,0 +1,206 @@
#pragma once
#ifndef Keyboard_h
#define Keyboard_h
#include "configs.h"
#ifdef MARAUDER_CARDPUTER
/**
* @file keyboard.h
* @author Forairaaaaa
* @brief
* @version 0.1
* @date 2023-09-22
*
* @copyright Copyright (c) 2023
*
*/
#include <iostream>
#include <vector>
#include "Arduino.h"
#include "Keyboard_def.h"
#include "configs.h"
struct Chart_t
{
uint8_t value;
uint8_t x_1;
uint8_t x_2;
};
struct Point2D_t
{
int x;
int y;
};
const std::vector<int> output_list = {8, 9, 11};
const std::vector<int> input_list = {13, 15, 3, 4, 5, 6, 7};
const Chart_t X_map_chart[7] = {{1, 0, 1}, {2, 2, 3}, {4, 4, 5}, {8, 6, 7}, {16, 8, 9}, {32, 10, 11}, {64, 12, 13}};
struct KeyValue_t
{
const char value_first;
const char value_second;
};
const KeyValue_t _key_value_map[4][14] = {{{'`', '~'},
{'1', '!'},
{'2', '@'},
{'3', '#'},
{'4', '$'},
{'5', '%'},
{'6', '^'},
{'7', '&'},
{'8', '*'},
{'9', '('},
{'0', ')'},
{'-', '_'},
{'=', '+'},
{KEY_BACKSPACE, KEY_BACKSPACE}},
{{KEY_TAB, KEY_TAB},
{'q', 'Q'},
{'w', 'W'},
{'e', 'E'},
{'r', 'R'},
{'t', 'T'},
{'y', 'Y'},
{'u', 'U'},
{'i', 'I'},
{'o', 'O'},
{'p', 'P'},
{'[', '{'},
{']', '}'},
{'\\', '|'}},
{{KEY_FN, KEY_FN},
{KEY_LEFT_SHIFT, KEY_LEFT_SHIFT},
{'a', 'A'},
{'s', 'S'},
{'d', 'D'},
{'f', 'F'},
{'g', 'G'},
{'h', 'H'},
{'j', 'J'},
{'k', 'K'},
{'l', 'L'},
{';', ':'},
{'\'', '\"'},
{KEY_ENTER, KEY_ENTER}},
{{KEY_LEFT_CTRL, KEY_LEFT_CTRL},
{KEY_OPT, KEY_OPT},
{KEY_LEFT_ALT, KEY_LEFT_ALT},
{'z', 'Z'},
{'x', 'X'},
{'c', 'C'},
{'v', 'V'},
{'b', 'B'},
{'n', 'N'},
{'m', 'M'},
{',', '<'},
{'.', '>'},
{'/', '?'},
{' ', ' '}}};
class Keyboard_Class
{
public:
struct KeysState
{
bool tab = false;
bool fn = false;
bool shift = false;
bool ctrl = false;
bool opt = false;
bool alt = false;
bool del = false;
bool enter = false;
bool space = false;
uint8_t modifiers = 0;
std::vector<char> word;
std::vector<uint8_t> hid_keys;
std::vector<uint8_t> modifier_keys;
void reset()
{
tab = false;
fn = false;
shift = false;
ctrl = false;
opt = false;
alt = false;
del = false;
enter = false;
space = false;
modifiers = 0;
word.clear();
hid_keys.clear();
modifier_keys.clear();
}
};
private:
std::vector<Point2D_t> _key_list_buffer;
std::vector<Point2D_t> _key_pos_print_keys; // only text: eg A,B,C
std::vector<Point2D_t> _key_pos_hid_keys; // print key + space, enter, del
std::vector<Point2D_t>
_key_pos_modifier_keys; // modifier key: eg shift, ctrl, alt
KeysState _keys_state_buffer;
bool _is_caps_locked;
uint8_t _last_key_size;
void _set_output(const std::vector<int> &pinList, uint8_t output);
uint8_t _get_input(const std::vector<int> &pinList);
public:
const char _ascii_list[95] = {'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p',
'q','r','s','t','u','v','w','x','y','z','A','B','C','D','E','F',
'G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V',
'W','X','Y','Z',' ','0','1','2','3','4','5','6','7','8','9','-',
'=','[',']',';','\'',',','.','/','`','\\','_','+','{','}',':',
'"','<','>','?','~','|','!','@','#','$','%','^','&','*','(',')'};
Keyboard_Class() : _is_caps_locked(false)
{
}
void begin();
uint8_t getKey(Point2D_t keyCoor);
void updateKeyList();
inline std::vector<Point2D_t> &keyList()
{
return _key_list_buffer;
}
inline KeyValue_t getKeyValue(const Point2D_t &keyCoor)
{
return _key_value_map[keyCoor.y][keyCoor.x];
}
uint8_t isPressed();
bool isChange();
bool isKeyPressed(char c);
String getPressedKeysString();
void updateKeysState();
inline KeysState &keysState()
{
return _keys_state_buffer;
}
inline bool capslocked(void)
{
return _is_caps_locked;
}
inline void setCapsLocked(bool isLocked)
{
_is_caps_locked = isLocked;
}
};
#endif
#endif

155
esp32_marauder/Keyboard_def.h Normal file
View File

@@ -0,0 +1,155 @@
#ifndef M5CARDPUTER_KB_KEYS_DEF_H
#define M5CARDPUTER_KB_KEYS_DEF_H
#include "configs.h"
#ifdef MARAUDER_CARDPUTER
#define SHIFT 0x80
#define KEY_LEFT_CTRL 0x80
#define KEY_LEFT_SHIFT 0x81
#define KEY_LEFT_ALT 0x82
#define KEY_FN 0xff
#define KEY_OPT 0x00
#define KEY_BACKSPACE 0x2a
#define KEY_TAB 0x2b
#define KEY_ENTER 0x28
const uint8_t _kb_asciimap[128] = {
0x00, // NUL
0x00, // SOH
0x00, // STX
0x00, // ETX
0x00, // EOT
0x00, // ENQ
0x00, // ACK
0x00, // BEL
KEY_BACKSPACE, // BS Backspace
KEY_TAB, // TAB Tab
KEY_ENTER, // LF Enter
0x00, // VT
0x00, // FF
0x00, // CR
0x00, // SO
0x00, // SI
0x00, // DEL
0x00, // DC1
0x00, // DC2
0x00, // DC3
0x00, // DC4
0x00, // NAK
0x00, // SYN
0x00, // ETB
0x00, // CAN
0x00, // EM
0x00, // SUB
0x00, // ESC
0x00, // FS
0x00, // GS
0x00, // RS
0x00, // US
0x2c, // ' '
0x1e | SHIFT, // !
0x34 | SHIFT, // "
0x20 | SHIFT, // #
0x21 | SHIFT, // $
0x22 | SHIFT, // %
0x24 | SHIFT, // &
0x34, // '
0x26 | SHIFT, // (
0x27 | SHIFT, // )
0x25 | SHIFT, // *
0x2e | SHIFT, // +
0x36, // ,
0x2d, // -
0x37, // .
0x38, // /
0x27, // 0
0x1e, // 1
0x1f, // 2
0x20, // 3
0x21, // 4
0x22, // 5
0x23, // 6
0x24, // 7
0x25, // 8
0x26, // 9
0x33 | SHIFT, // :
0x33, // ;
0x36 | SHIFT, // <
0x2e, // =
0x37 | SHIFT, // >
0x38 | SHIFT, // ?
0x1f | SHIFT, // @
0x04 | SHIFT, // A
0x05 | SHIFT, // B
0x06 | SHIFT, // C
0x07 | SHIFT, // D
0x08 | SHIFT, // E
0x09 | SHIFT, // F
0x0a | SHIFT, // G
0x0b | SHIFT, // H
0x0c | SHIFT, // I
0x0d | SHIFT, // J
0x0e | SHIFT, // K
0x0f | SHIFT, // L
0x10 | SHIFT, // M
0x11 | SHIFT, // N
0x12 | SHIFT, // O
0x13 | SHIFT, // P
0x14 | SHIFT, // Q
0x15 | SHIFT, // R
0x16 | SHIFT, // S
0x17 | SHIFT, // T
0x18 | SHIFT, // U
0x19 | SHIFT, // V
0x1a | SHIFT, // W
0x1b | SHIFT, // X
0x1c | SHIFT, // Y
0x1d | SHIFT, // Z
0x2f, // [
0x31, // bslash
0x30, // ]
0x23 | SHIFT, // ^
0x2d | SHIFT, // _
0x35, // `
0x04, // a
0x05, // b
0x06, // c
0x07, // d
0x08, // e
0x09, // f
0x0a, // g
0x0b, // h
0x0c, // i
0x0d, // j
0x0e, // k
0x0f, // l
0x10, // m
0x11, // n
0x12, // o
0x13, // p
0x14, // q
0x15, // r
0x16, // s
0x17, // t
0x18, // u
0x19, // v
0x1a, // w
0x1b, // x
0x1c, // y
0x1d, // z
0x2f | SHIFT, // {
0x31 | SHIFT, // |
0x30 | SHIFT, // }
0x35 | SHIFT, // ~
0 // DEL
};
#endif
#endif

150
esp32_marauder/MenuFunctions.cpp
View File

@@ -896,7 +896,9 @@ void MenuFunctions::main(uint32_t currentTime)
#ifdef HAS_BUTTONS #ifdef HAS_BUTTONS
bool c_btn_press = c_btn.justPressed(); #if (C_BTN >= 0)
bool c_btn_press = c_btn.justPressed();
#endif
#ifndef HAS_ILI9341 #ifndef HAS_ILI9341
@@ -1147,47 +1149,58 @@ void MenuFunctions::main(uint32_t currentTime)
#ifdef HAS_BUTTONS #ifdef HAS_BUTTONS
#if !(defined(MARAUDER_V6) || defined(MARAUDER_V6_1) || defined(MARAUDER_CYD_MICRO) || defined(MARAUDER_CYD_GUITION) || defined(MARAUDER_CYD_2USB)) #if !(defined(MARAUDER_V6) || defined(MARAUDER_V6_1) || defined(MARAUDER_CYD_MICRO) || defined(MARAUDER_CYD_GUITION) || defined(MARAUDER_CYD_2USB))
#if !defined(MARAUDER_M5STICKC) || defined(MARAUDER_M5STICKCP2) #if !defined(MARAUDER_M5STICKC) || defined(MARAUDER_M5STICKCP2)
if (u_btn.justPressed()){ #if (U_BTN >= 0 || defined(MARAUDER_CARDPUTER))
if ((wifi_scan_obj.currentScanMode == WIFI_SCAN_OFF) || #if (U_BTN >= 0)
(wifi_scan_obj.currentScanMode == WIFI_CONNECTED) || if (u_btn.justPressed()) {
(wifi_scan_obj.currentScanMode == OTA_UPDATE)) { #elif defined(MARAUDER_CARDPUTER)
if (current_menu->selected > 0) { if (this->isKeyPressed(';')) {
current_menu->selected--; #endif
// Page up if ((wifi_scan_obj.currentScanMode == WIFI_SCAN_OFF) ||
if (current_menu->selected < this->menu_start_index) { (wifi_scan_obj.currentScanMode == WIFI_CONNECTED) ||
this->buildButtons(current_menu, current_menu->selected); (wifi_scan_obj.currentScanMode == OTA_UPDATE)) {
this->displayCurrentMenu(current_menu->selected); if (current_menu->selected > 0) {
current_menu->selected--;
// Page up
if (current_menu->selected < this->menu_start_index) {
this->buildButtons(current_menu, current_menu->selected);
this->displayCurrentMenu(current_menu->selected);
}
this->buttonSelected(current_menu->selected - this->menu_start_index, current_menu->selected);
if (!current_menu->list->get(current_menu->selected + 1).selected)
this->buttonNotSelected(current_menu->selected + 1 - this->menu_start_index, current_menu->selected + 1);
}
// Loop to end
else {
current_menu->selected = current_menu->list->size() - 1;
if (current_menu->selected >= BUTTON_SCREEN_LIMIT) {
this->buildButtons(current_menu, current_menu->selected + 1 - BUTTON_SCREEN_LIMIT);
this->displayCurrentMenu(current_menu->selected + 1 - BUTTON_SCREEN_LIMIT);
}
this->buttonSelected(current_menu->selected, current_menu->selected);
if (!current_menu->list->get(0).selected)
this->buttonNotSelected(0, this->menu_start_index);
}
} }
this->buttonSelected(current_menu->selected - this->menu_start_index, current_menu->selected); else if ((wifi_scan_obj.currentScanMode == WIFI_PACKET_MONITOR) ||
if (!current_menu->list->get(current_menu->selected + 1).selected) (wifi_scan_obj.currentScanMode == WIFI_SCAN_EAPOL) ||
this->buttonNotSelected(current_menu->selected + 1 - this->menu_start_index, current_menu->selected + 1); (wifi_scan_obj.currentScanMode == WIFI_SCAN_CHAN_ANALYZER) ||
} (wifi_scan_obj.currentScanMode == WIFI_SCAN_PACKET_RATE) ||
// Loop to end (wifi_scan_obj.currentScanMode == WIFI_SCAN_RAW_CAPTURE) ||
else { (wifi_scan_obj.currentScanMode == WIFI_SCAN_SIG_STREN)) {
current_menu->selected = current_menu->list->size() - 1; if (wifi_scan_obj.set_channel < 14)
if (current_menu->selected >= BUTTON_SCREEN_LIMIT) { wifi_scan_obj.changeChannel(wifi_scan_obj.set_channel + 1);
this->buildButtons(current_menu, current_menu->selected + 1 - BUTTON_SCREEN_LIMIT); else
this->displayCurrentMenu(current_menu->selected + 1 - BUTTON_SCREEN_LIMIT); wifi_scan_obj.changeChannel(1);
} }
this->buttonSelected(current_menu->selected, current_menu->selected);
if (!current_menu->list->get(0).selected)
this->buttonNotSelected(0, this->menu_start_index);
} }
} #endif
else if ((wifi_scan_obj.currentScanMode == WIFI_PACKET_MONITOR) ||
(wifi_scan_obj.currentScanMode == WIFI_SCAN_EAPOL) ||
(wifi_scan_obj.currentScanMode == WIFI_SCAN_CHAN_ANALYZER) ||
(wifi_scan_obj.currentScanMode == WIFI_SCAN_PACKET_RATE) ||
(wifi_scan_obj.currentScanMode == WIFI_SCAN_RAW_CAPTURE) ||
(wifi_scan_obj.currentScanMode == WIFI_SCAN_SIG_STREN)) {
if (wifi_scan_obj.set_channel < 14)
wifi_scan_obj.changeChannel(wifi_scan_obj.set_channel + 1);
else
wifi_scan_obj.changeChannel(1);
}
}
#endif #endif
#if (D_BTN >= 0 || defined(MARAUDER_CARDPUTER))
#if (D_BTN >= 0)
if (d_btn.justPressed()){ if (d_btn.justPressed()){
#elif defined(MARAUDER_CARDPUTER)
if (this->isKeyPressed('.')){
#endif
if ((wifi_scan_obj.currentScanMode == WIFI_SCAN_OFF) || if ((wifi_scan_obj.currentScanMode == WIFI_SCAN_OFF) ||
(wifi_scan_obj.currentScanMode == WIFI_CONNECTED) || (wifi_scan_obj.currentScanMode == WIFI_CONNECTED) ||
(wifi_scan_obj.currentScanMode == OTA_UPDATE)) { (wifi_scan_obj.currentScanMode == OTA_UPDATE)) {
@@ -1231,6 +1244,7 @@ void MenuFunctions::main(uint32_t currentTime)
wifi_scan_obj.changeChannel(14); wifi_scan_obj.changeChannel(14);
} }
} }
#endif
if(c_btn_press){ if(c_btn_press){
current_menu->list->get(current_menu->selected).callable(); current_menu->list->get(current_menu->selected).callable();
} }
@@ -1349,7 +1363,7 @@ void MenuFunctions::updateStatusBar()
bool status_changed = false; bool status_changed = false;
#if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) || defined(MARAUDER_REV_FEATHER) #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) || defined(MARAUDER_REV_FEATHER) || defined(MARAUDER_CARDPUTER)
display_obj.tft.setFreeFont(NULL); display_obj.tft.setFreeFont(NULL);
#endif #endif
@@ -1403,7 +1417,7 @@ void MenuFunctions::updateStatusBar()
if ((current_channel != wifi_scan_obj.old_channel) || (status_changed)) { if ((current_channel != wifi_scan_obj.old_channel) || (status_changed)) {
wifi_scan_obj.old_channel = current_channel; wifi_scan_obj.old_channel = current_channel;
#if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) || defined(MARAUDER_REV_FEATHER) #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) || defined(MARAUDER_REV_FEATHER) || defined(MARAUDER_CARDPUTER)
display_obj.tft.fillRect(43, 0, TFT_WIDTH * 0.21, STATUS_BAR_WIDTH, STATUSBAR_COLOR); display_obj.tft.fillRect(43, 0, TFT_WIDTH * 0.21, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
#else #else
display_obj.tft.fillRect(50, 0, TFT_WIDTH * 0.21, STATUS_BAR_WIDTH, STATUSBAR_COLOR); display_obj.tft.fillRect(50, 0, TFT_WIDTH * 0.21, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
@@ -1810,6 +1824,20 @@ void MenuFunctions::displaySetting(String key, Menu* menu, int index) {
} }
#ifdef MARAUDER_CARDPUTER
bool MenuFunctions::isKeyPressed(char c)
{
M5CardputerKeyboard.updateKeyList();
M5CardputerKeyboard.updateKeysState();
bool pressed = M5CardputerKeyboard.isKeyPressed(c);
if (pressed)
delay(200);
return pressed;
}
#endif
// Function to build the menus // Function to build the menus
void MenuFunctions::RunSetup() void MenuFunctions::RunSetup()
{ {
@@ -1825,6 +1853,10 @@ void MenuFunctions::RunSetup()
#ifdef HAS_ILI9341 #ifdef HAS_ILI9341
this->initLVGL(); this->initLVGL();
#endif #endif
#ifdef MARAUDER_CARDPUTER
M5CardputerKeyboard.begin();
#endif
// root menu stuff // root menu stuff
mainMenu.list = new LinkedList<MenuNode>(); // Get list in first menu ready mainMenu.list = new LinkedList<MenuNode>(); // Get list in first menu ready
@@ -2348,9 +2380,11 @@ void MenuFunctions::RunSetup()
//#if (!defined(HAS_ILI9341) && defined(HAS_BUTTONS)) //#if (!defined(HAS_ILI9341) && defined(HAS_BUTTONS))
miniKbMenu.parentMenu = &wifiGeneralMenu; miniKbMenu.parentMenu = &wifiGeneralMenu;
this->addNodes(&miniKbMenu, "a", TFTCYAN, NULL, 0, [this]() { #ifndef MARAUDER_CARDPUTER
this->changeMenu(miniKbMenu.parentMenu); this->addNodes(&miniKbMenu, "a", TFTCYAN, NULL, 0, [this]() {
}); this->changeMenu(miniKbMenu.parentMenu);
});
#endif
//#endif //#endif
htmlMenu.parentMenu = &wifiGeneralMenu; htmlMenu.parentMenu = &wifiGeneralMenu;
@@ -2835,7 +2869,12 @@ void MenuFunctions::RunSetup()
// Start button loop // Start button loop
while(true) { while(true) {
#if !defined(MARAUDER_M5STICKC) || defined(MARAUDER_M5STICKCP2) #if !defined(MARAUDER_M5STICKC) || defined(MARAUDER_M5STICKCP2)
if (u_btn.justPressed()) { #if (U_BTN >= 0 || defined(MARAUDER_CARDPUTER))
#if (U_BTN >= 0)
if (u_btn.justPressed()){
#elif defined(MARAUDER_CARDPUTER)
if (this->isKeyPressed(';')){
#endif
if (sd_file_index > 0) if (sd_file_index > 0)
sd_file_index--; sd_file_index--;
else else
@@ -2845,8 +2884,14 @@ void MenuFunctions::RunSetup()
this->buildButtons(&sdDeleteMenu); this->buildButtons(&sdDeleteMenu);
this->displayCurrentMenu(); this->displayCurrentMenu();
} }
#endif
#endif
#if (D_BTN >= 0 || defined(MARAUDER_CARDPUTER))
#if (D_BTN >= 0)
if (d_btn.justPressed()){
#elif defined(MARAUDER_CARDPUTER)
if (this->isKeyPressed('.')){
#endif #endif
if (d_btn.justPressed()) {
if (sd_file_index < sd_obj.sd_files->size() - 1) if (sd_file_index < sd_obj.sd_files->size() - 1)
sd_file_index++; sd_file_index++;
else else
@@ -2856,6 +2901,7 @@ void MenuFunctions::RunSetup()
this->buildButtons(&sdDeleteMenu, 0, sd_obj.sd_files->get(sd_file_index)); this->buildButtons(&sdDeleteMenu, 0, sd_obj.sd_files->get(sd_file_index));
this->displayCurrentMenu(); this->displayCurrentMenu();
} }
#endif
if (c_btn.justPressed()) { if (c_btn.justPressed()) {
if (sd_obj.sd_files->get(sd_file_index) != "Back") { if (sd_obj.sd_files->get(sd_file_index) != "Back") {
if (sd_obj.removeFile("/" + sd_obj.sd_files->get(sd_file_index))) if (sd_obj.removeFile("/" + sd_obj.sd_files->get(sd_file_index)))
@@ -3312,6 +3358,20 @@ void MenuFunctions::RunSetup()
#endif #endif
#endif #endif
#ifdef MARAUDER_CARDPUTER
for (int i = 0; i < 95; i++) {
if (this->isKeyPressed(M5CardputerKeyboard._ascii_list[i])) {
pressed = true;
wifi_scan_obj.current_mini_kb_ssid.concat(M5CardputerKeyboard._ascii_list[i]);
}
if (this->isKeyPressed(KEY_BACKSPACE)) {
pressed = true;
wifi_scan_obj.current_mini_kb_ssid.remove(wifi_scan_obj.current_mini_kb_ssid.length() - 1);
}
}
#endif
// Keyboard functions for touch hardware // Keyboard functions for touch hardware
#ifdef HAS_TOUCH #ifdef HAS_TOUCH
bool touched = display_obj.updateTouch(&t_x, &t_y); bool touched = display_obj.updateTouch(&t_x, &t_y);
@@ -3473,8 +3533,10 @@ void MenuFunctions::RunSetup()
display_obj.tft.setTextColor(TFT_ORANGE, TFT_BLACK); display_obj.tft.setTextColor(TFT_ORANGE, TFT_BLACK);
#ifdef HAS_MINI_KB #ifdef HAS_MINI_KB
#ifndef MARAUDER_CARDPUTER
display_obj.tft.println("U/D - Rem/Add Char"); display_obj.tft.println("U/D - Rem/Add Char");
display_obj.tft.println("L/R - Prev/Nxt Char"); display_obj.tft.println("L/R - Prev/Nxt Char");
#endif
if (!do_pass) { if (!do_pass) {
display_obj.tft.println("C - Save"); display_obj.tft.println("C - Save");
display_obj.tft.println("C(Hold) - Exit"); display_obj.tft.println("C(Hold) - Exit");

29
esp32_marauder/MenuFunctions.h
View File

@@ -5,6 +5,10 @@
#include "configs.h" #include "configs.h"
#ifdef MARAUDER_CARDPUTER
#include "Keyboard.h"
#endif
#ifdef HAS_SCREEN #ifdef HAS_SCREEN
#define BATTERY_ANALOG_ON 0 #define BATTERY_ANALOG_ON 0
@@ -16,11 +20,21 @@
#ifdef HAS_BUTTONS #ifdef HAS_BUTTONS
#include "Switches.h" #include "Switches.h"
extern Switches u_btn; #if (U_BTN >= 0)
extern Switches d_btn; extern Switches u_btn;
extern Switches l_btn; #endif
extern Switches r_btn; #if (D_BTN >= 0)
extern Switches c_btn; extern Switches d_btn;
#endif
#if (L_BTN >= 0)
extern Switches l_btn;
#endif
#if (R_BTN >= 0)
extern Switches r_btn;
#endif
#if (C_BTN >= 0)
extern Switches c_btn;
#endif
#endif #endif
extern WiFiScan wifi_scan_obj; extern WiFiScan wifi_scan_obj;
@@ -223,6 +237,11 @@ class MenuFunctions
String miniKeyboard(Menu * targetMenu, bool do_pass = false); String miniKeyboard(Menu * targetMenu, bool do_pass = false);
//#endif //#endif
#ifdef MARAUDER_CARDPUTER
Keyboard_Class M5CardputerKeyboard = Keyboard_Class();
bool isKeyPressed(char c);
#endif
public: public:
MenuFunctions(); MenuFunctions();

11
esp32_marauder/SDInterface.cpp
View File

@@ -25,7 +25,7 @@ bool SDInterface::initSD() {
pinMode(SD_CS, OUTPUT); pinMode(SD_CS, OUTPUT);
delay(10); delay(10);
#if (defined(MARAUDER_M5STICKC)) || (defined(HAS_CYD_TOUCH)) #if (defined(MARAUDER_M5STICKC)) || (defined(HAS_CYD_TOUCH)) || (defined(MARAUDER_CARDPUTER))
/* Set up SPI SD Card using external pin header /* Set up SPI SD Card using external pin header
StickCPlus Header - SPI SD Card Reader StickCPlus Header - SPI SD Card Reader
3v3 - 3v3 3v3 - 3v3
@@ -37,12 +37,17 @@ bool SDInterface::initSD() {
*/ */
#if defined(MARAUDER_M5STICKC) #if defined(MARAUDER_M5STICKC)
enum { SPI_SCK = 0, SPI_MISO = 36, SPI_MOSI = 26 }; enum { SPI_SCK = 0, SPI_MISO = 36, SPI_MOSI = 26 };
#elif defined(HAS_CYD_TOUCH) #elif defined(HAS_CYD_TOUCH) || defined(MARAUDER_CARDPUTER)
enum { SPI_SCK = SD_SCK, SPI_MISO = SD_MISO, SPI_MOSI = SD_MOSI }; enum { SPI_SCK = SD_SCK, SPI_MISO = SD_MISO, SPI_MOSI = SD_MOSI };
#else #else
enum { SPI_SCK = 0, SPI_MISO = 36, SPI_MOSI = 26 }; enum { SPI_SCK = 0, SPI_MISO = 36, SPI_MOSI = 26 };
#endif #endif
this->spiExt = new SPIClass(); #ifndef MARAUDER_CARDPUTER
this->spiExt = new SPIClass();
#else
this->spiExt = new SPIClass(FSPI);
#endif
Serial.println("Using external SPI configuration...");
this->spiExt->begin(SPI_SCK, SPI_MISO, SPI_MOSI, SD_CS); this->spiExt->begin(SPI_SCK, SPI_MISO, SPI_MOSI, SD_CS);
if (!SD.begin(SD_CS, *(this->spiExt))) { if (!SD.begin(SD_CS, *(this->spiExt))) {
#elif defined(HAS_C5_SD) #elif defined(HAS_C5_SD)

2
esp32_marauder/SDInterface.h
View File

@@ -32,7 +32,7 @@ extern Settings settings_obj;
class SDInterface { class SDInterface {
private: private:
#if (defined(MARAUDER_M5STICKC) || defined(HAS_CYD_TOUCH)) #if (defined(MARAUDER_M5STICKC) || defined(HAS_CYD_TOUCH) || defined(MARAUDER_CARDPUTER))
SPIClass *spiExt; SPIClass *spiExt;
#elif defined(HAS_C5_SD) #elif defined(HAS_C5_SD)
SPIClass* _spi; SPIClass* _spi;

143
esp32_marauder/configs.h
View File

@@ -27,6 +27,7 @@
//#define MARAUDER_CYD_2USB // Another 2432S028 but it has tWo UsBs OoOoOoO //#define MARAUDER_CYD_2USB // Another 2432S028 but it has tWo UsBs OoOoOoO
//#define MARAUDER_CYD_GUITION // ESP32-2432S024 GUITION //#define MARAUDER_CYD_GUITION // ESP32-2432S024 GUITION
//#define MARAUDER_C5 //#define MARAUDER_C5
#define MARAUDER_CARDPUTER
//// END BOARD TARGETS //// END BOARD TARGETS
#define MARAUDER_VERSION "v1.8.0" #define MARAUDER_VERSION "v1.8.0"
@@ -40,6 +41,8 @@
#define HARDWARE_NAME "M5Stick-C Plus" #define HARDWARE_NAME "M5Stick-C Plus"
#elif defined(MARAUDER_M5STICKCP2) #elif defined(MARAUDER_M5STICKCP2)
#define HARDWARE_NAME "M5Stick-C Plus2" #define HARDWARE_NAME "M5Stick-C Plus2"
#elif defined(MARAUDER_CARDPUTER)
#define HARDWARE_NAME "M5 Cardputer"
#elif defined(MARAUDER_MINI) #elif defined(MARAUDER_MINI)
#define HARDWARE_NAME "Marauder Mini" #define HARDWARE_NAME "Marauder Mini"
#elif defined(MARAUDER_V7) #elif defined(MARAUDER_V7)
@@ -97,6 +100,22 @@
#define HAS_GPS #define HAS_GPS
#endif #endif
#if defined(MARAUDER_CARDPUTER)
//#define FLIPPER_ZERO_HAT
#define HAS_MINI_KB
//#define HAS_BATTERY
#define HAS_BT
#define HAS_BUTTONS
//#define HAS_NEOPIXEL_LED
//#define HAS_PWR_MGMT
#define HAS_SCREEN
#define HAS_MINI_SCREEN
#define HAS_SD
#define USE_SD
#define HAS_TEMP_SENSOR
#define HAS_GPS
#endif
#ifdef MARAUDER_MINI #ifdef MARAUDER_MINI
//#define FLIPPER_ZERO_HAT //#define FLIPPER_ZERO_HAT
//#define HAS_BATTERY //#define HAS_BATTERY
@@ -498,6 +517,26 @@
#define D_PULL true #define D_PULL true
#endif #endif
#ifdef MARAUDER_CARDPUTER
#define L_BTN -1
#define C_BTN 0
#define U_BTN -1
#define R_BTN -1
#define D_BTN -1
//#define HAS_L
//#define HAS_R
//#define HAS_U
//#define HAS_D
#define HAS_C
#define L_PULL true
#define C_PULL true
#define U_PULL true
#define R_PULL true
#define D_PULL true
#endif
#ifdef MARAUDER_V6 #ifdef MARAUDER_V6
#define L_BTN -1 #define L_BTN -1
#define C_BTN 0 #define C_BTN 0
@@ -752,6 +791,78 @@
#endif #endif
#ifdef MARAUDER_CARDPUTER
#define SCREEN_CHAR_WIDTH 40
//#define TFT_MISO -1
#define TFT_MOSI 35
#define TFT_SCLK 36
#define TFT_CS 37
#define TFT_DC 34
#define TFT_RST 33
#define TFT_BL 38
// #define TOUCH_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 GRAPH_VERT_LIM TFT_HEIGHT/2
#define EXT_BUTTON_WIDTH 0
#define SCREEN_ORIENTATION 1
#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_SCREEN_LIMIT 6
#define BUTTON_ARRAY_LEN 100
#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 #ifdef MARAUDER_V4
#define SCREEN_CHAR_WIDTH 40 #define SCREEN_CHAR_WIDTH 40
@@ -1651,6 +1762,24 @@
#define ICON_H 22 #define ICON_H 22
#define BUTTON_PADDING 60 #define BUTTON_PADDING 60
#endif #endif
#ifdef MARAUDER_CARDPUTER
#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 60
#endif
//// END MENU DEFINITIONS //// END MENU DEFINITIONS
//// SD DEFINITIONS //// SD DEFINITIONS
@@ -1704,6 +1833,14 @@
#define SD_CS -1 #define SD_CS -1
#endif #endif
#ifdef MARAUDER_CARDPUTER
//#define SS 12
#define SD_CS 12
#define SD_SCK 40
#define SD_MISO 39
#define SD_MOSI 14
#endif
#ifdef MARAUDER_FLIPPER #ifdef MARAUDER_FLIPPER
#define SD_CS 10 #define SD_CS 10
#endif #endif
@@ -1787,6 +1924,8 @@
// These values are in bytes // These values are in bytes
#ifdef MARAUDER_M5STICKC #ifdef MARAUDER_M5STICKC
#define MEM_LOWER_LIM 10000 #define MEM_LOWER_LIM 10000
#elif defined(MARAUDER_CARDPUTER)
#define MEM_LOWER_LIM 10000
#elif defined(MARAUDER_MINI) #elif defined(MARAUDER_MINI)
#define MEM_LOWER_LIM 10000 #define MEM_LOWER_LIM 10000
#elif defined(MARAUDER_V7) #elif defined(MARAUDER_V7)
@@ -1914,6 +2053,10 @@
#define GPS_SERIAL_INDEX 1 #define GPS_SERIAL_INDEX 1
#define GPS_TX 33 #define GPS_TX 33
#define GPS_RX 32 #define GPS_RX 32
#elif defined(MARAUDER_CARDPUTER)
#define GPS_SERIAL_INDEX 1
#define GPS_TX 1
#define GPS_RX 2
#elif defined(MARAUDER_REV_FEATHER) #elif defined(MARAUDER_REV_FEATHER)
#define GPS_SERIAL_INDEX 1 #define GPS_SERIAL_INDEX 1
#define GPS_TX 6 #define GPS_TX 6

12
esp32_marauder/esp32_marauder.ino
View File

@@ -221,9 +221,15 @@ void setup()
backlightOff(); backlightOff();
#ifdef HAS_SCREEN #ifdef HAS_SCREEN
display_obj.tft.drawCentreString("ESP32 Marauder", TFT_WIDTH/2, TFT_HEIGHT * 0.33, 1); #ifndef MARAUDER_CARDPUTER
display_obj.tft.drawCentreString("JustCallMeKoko", TFT_WIDTH/2, TFT_HEIGHT * 0.5, 1); display_obj.tft.drawCentreString("ESP32 Marauder", TFT_WIDTH/2, TFT_HEIGHT * 0.33, 1);
display_obj.tft.drawCentreString(display_obj.version_number, TFT_WIDTH/2, TFT_HEIGHT * 0.66, 1); display_obj.tft.drawCentreString("JustCallMeKoko", TFT_WIDTH/2, TFT_HEIGHT * 0.5, 1);
display_obj.tft.drawCentreString(display_obj.version_number, TFT_WIDTH/2, TFT_HEIGHT * 0.66, 1);
#else
display_obj.tft.drawCentreString("ESP32 Marauder", TFT_HEIGHT/2, TFT_WIDTH * 0.33, 1);
display_obj.tft.drawCentreString("JustCallMeKoko", TFT_HEIGHT/2, TFT_WIDTH * 0.5, 1);
display_obj.tft.drawCentreString(display_obj.version_number, TFT_HEIGHT/2, TFT_WIDTH * 0.66, 1);
#endif
#endif #endif

BIN
pictures/c5_marauder_flipper_adapter.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB