From a3dcad08d42a4a29207cbfbcc51438089dfa6b21 Mon Sep 17 00:00:00 2001 From: Manuel <71137295+mverch67@users.noreply.github.com> Date: Wed, 8 Apr 2026 22:55:34 +0200 Subject: [PATCH] MUI update (320x240 for tests) --- src/FSCommon.cpp | 2 +- .../crowpanel-advanced-p4/platformio.ini | 56 +++++++++++++++++-- .../esp32p4/crowpanel-advanced-p4/variant.h | 14 ++++- 3 files changed, 63 insertions(+), 9 deletions(-) diff --git a/src/FSCommon.cpp b/src/FSCommon.cpp index f215be80f..2443fc9bb 100644 --- a/src/FSCommon.cpp +++ b/src/FSCommon.cpp @@ -307,7 +307,7 @@ void fsInit() */ void setupSDCard() { -#if defined(HAS_SDCARD) && !defined(SDCARD_USE_SOFT_SPI) +#if defined(HAS_SDCARD) && !defined(SDCARD_USE_SOFT_SPI) && !defined(HAS_SD_MMC) concurrency::LockGuard g(spiLock); SDHandler.begin(SPI_SCK, SPI_MISO, SPI_MOSI); if (!SD.begin(SDCARD_CS, SDHandler, SD_SPI_FREQUENCY)) { diff --git a/variants/esp32p4/crowpanel-advanced-p4/platformio.ini b/variants/esp32p4/crowpanel-advanced-p4/platformio.ini index 8f9e77b66..5909e99f5 100644 --- a/variants/esp32p4/crowpanel-advanced-p4/platformio.ini +++ b/variants/esp32p4/crowpanel-advanced-p4/platformio.ini @@ -1,18 +1,64 @@ [env:crowpanel-advanced-p4-50] extends = esp32p4_base board = esp32-p4-evboard +board_check = true board_build.partitions = default_16MB.csv -board_level = pr + +build_src_filter = + ${esp32s3_base.build_src_filter} + +<../variants/esp32p4/crowpanel-advanced-p4> build_flags = ${esp32p4_base.build_flags} + -D CROWPANEL_ADV_P4 -D CROWPANEL_ADV_P4_50 -I variants/esp32p4/crowpanel-advanced-p4 - -DARDUINO_USB_CDC_ON_BOOT=0 - -DARDUINO_USB_MODE=1 + -D ARDUINO_USB_CDC_ON_BOOT=0 + -D ARDUINO_USB_MODE=1 + -D MESHTASTIC_EXCLUDE_PAXCOUNTER=1 + -D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1 + -D MESHTASTIC_EXCLUDE_INPUTBROKER=1 + -D MAX_NUM_NODES=500 ; -DSOC_USB_OTG_SUPPORTED=1 + -D CONFIG_DISABLE_HAL_LOCKS=1 ; "feels" to be a bit more stable without locks +; -D INPUTDRIVER_BUTTON_TYPE=0 + -D HAS_SDCARD + -D HAS_SD_MMC + -D BOARD_MAX_SDMMC_FREQ=100000 + -D BOARD_HAS_1BIT_SDMMC + -D SD_SCLK_PIN=43 + -D SD_MISO_PIN=39 + -D SD_MOSI_PIN=44 + -D HAS_SCREEN=1 + -D HAS_TFT=1 +; -D USE_I2S_BUZZER + -D RAM_SIZE=10240 + -D LV_LVGL_H_INCLUDE_SIMPLE + -D LV_CONF_INCLUDE_SIMPLE + -D LV_COMP_CONF_INCLUDE_SIMPLE + -D LV_USE_SYSMON=0 + -D LV_USE_PROFILER=0 + -D LV_USE_PERF_MONITOR=0 + -D LV_USE_MEM_MONITOR=0 + -D LV_USE_LOG=0 + -D LV_CACHE_DEF_SIZE=2500000 + -D USE_LOG_DEBUG + -D LOG_DEBUG_INC=\"DebugConfiguration.h\" + -D RADIOLIB_SPI_PARANOID=0 + -D LGFX_SCREEN_WIDTH=800 + -D LGFX_SCREEN_HEIGHT=480 + -D DISPLAY_SIZE=800x480 ; landscape mode + -D LGFX_DRIVER=LGFX_ELECROW_P4 + -D GFX_DRIVER_INC=\"graphics/LGFX/LGFX_ELECROW_P4.h\" + -D LGFX_BUFSIZE=576000 + -D LGFX_SKIP_RGB565_SWAP + -D VIEW_320x240 + -D DISPLAY_SET_RESOLUTION + -D USE_PACKET_API + -D MAP_FULL_REDRAW lib_deps = ${esp32p4_base.lib_deps} - # renovate: datasource=custom.pio depName=XPowersLib packageName=lewisxhe/library/XPowersLib - lewisxhe/XPowersLib@0.3.2 + ${device-ui_base.lib_deps} + # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX + https://github.com/lovyan03/LovyanGFX#develop diff --git a/variants/esp32p4/crowpanel-advanced-p4/variant.h b/variants/esp32p4/crowpanel-advanced-p4/variant.h index f47685b9f..fa25cc4fb 100644 --- a/variants/esp32p4/crowpanel-advanced-p4/variant.h +++ b/variants/esp32p4/crowpanel-advanced-p4/variant.h @@ -1,8 +1,16 @@ -#define I2C_SDA 45 // I2C pins for touch screen -#define I2C_SCL 46 +// I2C pins for touch screen or ext connector +#define I2C_SDA 7 +#define I2C_SCL 8 -#define BUTTON_PIN 0 +#define I2C_SDA1 45 +#define I2C_SCL1 46 +#define USE_POWERSAVE +#define WAKE_ON_TOUCH +#define SCREEN_TOUCH_INT 42 +#define SLEEP_TIME 180 + +// LoRa #define USE_SX1262 #define LORA_SCK 26 #define LORA_MISO 47