Merge pull request #862 from xek/tinloaf/master

Add support for sunton esp32-2432s024{r,c}

src/drv/tft/tft_driver_lovyangfx.cpp

@@ -380,6 +380,32 @@ lgfx::ITouch* _init_touch(Preferences* preferences)
     }
 #endif
 
+#if TOUCH_DRIVER == 0x0820
+
+    { // タッチスクリーン制御の設定を行います。（必要なければ削除）
+        auto touch = new lgfx::Touch_FT5x06();
+        auto cfg   = touch->config();
+
+        cfg.x_min      = 0;              // The minimum X value obtained from the touchscreen (raw value).
+        cfg.x_max      = TFT_WIDTH - 1;  // The maximum X value obtained from the touchscreen (raw value).
+        cfg.y_min      = 0;              // The minimum Y value obtained from the touchscreen (raw value).
+        cfg.y_max      = TFT_HEIGHT - 1; // The maximum Y value obtained from the touchscreen (raw value).
+        cfg.bus_shared = true;           // If using a common bus with the screen, set it to true.
+        cfg.offset_rotation = TOUCH_OFFSET_ROTATION; // Adjustment when the display orientation does not match the touch orientation. Set in values from 0 to 7.
+
+        // I2C接続の場合
+        cfg.i2c_port = I2C_TOUCH_PORT;      // 使用するI2Cを選択 (0 or 1)
+        cfg.i2c_addr = I2C_TOUCH_ADDRESS;   // I2Cデバイスアドレス番号
+        cfg.pin_sda  = TOUCH_SDA;           // SDAが接続されているピン番号
+        cfg.pin_scl  = TOUCH_SCL;           // SCLが接続されているピン番号
+        cfg.pin_int  = TOUCH_IRQ;           // INTが接続されているピン番号
+        cfg.freq     = I2C_TOUCH_FREQUENCY; // I2Cクロックを設定
+
+        touch->config(cfg);
+        return touch;
+    }
+#endif
+
 #if TOUCH_DRIVER == 0x6336
     {
         auto touch = new lgfx::Touch_FT5x06();

user_setups/esp32s3/sunton-esp32-2432s024.ini

@@ -0,0 +1,98 @@
+;***************************************************;
+;       Sunton ESP32-WROOM custom dev board with    ;
+;               - ILI9341 TFT SPI 4-WIRE             ;
+;               - XPT2046 or CST820 touch controller ;
+;***************************************************;
+
+[sunton-esp32-2432s024]
+extends = arduino_esp32_v2
+board = esp32dev
+
+build_flags =
+    ${arduino_esp32_v2.build_flags}
+    ${esp32.no_ps_ram}
+
+;region -- TFT_eSPI build options ------------------------
+    ${esp32.hspi}        ; Use HSPI hardware SPI bus
+    -D LGFX_USE_V1=1
+    -D HASP_USE_LGFX_TOUCH=1
+    -D ILI9341_DRIVER=1
+    -D TFT_WIDTH=320
+    -D TFT_HEIGHT=240
+    -D TFT_CS=15      ;// Chip select control pin
+    -D TFT_DC=2       ;// Data Command control pin
+    -D TFT_RST=-1     ;// Reset pin (could connect to RST pin)
+    -D TFT_BCKL=27    ;None, configurable via web UI (e.g. 2 for D4)
+    -D SUPPORT_TRANSACTIONS
+    -D SPI_FREQUENCY=65000000
+    -D SPI_READ_FREQUENCY=20000000
+    -D SPI_TOUCH_FREQUENCY=2500000
+;endregion
+
+; -- Debugging options -----------------------------
+;   -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
+
+lib_deps =
+    ${arduino_esp32_v2.lib_deps}
+    ${lovyangfx.lib_deps}
+
+
+[env:esp32-2432s024r_4MB]
+upload_port = /dev/ttyUSB0
+extends = sunton-esp32-2432s024, flash_4mb
+board = esp32dev
+
+build_flags =
+    ${sunton-esp32-2432s024.build_flags}
+    ${esp32.no_ps_ram}
+
+;region -- TFT_eSPI build options ------------------------
+    ${esp32.hspi}        ; Use HSPI hardware SPI bus
+    ;-D USER_SETUP_LOADED=1
+    -D TFT_RGB_ORDER=1       ; Colour order Red-Green-Blue
+    -D TFT_ROTATION=5 ; 0=0, 1=90, 2=180 or 3=270 degree
+    -D TOUCH_CS=33
+    -D TOUCH_SCLK=14
+    -D TOUCH_MOSI=13
+    -D TOUCH_MISO=12
+    -D TOUCH_DRIVER=0x2046 ; XPT2606 Resistive touch panel driver
+    -D TOUCH_SDA=-1
+    -D TOUCH_SCL=-1
+    -D TOUCH_IRQ=-1
+    -D I2C_TOUCH_PORT=0
+    -D I2C_TOUCH_ADDRESS=0
+    -D I2C_TOUCH_FREQUENCY=0
+    -D TOUCH_OFFSET_ROTATION=0  ;touch rotation
+;endregion
+
+; -- Debugging options -----------------------------
+;   -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
+
+
+[env:esp32-2432s024c_4MB]
+upload_port = /dev/ttyUSB0
+extends = sunton-esp32-2432s024, flash_4mb
+board = esp32dev
+
+build_flags =
+    ${sunton-esp32-2432s024.build_flags}
+    ${esp32.no_ps_ram}
+
+;region -- TFT_eSPI build options ------------------------
+    ${esp32.hspi}        ; Use HSPI hardware SPI bus
+    ;-D USER_SETUP_LOADED=1
+    -D TFT_ROTATION=4 ; 0=0, 1=90, 2=180 or 3=270 degree
+    -D TOUCH_DRIVER=0x0820 ; CST820 Capacitive I2C touch panel driver
+    -D TOUCH_SDA=33
+    -D TOUCH_SCL=32
+    -D TOUCH_IRQ=21
+    ;-D TOUCH_IRQ=-1
+    -D TOUCH_RST=25
+    -D I2C_TOUCH_FREQUENCY=400000
+    -D I2C_TOUCH_PORT=1
+    -D I2C_TOUCH_ADDRESS=0x15 ; or 0x14
+    -D TOUCH_OFFSET_ROTATION=2  ;touch rotation
+;endregion
+
+; -- Debugging options -----------------------------
+;   -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG