gitea-mirror/ESP32Marauder
1
0
Fork 0
mirror of https://github.com/justcallmekoko/ESP32Marauder.git synced 2025-12-06 04:41:35 -08:00
Code Issues Packages Projects Releases Wiki Activity

Create config for CYD 2 USB

Browse Source
This commit is contained in:
Just Call Me Koko
2025-05-30 12:22:58 -04:00
parent d4140ffeab
commit b6fe3954e6
8 changed files with 210 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
PCBs/FlipperZero/WiFi-Devboard-Pro/WiFi-Devboard-Pro-backups/WiFi-Devboard-Pro-2022-12-14_175854.zip
View File

Binary file not shown.

BIN
PCBs/FlipperZero/WiFi-Devboard-Pro/WiFi-Devboard-Pro-backups/WiFi-Devboard-Pro-2022-12-14_181008.zip
View File

Binary file not shown.

BIN
PCBs/FlipperZero/WiFi-Devboard-Pro/WiFi-Devboard-Pro-backups/WiFi-Devboard-Pro-2025-05-28_160712.zip Normal file
View File

Binary file not shown.

BIN
PCBs/FlipperZero/WiFi-Devboard-Pro/WiFi-Devboard-Pro-backups/WiFi-Devboard-Pro-2025-05-28_182343.zip Normal file
View File

Binary file not shown.

27
esp32_marauder/Display.cpp
View File

@@ -46,6 +46,10 @@ uint8_t Display::updateTouch(uint16_t *x, uint16_t *y, uint16_t threshold) {
uint8_t rot = this->tft.getRotation();
//#ifdef HAS_CYD_PORTRAIT
// rot = 0;
//#endif
switch (rot) {
case 0: // Standard Protrait
*x = map(p.x, 200, 3700, 1, TFT_WIDTH);
@@ -95,17 +99,24 @@ void Display::RunSetup()
#endif
tft.init();
#ifndef MARAUDER_M5STICKC
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
#endif*/
tft.setCursor(0, 0);
@@ -553,7 +564,11 @@ void Display::setupScrollArea(uint16_t tfa, uint16_t bfa) {
//Serial.println(" bfa: " + (String)bfa);
//Serial.println("yStart: " + (String)this->yStart);
#ifdef HAS_ILI9341
tft.writecommand(ILI9341_VSCRDEF); // Vertical scroll definition
#ifdef HAS_ST7789
tft.writecommand(ST7789_VSCRDEF); // Vertical scroll definition
#else
tft.writecommand(ILI9341_VSCRDEF);
#endif
tft.writedata(tfa >> 8); // Top Fixed Area line count
tft.writedata(tfa);
tft.writedata((YMAX-tfa-bfa)>>8); // Vertical Scrolling Area line count
@@ -566,7 +581,11 @@ void Display::setupScrollArea(uint16_t tfa, uint16_t bfa) {
void Display::scrollAddress(uint16_t vsp) {
#ifdef HAS_ILI9341
tft.writecommand(ILI9341_VSCRSADD); // Vertical scrolling pointer
#ifdef HAS_ST7789
tft.writecommand(ST7789_VSCRDEF); // Vertical scroll definition
#else
tft.writecommand(ILI9341_VSCRDEF);
#endif
tft.writedata(vsp>>8);
tft.writedata(vsp);
#endif

4
esp32_marauder/MenuFunctions.cpp
View File

@@ -1066,7 +1066,7 @@ void MenuFunctions::main(uint32_t currentTime)
// Menu navigation and paging
#ifdef HAS_BUTTONS
#if !(defined(MARAUDER_V6) || defined(MARAUDER_V6_1) || defined(MARAUDER_CYD_MICRO) || defined(MARAUDER_CYD_GUITION))
#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 (u_btn.justPressed()){
if ((wifi_scan_obj.currentScanMode == WIFI_SCAN_OFF) ||
@@ -1531,7 +1531,7 @@ void MenuFunctions::orientDisplay()
{
display_obj.tft.init();
display_obj.tft.setRotation(0); // Portrait
display_obj.tft.setRotation(SCREEN_ORIENTATION); // Portrait
display_obj.tft.setCursor(0, 0);

185
esp32_marauder/configs.h
View File

@@ -23,10 +23,11 @@
//#define XIAO_ESP32_S3
//#define MARAUDER_REV_FEATHER
//#define MARAUDER_CYD_MICRO // 2432S028
//#define MARAUDER_CYD_2USB // Another 2432S028 but it has tWo UsBs OoOoOoO
//#define MARAUDER_CYD_GUITION // ESP32-2432S024 GUITION
//// END BOARD TARGETS
#define MARAUDER_VERSION "v1.6.0"
#define MARAUDER_VERSION "v1.6.1"
#define GRAPH_REFRESH 100
@@ -51,6 +52,8 @@
#define HARDWARE_NAME "Marauder v6.1"
#elif defined(MARAUDER_CYD_MICRO)
#define HARDWARE_NAME "CYD 2432S028"
#elif defined(MARAUDER_CYD_2USB)
#define HARDWARE_NAME "CYD 2432S028 2USB"
#elif defined(MARAUDER_CYD_GUITION)
#define HARDWARE_NAME "CYD 2432S024 GUITION"
#elif defined(MARAUDER_KIT)
@@ -197,6 +200,25 @@
#define HAS_CYD_TOUCH
#endif
#ifdef MARAUDER_CYD_2USB
#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_CYD_PORTRAIT
#endif
#ifdef MARAUDER_CYD_GUITION
#define HAS_FLIPPER_LED
//#define FLIPPER_ZERO_HAT
@@ -483,6 +505,26 @@
#define D_PULL true
#endif
#ifdef MARAUDER_CYD_2USB
#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
@@ -539,6 +581,8 @@
#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
@@ -611,6 +655,8 @@
#define EXT_BUTTON_WIDTH 0
#define SCREEN_ORIENTATION 0
#define CHAR_WIDTH 6
#define SCREEN_WIDTH TFT_HEIGHT // Originally 240
#define SCREEN_HEIGHT TFT_WIDTH // Originally 320
@@ -673,6 +719,8 @@
#define EXT_BUTTON_WIDTH 20
#define SCREEN_ORIENTATION 0
#define CHAR_WIDTH 12
#define SCREEN_WIDTH TFT_WIDTH
#define SCREEN_HEIGHT TFT_HEIGHT
@@ -742,6 +790,8 @@
#define MAX_SCREEN_BUFFER 22
#define SCREEN_ORIENTATION 0
#define CHAR_WIDTH 12
#define SCREEN_WIDTH TFT_WIDTH
#define SCREEN_HEIGHT TFT_HEIGHT
@@ -807,6 +857,76 @@
#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 320 // 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 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
#define KIT_LED_BUILTIN 13
#endif
#if defined(MARAUDER_CYD_2USB)
#define SCREEN_CHAR_WIDTH 40
#define HAS_ILI9341
#define HAS_ST7789
#define BANNER_TEXT_SIZE 2
#ifndef TFT_WIDTH
#define TFT_WIDTH 240
#endif
#ifndef TFT_HEIGHT
#define TFT_HEIGHT 320
#endif
#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
@@ -874,6 +994,8 @@
#define MAX_SCREEN_BUFFER 22
#define SCREEN_ORIENTATION 0
#define CHAR_WIDTH 12
#define SCREEN_WIDTH TFT_WIDTH
#define SCREEN_HEIGHT TFT_HEIGHT
@@ -941,6 +1063,8 @@
#define EXT_BUTTON_WIDTH 0
#define SCREEN_ORIENTATION 0
#define CHAR_WIDTH 12
#define SCREEN_WIDTH TFT_WIDTH
#define SCREEN_HEIGHT TFT_HEIGHT
@@ -1008,6 +1132,8 @@
#define EXT_BUTTON_WIDTH 0
#define SCREEN_ORIENTATION 0
#define CHAR_WIDTH 12
#define SCREEN_WIDTH TFT_WIDTH
#define SCREEN_HEIGHT TFT_HEIGHT
@@ -1072,6 +1198,8 @@
#define EXT_BUTTON_WIDTH 20
#define SCREEN_ORIENTATION 0
#define CHAR_WIDTH 12
#define SCREEN_WIDTH TFT_WIDTH
#define SCREEN_HEIGHT TFT_HEIGHT
@@ -1145,6 +1273,8 @@
#define EXT_BUTTON_WIDTH 0
#define SCREEN_ORIENTATION 0
#define CHAR_WIDTH 6
#define SCREEN_WIDTH TFT_WIDTH // Originally 240
#define SCREEN_HEIGHT TFT_HEIGHT // Originally 320
@@ -1216,6 +1346,8 @@
#define EXT_BUTTON_WIDTH 0
#define SCREEN_ORIENTATION 1
#define CHAR_WIDTH 6
#define SCREEN_WIDTH TFT_WIDTH // Originally 240
#define SCREEN_HEIGHT TFT_HEIGHT // Originally 320
@@ -1318,6 +1450,25 @@
//#define BUTTON_ARRAY_LEN 5
#endif
#if defined(MARAUDER_CYD_2USB)
#define BANNER_TIME 100
#define COMMAND_PREFIX "!"
// Keypad start position, key sizes and spacing
#define KEY_X 120 // Centre of key
#define KEY_Y 50
#define KEY_W 240 // 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
@@ -1468,6 +1619,10 @@
#define SD_CS 5
#endif
#ifdef MARAUDER_CYD_2USB
#define SD_CS 5
#endif
#ifdef MARAUDER_CYD_GUITION
#define SD_CS 5
#endif
@@ -1584,6 +1739,8 @@
#define MEM_LOWER_LIM 10000
#elif defined(MARAUDER_CYD_MICRO)
#define MEM_LOWER_LIM 10000
#elif defined(MARAUDER_CYD_2USB)
#define MEM_LOWER_LIM 10000
#elif defined(MARAUDER_CYD_GUITION)
#define MEM_LOWER_LIM 10000
#elif defined(MARAUDER_KIT)
@@ -1612,6 +1769,8 @@
#define PIN 33
#elif defined(MARAUDER_CYD_MICRO)
#define PIN 4
#elif defined(MARAUDER_CYD_2USB)
#define PIN 4
#else
#define PIN 25
#endif
@@ -1645,6 +1804,10 @@
#define GPS_SERIAL_INDEX 2
#define GPS_TX 27 // Fits the extended I/O
#define GPS_RX 22
#elif defined(MARAUDER_CYD_2USB)
#define GPS_SERIAL_INDEX 2
#define GPS_TX 27 // Fits the extended I/O
#define GPS_RX 22
#elif defined(MARAUDER_CYD_GUITION)
#define GPS_SERIAL_INDEX 2
#define GPS_TX 21 // Fits the extended I/O
@@ -1743,6 +1906,8 @@
#define MARAUDER_TITLE_BYTES 13578
#elif defined(MARAUDER_CYD_MICRO)
#define MARAUDER_TITLE_BYTES 13578
#elif defined(MARAUDER_CYD_2USB)
#define MARAUDER_TITLE_BYTES 13578
#elif defined(MARAUDER_CYD_GUITION)
#define MARAUDER_TITLE_BYTES 13578
#elif defined(MARAUDER_KIT)
@@ -1788,6 +1953,18 @@
#define SD_MOSI 23
#define SD_SCK 18
#endif
#ifdef MARAUDER_CYD_2USB
#define XPT2046_IRQ 36
#define XPT2046_MOSI 32
#define XPT2046_MISO 39
#define XPT2046_CLK 25
#define XPT2046_CS 33
#define SD_MISO 19
#define SD_MOSI 23
#define SD_SCK 18
#endif
#endif
//// END STUPID CYD STUFF
@@ -1806,6 +1983,12 @@
#define R_PIN 4
#endif
#ifdef MARAUDER_CYD_2USB
#define B_PIN 17
#define G_PIN 16
#define R_PIN 4
#endif
#ifdef MARAUDER_CYD_GUITION
#define B_PIN 17
#define G_PIN 16

2
esp32_marauder/esp32_marauder.ino
View File

@@ -350,7 +350,7 @@ void loop()
#endif
#endif
#ifdef HAS_ILI9341
#if (defined(HAS_ILI9341) && !defined(MARAUDER_CYD_2USB))
#ifdef HAS_BUTTONS
if (c_btn.isHeld()) {
if (menu_function_obj.disable_touch)