Renamed file. Updated version st7796

rzeldent · Dec 14, 2023 · 20f3d80 · 20f3d80
1 parent 8839474
commit 20f3d80
Show file tree

Hide file tree

Showing 28 changed files with 22 additions and 433 deletions.
diff --git a/README.md b/README.md
@@ -1421,7 +1421,7 @@ The following libraries are used from the EspressIf registry:
 | Name                  | Version |
 |---                    |---      |
 | [ESP LCD ILI9341](https://components.espressif.com/api/download/?object_type=component&object_id=680fe7b6-c70b-4560-acf9-919e5b8fa192)        | v2.0    |
-| [ESP LCD ST7796](https://components.espressif.com/api/download/?object_type=component&object_id=bdf53b24-6f59-4ab5-b92e-89ff0e94d307)         | v1.2    |
+| [ESP LCD ST7796](https://components.espressif.com/api/download/?object_type=component&object_id=eb6095d1-642a-4e14-9daf-d46db8a1f354)         | v1.2.1  |
 | [ESP LCD CG9A01](https://components.espressif.com/api/download/?object_type=component&object_id=6f06ecdf-97a6-4eea-ad4f-c00d11bd970a)         | v1.2    |
 | [ESP LCD Touch](https://components.espressif.com/api/download/?object_type=component&object_id=bb4a4d94-2827-4695-84d1-1b53383b8001)          | v1.1.1  |
 | [ESP LCD Touch CST816S](https://components.espressif.com/api/download/?object_type=component&object_id=cc8ef108-15e8-48cf-9be8-3c7e89ca493e)  | v1.0.3  |

diff --git a/boards/ESP32-1732S019C.json b/boards/ESP32-1732S019C.json
@@ -27,6 +27,7 @@
       "-DPANEL_MIRROR_Y=false",
       "-DPANEL_GAP_X=35",
       "-DPANEL_GAP_Y=0",
+      "-DHAS_TOUCH",
       "-DUSES_GT911",
       "-DGT911_I2C_HOST=0",
       "-DGT911_I2C_CONFIG={.mode=I2C_MODE_MASTER,.sda_io_num=9,.scl_io_num=46,.sda_pullup_en=GPIO_PULLUP_ENABLE,.scl_pullup_en=GPIO_PULLUP_ENABLE,.master={.clk_speed=400000}}",

diff --git a/boards/ESP32-2424S012C.json b/boards/ESP32-2424S012C.json
@@ -21,6 +21,7 @@
       "-DPANEL_SWAP_XY=false",
       "-DPANEL_MIRROR_X=true",
       "-DPANEL_MIRROR_Y=false",
+      "-DHAS_TOUCH",
       "-DUSES_CST816S",
       "-DCST816S_I2C_HOST=0",
       "-DCST816S_I2C_CONFIG={.mode=I2C_MODE_MASTER,.sda_io_num=4,.scl_io_num=5,.sda_pullup_en=GPIO_PULLUP_ENABLE,.scl_pullup_en=GPIO_PULLUP_ENABLE,.master={.clk_speed=400000}}",

diff --git a/boards/ESP32-2432S024C.json b/boards/ESP32-2432S024C.json
@@ -18,6 +18,7 @@
       "-DPANEL_SWAP_XY=false",
       "-DPANEL_MIRROR_X=true",
       "-DPANEL_MIRROR_Y=false",
+      "-DHAS_TOUCH",
       "-DUSES_CST816S",
       "-DCST816S_I2C_HOST=0",
       "-DCST816S_I2C_CONFIG={.mode=I2C_MODE_MASTER,.sda_io_num=33,.scl_io_num=32,.sda_pullup_en=GPIO_PULLUP_ENABLE,.scl_pullup_en=GPIO_PULLUP_ENABLE,.master={.clk_speed=400000}}",

diff --git a/boards/ESP32-2432S024R.json b/boards/ESP32-2432S024R.json
@@ -18,6 +18,7 @@
       "-DPANEL_SWAP_XY=false",
       "-DPANEL_MIRROR_X=true",
       "-DPANEL_MIRROR_Y=false",
+      "-DHAS_TOUCH",
       "-DUSES_XPT2046",
       "-DXPT2046_SPI_HOST=SPI2_HOST",
       "-DXPT2046_SPI_BUS_CONFIG={.mosi_io_num=13,.miso_io_num=12,.sclk_io_num=14,.quadwp_io_num=-1,.quadhd_io_num=-1}",

diff --git a/boards/ESP32-2432S028R.json b/boards/ESP32-2432S028R.json
@@ -18,6 +18,7 @@
       "-DPANEL_SWAP_XY=false",
       "-DPANEL_MIRROR_X=true",
       "-DPANEL_MIRROR_Y=false",
+      "-DHAS_TOUCH",
       "-DUSES_XPT2046",
       "-DXPT2046_SPI_HOST=SPI3_HOST",
       "-DXPT2046_SPI_BUS_CONFIG={.mosi_io_num=32,.miso_io_num=39,.sclk_io_num=25,.quadwp_io_num=-1,.quadhd_io_num=-1}",

diff --git a/boards/ESP32-2432S032C.json b/boards/ESP32-2432S032C.json
@@ -18,6 +18,7 @@
       "-DPANEL_SWAP_XY=false",
       "-DPANEL_MIRROR_X=true",
       "-DPANEL_MIRROR_Y=false",
+      "-DHAS_TOUCH",
       "-DUSES_GT911",
       "-DGT911_I2C_HOST=0",
       "-DGT911_I2C_CONFIG={.mode=I2C_MODE_MASTER,.sda_io_num=33,.scl_io_num=32,.sda_pullup_en=GPIO_PULLUP_ENABLE,.scl_pullup_en=GPIO_PULLUP_ENABLE,.master={.clk_speed=400000}}",

diff --git a/boards/ESP32-2432S032R.json b/boards/ESP32-2432S032R.json
@@ -18,6 +18,7 @@
       "-DPANEL_SWAP_XY=false",
       "-DPANEL_MIRROR_X=true",
       "-DPANEL_MIRROR_Y=false",
+      "-DHAS_TOUCH",
       "-DUSES_XPT2046",
       "-DXPT2046_SPI_HOST=SPI2_HOST",
       "-DXPT2046_SPI_BUS_CONFIG={.mosi_io_num=13,.miso_io_num=12,.sclk_io_num=14,.quadwp_io_num=-1,.quadhd_io_num=-1}",

diff --git a/boards/ESP32-3248S035C.json b/boards/ESP32-3248S035C.json
@@ -18,6 +18,7 @@
       "-DPANEL_SWAP_XY=false",
       "-DPANEL_MIRROR_X=true",
       "-DPANEL_MIRROR_Y=false",
+      "-DHAS_TOUCH",
       "-DUSES_GT911",
       "-DGT911_I2C_HOST=0",
       "-DGT911_I2C_CONFIG={.mode=I2C_MODE_MASTER,.sda_io_num=33,.scl_io_num=32,.sda_pullup_en=GPIO_PULLUP_ENABLE,.scl_pullup_en=GPIO_PULLUP_ENABLE,.master={.clk_speed=400000}}",

diff --git a/boards/ESP32-3248S035R.json b/boards/ESP32-3248S035R.json
@@ -18,6 +18,7 @@
       "-DPANEL_SWAP_XY=false",
       "-DPANEL_MIRROR_X=true",
       "-DPANEL_MIRROR_Y=false",
+      "-DHAS_TOUCH",
       "-DUSES_XPT2046",
       "-DXPT2046_SPI_HOST=SPI2_HOST",
       "-DXPT2046_SPI_BUS_CONFIG={.mosi_io_num=13,.miso_io_num=12,.sclk_io_num=14,.quadwp_io_num=-1,.quadhd_io_num=-1}",

diff --git a/boards/ESP32-4827S043C.json b/boards/ESP32-4827S043C.json
@@ -20,6 +20,7 @@
       "-DUSES_PARALLEL_16",
       "-DTFT_RGB_CONFIG={.clk_src=LCD_CLK_SRC_PLL160M,.timings={.pclk_hz=16000000,.h_res=TFT_WIDTH,.v_res=TFT_HEIGHT,.hsync_pulse_width=4,.hsync_back_porch=43,.hsync_front_porch=8,.vsync_pulse_width=4,.vsync_back_porch=12,.vsync_front_porch=8,.flags={.hsync_idle_low=1,.vsync_idle_low=1,.pclk_active_neg=1}},.data_width=16,.psram_trans_align=64,.hsync_gpio_num=39,.vsync_gpio_num=41,.de_gpio_num=40,.pclk_gpio_num=42,.disp_gpio_num=-1,.data_gpio_nums={8,3,46,9,1,5,6,7,15,16,4,45,48,47,21,14},.flags={.fb_in_psram=1}}",
       "-DTFT_RGB_CONFIG_COLOR_16_SWAP={.clk_src=LCD_CLK_SRC_PLL160M,.timings={.pclk_hz=16000000,.h_res=TFT_WIDTH,.v_res=TFT_HEIGHT,.hsync_pulse_width=4,.hsync_back_porch=43,.hsync_front_porch=8,.vsync_pulse_width=4,.vsync_back_porch=12,.vsync_front_porch=8,.flags={.hsync_idle_low=1,.vsync_idle_low=1,.pclk_active_neg=1}},.data_width=16,.psram_trans_align=64,.hsync_gpio_num=39,.vsync_gpio_num=41,.de_gpio_num=40,.pclk_gpio_num=42,.disp_gpio_num=-1,.data_gpio_nums={15,16,4,45,48,47,21,14,8,3,46,9,1,5,6,7},.flags={.fb_in_psram=1}}",
+      "-DHAS_TOUCH",
       "-DUSES_GT911",
       "-DGT911_I2C_HOST=0",
       "-DGT911_I2C_CONFIG={.mode=I2C_MODE_MASTER,.sda_io_num=19,.scl_io_num=20,.sda_pullup_en=GPIO_PULLUP_ENABLE,.scl_pullup_en=GPIO_PULLUP_ENABLE,.master={.clk_speed=400000}}",

diff --git a/boards/ESP32-4827S043R.json b/boards/ESP32-4827S043R.json
@@ -20,6 +20,7 @@
       "-DUSES_PARALLEL_16",
       "-DTFT_RGB_CONFIG={.clk_src=LCD_CLK_SRC_PLL160M,.timings={.pclk_hz=16000000,.h_res=TFT_WIDTH,.v_res=TFT_HEIGHT,.hsync_pulse_width=4,.hsync_back_porch=43,.hsync_front_porch=8,.vsync_pulse_width=4,.vsync_back_porch=12,.vsync_front_porch=8,.flags={.hsync_idle_low=1,.vsync_idle_low=1,.pclk_active_neg=1}},.data_width=16,.psram_trans_align=64,.hsync_gpio_num=39,.vsync_gpio_num=41,.de_gpio_num=40,.pclk_gpio_num=42,.disp_gpio_num=-1,.data_gpio_nums={8,3,46,9,1,5,6,7,15,16,4,45,48,47,21,14},.flags={.fb_in_psram=1}}",
       "-DTFT_RGB_CONFIG_COLOR_16_SWAP={.clk_src=LCD_CLK_SRC_PLL160M,.timings={.pclk_hz=16000000,.h_res=TFT_WIDTH,.v_res=TFT_HEIGHT,.hsync_pulse_width=4,.hsync_back_porch=43,.hsync_front_porch=8,.vsync_pulse_width=4,.vsync_back_porch=12,.vsync_front_porch=8,.flags={.hsync_idle_low=1,.vsync_idle_low=1,.pclk_active_neg=1}},.data_width=16,.psram_trans_align=64,.hsync_gpio_num=39,.vsync_gpio_num=41,.de_gpio_num=40,.pclk_gpio_num=42,.disp_gpio_num=-1,.data_gpio_nums={15,16,4,45,48,47,21,14,8,3,46,9,1,5,6,7},.flags={.fb_in_psram=1}}",
+      "-DHAS_TOUCH",
       "-DUSES_XPT2046",
       "-DXPT2046_SPI_HOST=SPI2_HOST",
       "-DXPT2046_SPI_BUS_CONFIG={.mosi_io_num=11,.miso_io_num=13,.sclk_io_num=12,.quadwp_io_num=-1,.quadhd_io_num=-1}",

diff --git a/boards/ESP32-8048S043C.json b/boards/ESP32-8048S043C.json
@@ -20,6 +20,7 @@
       "-DUSES_PARALLEL_16",
       "-DTFT_RGB_CONFIG={.clk_src=LCD_CLK_SRC_PLL160M,.timings={.pclk_hz=16000000,.h_res=TFT_WIDTH,.v_res=TFT_HEIGHT,.hsync_pulse_width=4,.hsync_back_porch=43,.hsync_front_porch=8,.vsync_pulse_width=4,.vsync_back_porch=12,.vsync_front_porch=8,.flags={.hsync_idle_low=1,.vsync_idle_low=1,.pclk_active_neg=1}},.data_width=16,.psram_trans_align=64,.hsync_gpio_num=39,.vsync_gpio_num=41,.de_gpio_num=40,.pclk_gpio_num=42,.disp_gpio_num=-1,.data_gpio_nums={8,3,46,9,1,5,6,7,15,16,4,45,48,47,21,14},.flags={.fb_in_psram=1}}",
       "-DTFT_RGB_CONFIG_COLOR_16_SWAP={.clk_src=LCD_CLK_SRC_PLL160M,.timings={.pclk_hz=16000000,.h_res=TFT_WIDTH,.v_res=TFT_HEIGHT,.hsync_pulse_width=4,.hsync_back_porch=43,.hsync_front_porch=8,.vsync_pulse_width=4,.vsync_back_porch=12,.vsync_front_porch=8,.flags={.hsync_idle_low=1,.vsync_idle_low=1,.pclk_active_neg=1}},.data_width=16,.psram_trans_align=64,.hsync_gpio_num=39,.vsync_gpio_num=41,.de_gpio_num=40,.pclk_gpio_num=42,.disp_gpio_num=-1,.data_gpio_nums={15,16,4,45,48,47,21,14,8,3,46,9,1,5,6,7},.flags={.fb_in_psram=1}}",
+      "-DHAS_TOUCH",
       "-DUSES_GT911",
       "-DGT911_I2C_HOST=0",
       "-DGT911_I2C_CONFIG={.mode=I2C_MODE_MASTER,.sda_io_num=19,.scl_io_num=20,.sda_pullup_en=GPIO_PULLUP_ENABLE,.scl_pullup_en=GPIO_PULLUP_ENABLE,.master={.clk_speed=400000}}",

diff --git a/boards/ESP32-8048S043R.json b/boards/ESP32-8048S043R.json
@@ -20,6 +20,7 @@
       "-DUSES_PARALLEL_16",
       "-DTFT_RGB_CONFIG={.clk_src=LCD_CLK_SRC_PLL160M,.timings={.pclk_hz=16000000,.h_res=TFT_WIDTH,.v_res=TFT_HEIGHT,.hsync_pulse_width=4,.hsync_back_porch=43,.hsync_front_porch=8,.vsync_pulse_width=4,.vsync_back_porch=12,.vsync_front_porch=8,.flags={.hsync_idle_low=1,.vsync_idle_low=1,.pclk_active_neg=1}},.data_width=16,.psram_trans_align=64,.hsync_gpio_num=39,.vsync_gpio_num=41,.de_gpio_num=40,.pclk_gpio_num=42,.disp_gpio_num=-1,.data_gpio_nums={8,3,46,9,1,5,6,7,15,16,4,45,48,47,21,14},.flags={.fb_in_psram=1}}",
       "-DTFT_RGB_CONFIG_COLOR_16_SWAP={.clk_src=LCD_CLK_SRC_PLL160M,.timings={.pclk_hz=16000000,.h_res=TFT_WIDTH,.v_res=TFT_HEIGHT,.hsync_pulse_width=4,.hsync_back_porch=43,.hsync_front_porch=8,.vsync_pulse_width=4,.vsync_back_porch=12,.vsync_front_porch=8,.flags={.hsync_idle_low=1,.vsync_idle_low=1,.pclk_active_neg=1}},.data_width=16,.psram_trans_align=64,.hsync_gpio_num=39,.vsync_gpio_num=41,.de_gpio_num=40,.pclk_gpio_num=42,.disp_gpio_num=-1,.data_gpio_nums={15,16,4,45,48,47,21,14,8,3,46,9,1,5,6,7},.flags={.fb_in_psram=1}}",
+      "-DHAS_TOUCH",
       "-DUSES_XPT2046",
       "-DXPT2046_SPI_HOST=SPI2_HOST",
       "-DXPT2046_SPI_BUS_CONFIG={.mosi_io_num=11,.miso_io_num=13,.sclk_io_num=12,.quadwp_io_num=-1,.quadhd_io_num=-1}",

diff --git a/boards/ESP32-8048S050C.json b/boards/ESP32-8048S050C.json
@@ -20,6 +20,7 @@
       "-DUSES_PARALLEL_16",
       "-DTFT_RGB_CONFIG={.clk_src=LCD_CLK_SRC_PLL160M,.timings={.pclk_hz=16000000,.h_res=TFT_WIDTH,.v_res=TFT_HEIGHT,.hsync_pulse_width=4,.hsync_back_porch=43,.hsync_front_porch=8,.vsync_pulse_width=4,.vsync_back_porch=12,.vsync_front_porch=8,.flags={.hsync_idle_low=1,.vsync_idle_low=1,.pclk_active_neg=1}},.data_width=16,.psram_trans_align=64,.hsync_gpio_num=39,.vsync_gpio_num=41,.de_gpio_num=40,.pclk_gpio_num=42,.disp_gpio_num=-1,.data_gpio_nums={8,3,46,9,1,5,6,7,15,16,4,45,48,47,21,14},.flags={.fb_in_psram=1}}",
       "-DTFT_RGB_CONFIG_COLOR_16_SWAP={.clk_src=LCD_CLK_SRC_PLL160M,.timings={.pclk_hz=16000000,.h_res=TFT_WIDTH,.v_res=TFT_HEIGHT,.hsync_pulse_width=4,.hsync_back_porch=43,.hsync_front_porch=8,.vsync_pulse_width=4,.vsync_back_porch=12,.vsync_front_porch=8,.flags={.hsync_idle_low=1,.vsync_idle_low=1,.pclk_active_neg=1}},.data_width=16,.psram_trans_align=64,.hsync_gpio_num=39,.vsync_gpio_num=41,.de_gpio_num=40,.pclk_gpio_num=42,.disp_gpio_num=-1,.data_gpio_nums={15,16,4,45,48,47,21,14,8,3,46,9,1,5,6,7},.flags={.fb_in_psram=1}}",
+      "-DHAS_TOUCH",
       "-DUSES_GT911",
       "-DGT911_I2C_HOST=0",
       "-DGT911_I2C_CONFIG={.mode=I2C_MODE_MASTER,.sda_io_num=19,.scl_io_num=20,.sda_pullup_en=GPIO_PULLUP_ENABLE,.scl_pullup_en=GPIO_PULLUP_ENABLE,.master={.clk_speed=400000}}",

diff --git a/boards/ESP32-8048S050R.json b/boards/ESP32-8048S050R.json
@@ -20,6 +20,7 @@
       "-DUSES_PARALLEL_16",
       "-DTFT_RGB_CONFIG={.clk_src=LCD_CLK_SRC_PLL160M,.timings={.pclk_hz=16000000,.h_res=TFT_WIDTH,.v_res=TFT_HEIGHT,.hsync_pulse_width=4,.hsync_back_porch=43,.hsync_front_porch=8,.vsync_pulse_width=4,.vsync_back_porch=12,.vsync_front_porch=8,.flags={.hsync_idle_low=1,.vsync_idle_low=1,.pclk_active_neg=1}},.data_width=16,.psram_trans_align=64,.hsync_gpio_num=39,.vsync_gpio_num=41,.de_gpio_num=40,.pclk_gpio_num=42,.disp_gpio_num=-1,.data_gpio_nums={8,3,46,9,1,5,6,7,15,16,4,45,48,47,21,14},.flags={.fb_in_psram=1}}",
       "-DTFT_RGB_CONFIG_COLOR_16_SWAP={.clk_src=LCD_CLK_SRC_PLL160M,.timings={.pclk_hz=16000000,.h_res=TFT_WIDTH,.v_res=TFT_HEIGHT,.hsync_pulse_width=4,.hsync_back_porch=43,.hsync_front_porch=8,.vsync_pulse_width=4,.vsync_back_porch=12,.vsync_front_porch=8,.flags={.hsync_idle_low=1,.vsync_idle_low=1,.pclk_active_neg=1}},.data_width=16,.psram_trans_align=64,.hsync_gpio_num=39,.vsync_gpio_num=41,.de_gpio_num=40,.pclk_gpio_num=42,.disp_gpio_num=-1,.data_gpio_nums={15,16,4,45,48,47,21,14,8,3,46,9,1,5,6,7},.flags={.fb_in_psram=1}}",
+      "-DHAS_TOUCH",
       "-DUSES_XPT2046",
       "-DXPT2046_SPI_HOST=SPI2_HOST",
       "-DXPT2046_SPI_BUS_CONFIG={.mosi_io_num=11,.miso_io_num=13,.sclk_io_num=12,.quadwp_io_num=-1,.quadhd_io_num=-1}",

diff --git a/boards/ESP32-8048S070C.json b/boards/ESP32-8048S070C.json
@@ -27,6 +27,7 @@
       "-DXPT2046_TOUCH_CONFIG={.x_max=TFT_WIDTH,.y_max=TFT_HEIGHT,.rst_gpio_num=GPIO_NUM_NC,.int_gpio_num=GPIO_NUM_18}",
       "-DTOUCH_ROT_SWAP_X=false",
       "-DTOUCH_ROT_SWAP_Y=false",
+      "-DHAS_TOUCH",
       "-DUSES_GT911",
       "-DGT911_I2C_HOST=0",
       "-DGT911_I2C_CONFIG={.mode=I2C_MODE_MASTER,.sda_io_num=19,.scl_io_num=20,.sda_pullup_en=GPIO_PULLUP_ENABLE,.scl_pullup_en=GPIO_PULLUP_ENABLE,.master={.clk_speed=400000}}",