diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2353593d..618d57f8 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -51,7 +51,7 @@ jobs: - out: seeed-studios env: "sensecap-indicator-d1_8MB" - out: sunton - env: "esp32-2432s028r_4MB -e esp32-2432s028r-ili9342_4MB -e esp32-2432s032c_4MB -e esp32-3248s035c_4MB -e esp32-3248s035r_4MB -e sunton-4827s043c_16MB -e sunton-8048s043c_16MB -e sunton-8048s050c_16MB -e sunton-8048s070c_16MB" + env: "esp32-2432s028r_4MB -e esp32-2432s028r-ili9342_4MB -e esp32-2432s028r_v2_4MB -e esp32-2432s032c_4MB -e esp32-3248s035c_4MB -e esp32-3248s035r_4MB -e sunton-4827s043c_16MB -e sunton-8048s043c_16MB -e sunton-8048s050c_16MB -e sunton-8048s070c_16MB" - out: waveshare env: "esp32-one_ili9486 -e esp32-one_st7796" - out: wireless-tag diff --git a/src/drv/tft/tft_driver_lovyangfx.cpp b/src/drv/tft/tft_driver_lovyangfx.cpp index bc3854f9..798ee7ed 100644 --- a/src/drv/tft/tft_driver_lovyangfx.cpp +++ b/src/drv/tft/tft_driver_lovyangfx.cpp @@ -95,9 +95,8 @@ static lgfx::Bus_Parallel8* init_parallel_8_bus(Preferences* prefs, int8_t data_ cfg.pin_wr = prefs->getInt("wr", TFT_WR); cfg.pin_rs = prefs->getInt("rs", TFT_DC); #ifndef CONFIG_IDF_TARGET_ESP32C3 - cfg.freq_write = prefs->getUInt("write_freq", SPI_FREQUENCY); -#endif - + cfg.freq_write = prefs->getUInt("write_freq", SPI_FREQUENCY); +#endif #if !defined(CONFIG_IDF_TARGET_ESP32S3) && !defined(CONFIG_IDF_TARGET_ESP32C3) uint8_t port = prefs->getUInt("i2s_port", 0); @@ -717,7 +716,7 @@ void LovyanGfx::init(int w, int h) cfg.dummy_read_bits = 1; cfg.readable = true; cfg.invert = INVERT_COLORS; - cfg.rgb_order = false; + cfg.rgb_order = (TFT_RGB_ORDER != 0); // true if the red and blue of the panel are swapped cfg.dlen_16bit = false; cfg.bus_shared = false; _panel_instance->config(cfg); diff --git a/user_setups/esp32/esp32-2432s028.ini b/user_setups/esp32/esp32-2432s028.ini index 338e60b2..136c1260 100644 --- a/user_setups/esp32/esp32-2432s028.ini +++ b/user_setups/esp32/esp32-2432s028.ini @@ -128,3 +128,76 @@ lib_deps = ;${tft_espi.lib_deps} ${lovyangfx.lib_deps} ;${goodix.lib_deps} + +[esp32-2432s028_v2] +extends = arduino_esp32_v2 +board = esp32dev +upload_speed = 921600 + +build_flags = + ${arduino_esp32_v2.build_flags} + ${esp32.no_ps_ram} + +; TFT_ROTATION values: +; 0 - 0 deg (= default when not set) +; 1 - 90 deg anti-clockwise (from 0 deg) +; 2 - 180 deg anti-clockwise +; 3 - 270 deg anti-clockwise +; 4 - mirror content, and rotate 180 deg anti-clockwise +; 5 - mirror content, and rotate 270 deg anti-clockwise +; 6 - mirror content, and rotate 0 deg anti-clockwise +; 7 - mirror content, and rotate 90 deg anti-clockwise + +;region -- TFT_eSPI build options ------------------------ + ; -D USER_SETUP_LOADED=1 + -D LGFX_USE_V1=1 + -D ILI9341_DRIVER=1 ; + -D TFT_ROTATION=6 ; 0=0, 1=90, 2=180 or 3=270 degree, Mirrors: 6, 5, 4, 3 + -D TFT_WIDTH=320 + -D TFT_HEIGHT=240 + -D TFT_RST=-1 + -D TFT_SCLK=14 + -D TFT_DC=2 + -D TFT_CS=15 + -D TFT_MOSI=13 + -D TFT_MISO=12 + -D TFT_BCKL=21 + -D SUPPORT_TRANSACTIONS + -D SPI_FREQUENCY=55000000 + -D SPI_READ_FREQUENCY=20000000 + -D TOUCH_OFFSET_ROTATION=2 ; 1=swap xy, 2=invert x, 4=inverty + -D TFT_RGB_ORDER=1 ; Colour order Red-Green-Blue + + -D ESP32_2432S028R=1 +;endregion + +; -- Debugging options ----------------------------- +; -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG + +lib_deps = + ${arduino_esp32_v2.lib_deps} + ${lovyangfx.lib_deps} + +[env:esp32-2432s028r_v2_4MB] +extends = esp32-2432s028_v2, flash_4mb +build_flags = + ${esp32-2432s028_v2.build_flags} + -D TOUCH_DRIVER=0x2046 ; XPT2606 Resistive touch panel driver + -D HASP_USE_LGFX_TOUCH=1 + -D TOUCH_CS=33 + -D TOUCH_SCLK=25 + -D TOUCH_MOSI=32 + -D TOUCH_MISO=39 + -D TOUCH_SDA=-1 + -D TOUCH_SCL=-1 + -D TOUCH_IRQ=36 + -D SPI_TOUCH_FREQUENCY=2500000 + +; -- Debugging options ----------------------------- +; -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_VERBOSE + +lib_deps = + ${esp32-2432s028_v2.lib_deps} + ;${tft_espi.lib_deps} + ${lovyangfx.lib_deps} + ;${goodix.lib_deps} \ No newline at end of file