diff --git a/User_Setup_Select.h b/User_Setup_Select.h index fc61625..8eefd12 100644 --- a/User_Setup_Select.h +++ b/User_Setup_Select.h @@ -35,6 +35,7 @@ //#include //#include //#include +//#include //#include // Setup file configured for my ILI9341 //#include // Setup file configured for my ST7735 diff --git a/User_Setup_cyd_3_5_inch.h b/User_Setup_cyd_3_5_inch.h new file mode 100644 index 0000000..305423a --- /dev/null +++ b/User_Setup_cyd_3_5_inch.h @@ -0,0 +1,299 @@ +// 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 128 // Marauder Mini + #define TFT_WIDTH 320 // ST7789 240 x 240 and 240 x 320 +// #define TFT_HEIGHT 160 +// #define TFT_HEIGHT 128 // Marauder Mini +// #define TFT_HEIGHT 240 // ST7789 240 x 240 + #define TFT_HEIGHT 480 // 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 17 // Chip select control pin D8 +#define TFT_DC 16 // Data Command control pin +#define TFT_RST 5 // Reset pin (could connect to NodeMCU RST, see next line) +//#define TFT_MISO 19 +//#define TFT_MOSI 23 +//#define TFT_SCLK 18 +//#define TFT_BL 32 +*/ + +// ESP32 Marauder +#define TFT_MISO 12 +#define TFT_MOSI 13 +#define TFT_SCLK 14 +#define TFT_CS 15 // Chip select control pin +#define TFT_DC 2 // Data Command control pin +#define TFT_RST -1 // 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 27 // LED back-light (only for ST7789 with backlight control pin) + +#define TOUCH_CS 33 // 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/Display.cpp b/esp32_marauder/Display.cpp index 0c0224f..8877007 100644 --- a/esp32_marauder/Display.cpp +++ b/esp32_marauder/Display.cpp @@ -138,6 +138,8 @@ void Display::RunSetup() #ifndef HAS_CYD_TOUCH #ifdef TFT_SHIELD uint16_t calData[5] = { 275, 3494, 361, 3528, 4 }; // tft.setRotation(0); // Portrait with TFT Shield + #elif defined(MARAUDER_CYD_3_5_INCH) + uint16_t calData[5] = { 239, 3560, 262, 3643, 4 }; #elif defined(TFT_DIY) uint16_t calData[5] = { 339, 3470, 237, 3438, 2 }; // tft.setRotation(0); // Portrait with DIY TFT #endif @@ -570,7 +572,9 @@ void Display::setupScrollArea(uint16_t tfa, uint16_t bfa) { //Serial.println(" bfa: " + (String)bfa); //Serial.println("yStart: " + (String)this->yStart); #ifdef HAS_ILI9341 - #ifdef HAS_ST7789 + #ifdef HAS_ST7796 + tft.writecommand(0x33); + #elif defined(HAS_ST7789) tft.writecommand(ST7789_VSCRDEF); // Vertical scroll definition #else tft.writecommand(ILI9341_VSCRDEF); @@ -589,6 +593,8 @@ void Display::scrollAddress(uint16_t vsp) { #ifdef HAS_ILI9341 #ifdef HAS_ST7789 tft.writecommand(ST7789_VSCRDEF); // Vertical scroll definition + #elif defined(HAS_ST7796) + tft.writecommand(0x33); #else tft.writecommand(ILI9341_VSCRDEF); #endif diff --git a/esp32_marauder/MenuFunctions.cpp b/esp32_marauder/MenuFunctions.cpp index d189678..9cb1eea 100644 --- a/esp32_marauder/MenuFunctions.cpp +++ b/esp32_marauder/MenuFunctions.cpp @@ -1214,7 +1214,7 @@ void MenuFunctions::main(uint32_t currentTime) // Menu navigation and paging #ifdef HAS_BUTTONS // Don't do this for touch screens - #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) || defined(MARAUDER_CYD_3_5_INCH)) #if !defined(MARAUDER_M5STICKC) || defined(MARAUDER_M5STICKCP2) #if (U_BTN >= 0 || defined(MARAUDER_CARDPUTER)) #if (U_BTN >= 0) @@ -1472,7 +1472,7 @@ void MenuFunctions::updateStatusBar() #ifdef HAS_GPS if (this->old_gps_sat_count != gps_obj.getNumSats()) { this->old_gps_sat_count = gps_obj.getNumSats(); - display_obj.tft.fillRect(0, 0, 240, STATUS_BAR_WIDTH, STATUSBAR_COLOR); + display_obj.tft.fillRect(0, 0, TFT_WIDTH, STATUS_BAR_WIDTH, STATUSBAR_COLOR); status_changed = true; } #endif @@ -1660,7 +1660,7 @@ void MenuFunctions::drawStatusBar() #ifdef HAS_MINI_SCREEN display_obj.tft.setFreeFont(NULL); #endif - display_obj.tft.fillRect(0, 0, 240, STATUS_BAR_WIDTH, STATUSBAR_COLOR); + display_obj.tft.fillRect(0, 0, TFT_WIDTH, STATUS_BAR_WIDTH, STATUSBAR_COLOR); display_obj.tft.setTextColor(TFT_WHITE, STATUSBAR_COLOR); uint16_t the_color; @@ -1858,6 +1858,8 @@ void MenuFunctions::orientDisplay() #ifndef HAS_CYD_TOUCH #ifdef TFT_SHIELD uint16_t calData[5] = { 275, 3494, 361, 3528, 4 }; // tft.setRotation(0); // Portrait with TFT Shield + #elif defined(MARAUDER_CYD_3_5_INCH) + uint16_t calData[5] = { 239, 3560, 262, 3643, 4 }; #else if defined(TFT_DIY) uint16_t calData[5] = { 339, 3470, 237, 3438, 2 }; // tft.setRotation(0); // Portrait with DIY TFT #endif diff --git a/esp32_marauder/SDInterface.cpp b/esp32_marauder/SDInterface.cpp index 110c554..27a3b02 100644 --- a/esp32_marauder/SDInterface.cpp +++ b/esp32_marauder/SDInterface.cpp @@ -37,7 +37,7 @@ bool SDInterface::initSD() { */ #if defined(MARAUDER_M5STICKC) enum { SPI_SCK = 0, SPI_MISO = 36, SPI_MOSI = 26 }; - #elif defined(HAS_CYD_TOUCH) || defined(MARAUDER_CARDPUTER) + #elif defined(HAS_CYD_TOUCH) || defined(MARAUDER_CARDPUTER) || defined(HAS_SEPARATE_SD) enum { SPI_SCK = SD_SCK, SPI_MISO = SD_MISO, SPI_MOSI = SD_MOSI }; #else enum { SPI_SCK = 0, SPI_MISO = 36, SPI_MOSI = 26 }; diff --git a/esp32_marauder/WiFiScan.cpp b/esp32_marauder/WiFiScan.cpp index 2b8feb7..ee1392e 100644 --- a/esp32_marauder/WiFiScan.cpp +++ b/esp32_marauder/WiFiScan.cpp @@ -2217,6 +2217,9 @@ void WiFiScan::RunAPScan(uint8_t scan_mode, uint16_t color) #ifdef TFT_SHIELD uint16_t calData[5] = { 391, 3491, 266, 3505, 7 }; // Landscape TFT Shield Serial.println("Using TFT Shield"); + #elif defined(MARAUDER_CYD_3_5_INCH) + uint16_t calData[5] = { 272, 3648, 234, 3565, 7 }; + Serial.println("Using CYD 3.5inch (join wifi)"); #else if defined(TFT_DIY) uint16_t calData[5] = { 213, 3469, 320, 3446, 1 }; // Landscape TFT DIY Serial.println("Using TFT DIY (join wifi)"); @@ -2829,6 +2832,9 @@ void WiFiScan::RunPacketMonitor(uint8_t scan_mode, uint16_t color) #ifdef TFT_SHIELD uint16_t calData[5] = { 391, 3491, 266, 3505, 7 }; // Landscape TFT Shield Serial.println("Using TFT Shield"); + #elif defined(MARAUDER_CYD_3_5_INCH) + uint16_t calData[5] = { 272, 3648, 234, 3565, 7 }; // Landscape + Serial.println("Using CYD 3.5inch"); #else if defined(TFT_DIY) uint16_t calData[5] = { 213, 3469, 320, 3446, 1 }; // Landscape TFT DIY Serial.println("Using TFT DIY"); @@ -2955,6 +2961,8 @@ void WiFiScan::RunEapolScan(uint8_t scan_mode, uint16_t color) #ifdef TFT_SHIELD uint16_t calData[5] = { 391, 3491, 266, 3505, 7 }; // Landscape TFT Shield //Serial.println("Using TFT Shield"); + #elif defined(MARAUDER_CYD_3_5_INCH) + uint16_t calData[5] = { 272, 3648, 234, 3565, 7 }; #else if defined(TFT_DIY) uint16_t calData[5] = { 213, 3469, 320, 3446, 1 }; // Landscape TFT DIY //Serial.println("Using TFT DIY"); @@ -7964,7 +7972,7 @@ void WiFiScan::channelAnalyzerLoop(uint32_t tick) { set_channel--; display_obj.tftDrawChannelScaleButtons(set_channel, false); display_obj.tftDrawExitScaleButtons(false); - changeChannel(); + changeChannel(set_channel); return; } } @@ -7975,7 +7983,7 @@ void WiFiScan::channelAnalyzerLoop(uint32_t tick) { set_channel++; display_obj.tftDrawChannelScaleButtons(set_channel, false); display_obj.tftDrawExitScaleButtons(false); - changeChannel(); + changeChannel(set_channel); return; } } diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index ffbf054..6fae696 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -26,6 +26,7 @@ //#define MARAUDER_CYD_MICRO // 2432S028 //#define MARAUDER_CYD_2USB // Another 2432S028 but it has tWo UsBs OoOoOoO //#define MARAUDER_CYD_GUITION // ESP32-2432S024 GUITION + //#define MARAUDER_CYD_3_5_INCH //#define MARAUDER_C5 //#define MARAUDER_CARDPUTER //// END BOARD TARGETS @@ -60,7 +61,9 @@ #elif defined(MARAUDER_CYD_MICRO) #define HARDWARE_NAME "CYD 2432S028" #elif defined(MARAUDER_CYD_2USB) - #define HARDWARE_NAME "CYD 2432S028 2USB" + #define HARDWARE_NAME "CYD 2432S028 2USB" + #elif defined(MARAUDER_CYD_3_5_INCH) + #define HARDWARE_NAME "CYD 3.5inch" #elif defined(MARAUDER_CYD_GUITION) #define HARDWARE_NAME "CYD 2432S024 GUITION" #elif defined(MARAUDER_KIT) @@ -255,6 +258,27 @@ #define HAS_CYD_PORTRAIT #endif + #ifdef MARAUDER_CYD_3_5_INCH + #define HAS_TOUCH + #define HAS_FLIPPER_LED + //#define FLIPPER_ZERO_HAT + #define HAS_BATTERY + #define HAS_BT + #define HAS_BT_REMOTE + #define HAS_BUTTONS + //#define HAS_NEOPIXEL_LED + //#define HAS_PWR_MGMT + #define HAS_SCREEN + #define HAS_FULL_SCREEN + #define HAS_SD + #define USE_SD + #define HAS_TEMP_SENSOR + #define HAS_GPS + //#define HAS_CYD_TOUCH + #define HAS_SEPARATE_SD + #define HAS_CYD_PORTRAIT + #endif + #ifdef MARAUDER_CYD_GUITION #define HAS_TOUCH #define HAS_FLIPPER_LED @@ -617,6 +641,26 @@ #define D_PULL true #endif + #ifdef MARAUDER_CYD_3_5_INCH + #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_CYD_GUITION #define L_BTN -1 #define C_BTN 0 @@ -1134,6 +1178,76 @@ #define KIT_LED_BUILTIN 13 #endif + #if defined(MARAUDER_CYD_3_5_INCH) + #define SCREEN_CHAR_WIDTH 40 + #define HAS_ILI9341 + #define HAS_ST7796 + + #define BANNER_TEXT_SIZE 2 + + #ifndef TFT_WIDTH + #define TFT_WIDTH 320 + #endif + + #ifndef TFT_HEIGHT + #define TFT_HEIGHT 480 + #endif + + #define TFT_DIY + + #define GRAPH_VERT_LIM TFT_HEIGHT/2 + + #define EXT_BUTTON_WIDTH 20 + + #define SCREEN_BUFFER + + #define MAX_SCREEN_BUFFER 22 + + #define SCREEN_ORIENTATION 0 + + #define CHAR_WIDTH 12 + #define SCREEN_WIDTH TFT_WIDTH + #define SCREEN_HEIGHT TFT_HEIGHT + #define HEIGHT_1 TFT_WIDTH + #define WIDTH_1 TFT_HEIGHT + #define STANDARD_FONT_CHAR_LIMIT (TFT_WIDTH/6) // number of characters on a single line with normal font + #define TEXT_HEIGHT 16 // 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 480 // 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 12 + #define BUTTON_ARRAY_LEN BUTTON_SCREEN_LIMIT + #define STATUS_BAR_WIDTH 16 + #define LVGL_TICK_PERIOD 6 + + #define FRAME_X 100 + #define FRAME_Y 64 + #define FRAME_W TFT_WIDTH / 2 + #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 + + #define KIT_LED_BUILTIN 13 + #endif + #if defined(MARAUDER_CYD_GUITION) #define SCREEN_CHAR_WIDTH 40 #define HAS_ILI9341 @@ -1633,6 +1747,25 @@ //#define BUTTON_ARRAY_LEN 5 #endif + #if defined(MARAUDER_CYD_3_5_INCH) + #define BANNER_TIME 100 + + #define COMMAND_PREFIX "!" + + // Keypad start position, key sizes and spacing + #define KEY_X 160 // Centre of key + #define KEY_Y 50 + #define KEY_W 320 // Width and height + #define KEY_H 22 + #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 22 + //#define BUTTON_ARRAY_LEN 5 + #endif + #if defined(MARAUDER_CYD_GUITION) #define BANNER_TIME 100 @@ -1805,6 +1938,10 @@ #define SD_CS 5 #endif + #ifdef MARAUDER_CYD_3_5_INCH + #define SD_CS 5 + #endif + #ifdef MARAUDER_CYD_GUITION #define SD_CS 5 #endif @@ -1942,6 +2079,8 @@ #define MEM_LOWER_LIM 10000 #elif defined(MARAUDER_CYD_2USB) #define MEM_LOWER_LIM 10000 + #elif defined(MARAUDER_CYD_3_5_INCH) + #define MEM_LOWER_LIM 10000 #elif defined(MARAUDER_CYD_GUITION) #define MEM_LOWER_LIM 10000 #elif defined(MARAUDER_KIT) @@ -1976,6 +2115,8 @@ #define PIN 4 #elif defined(MARAUDER_CYD_2USB) #define PIN 4 + #elif defined(MARAUDER_CYD_3_5_INCH) + #define PIN 22 #elif defined(MARAUDER_C5) #define PIN 27 #else @@ -2015,6 +2156,10 @@ #define GPS_SERIAL_INDEX 2 #define GPS_TX 1 // Community pinout matching old forks and even bruce firmware allowing for hardware standardization #define GPS_RX 3 + #elif defined(MARAUDER_CYD_3_5_INCH) + #define GPS_SERIAL_INDEX 2 + #define GPS_TX 1 + #define GPS_RX 3 #elif defined(MARAUDER_CYD_GUITION) #define GPS_SERIAL_INDEX 2 #define GPS_TX 21 // Fits the extended I/O @@ -2126,6 +2271,11 @@ #define I2C_SCL 27 #endif + #ifdef MARAUDER_CYD_3_5_INCH + #define I2C_SDA 32 + #define I2C_SCL 25 + #endif + #endif //// MARAUDER TITLE STUFF @@ -2137,6 +2287,8 @@ #define MARAUDER_TITLE_BYTES 13578 #elif defined(MARAUDER_CYD_2USB) #define MARAUDER_TITLE_BYTES 13578 + #elif defined(MARAUDER_CYD_3_5_INCH) + #define MARAUDER_TITLE_BYTES 13578 #elif defined(MARAUDER_CYD_GUITION) #define MARAUDER_TITLE_BYTES 13578 #elif defined(MARAUDER_KIT) @@ -2172,7 +2324,7 @@ //// PCAP BUFFER STUFF //// STUPID CYD STUFF - #if defined(HAS_CYD_TOUCH) || defined(HAS_C5_SD) + #if defined(HAS_CYD_TOUCH) || defined(HAS_C5_SD) || defined(HAS_SEPARATE_SD) #ifdef MARAUDER_CYD_MICRO #define XPT2046_IRQ 36 #define XPT2046_MOSI 32 @@ -2197,6 +2349,12 @@ #define SD_SCK 18 #endif + #ifdef MARAUDER_CYD_3_5_INCH + #define SD_MISO 19 + #define SD_MOSI 23 + #define SD_SCK 18 + #endif + #ifdef MARAUDER_C5 #define SD_MISO 2 #define SD_MOSI 7 @@ -2232,6 +2390,12 @@ #define R_PIN 4 #endif + #ifdef MARAUDER_CYD_3_5_INCH + #define B_PIN 17 + #define G_PIN 16 + #define R_PIN 22 + #endif + #ifdef MARAUDER_CYD_GUITION #define B_PIN 17 #define G_PIN 16