diff --git a/README.md b/README.md index 6502229..38d74b2 100644 --- a/README.md +++ b/README.md @@ -139,9 +139,9 @@ The table below provides some explanation of the variable names. These definitio | type_RST | GPIO for the Reset | | type_INT | GPIO for the INTerrupt | | | | -| TOUCH_SWAP_XY | Swap horizontally and vertically | -| TOUCH_SWAP_X | Swap the touch horizontally | -| TOUCH_SWAP_Y | Swap the touch vertically | +| TOUCH_MIRROR_XY | Swap horizontally and vertically | +| TOUCH_MIRROR_X | Swap the touch horizontally | +| TOUCH_MIRROR_Y | Swap the touch vertically | | | | | BOARD_HAS_TF | The board has a TF slot | | TF_CS | GPIO for the TF slot Chip Select | diff --git a/assets/datasheets/CST816S.pdf b/assets/datasheets/CST816S.pdf index 36604c6..338ef7b 100644 Binary files a/assets/datasheets/CST816S.pdf and b/assets/datasheets/CST816S.pdf differ diff --git a/assets/datasheets/GT911.pdf b/assets/datasheets/GT911.pdf index 1b82298..41f5a35 100644 Binary files a/assets/datasheets/GT911.pdf and b/assets/datasheets/GT911.pdf differ diff --git a/esp32-1732S019C.json b/esp32-1732S019C.json index fac9218..b6d4918 100644 --- a/esp32-1732S019C.json +++ b/esp32-1732S019C.json @@ -53,6 +53,8 @@ "'-D LCD_GAP_X=35'", "'-D LCD_GAP_Y=0'", "'-D BOARD_HAS_TOUCH'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", "'-D TOUCH_GT911_I2C'", "'-D GT911_I2C_HOST=I2C_NUM_0'", "'-D GT911_I2C_CONFIG_SDA_IO_NUM=9'", @@ -61,7 +63,7 @@ "'-D GT911_I2C_CONFIG_SCL_PULLUP_EN=GPIO_PULLUP_DISABLE'", "'-D GT911_I2C_CONFIG_MASTER_CLK_SPEED=400000'", "'-D GT911_I2C_CONFIG_CLK_FLAGS=I2C_SCLK_SRC_FLAG_FOR_NOMAL'", - "'-D GT911_IO_I2C_CONFIG_DEV_ADDR=ESP_LCD_TOUCH_IO_I2C_GT911_ADDRESS'", + "'-D GT911_IO_I2C_CONFIG_DEV_ADDR=GT911_IO_I2C_CONFIG_DEV_ADDRESS_5D'", "'-D GT911_IO_I2C_CONFIG_CONTROL_PHASE_BYTES=1'", "'-D GT911_IO_I2C_CONFIG_DC_BIT_OFFSET=0'", "'-D GT911_IO_I2C_CONFIG_LCD_CMD_BITS=16'", @@ -74,9 +76,9 @@ "'-D GT911_TOUCH_CONFIG_INT_GPIO_NUM=8'", "'-D GT911_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D GT911_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_SWAP_XY=false'", - "'-D TOUCH_SWAP_X=false'", - "'-D TOUCH_SWAP_Y=false'" + "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_MIRROR_X=false'", + "'-D TOUCH_MIRROR_Y=false'" ], "f_cpu": "240000000L", "f_flash": "80000000L", diff --git a/esp32-2424S012C.json b/esp32-2424S012C.json index f6546a8..ff83934 100644 --- a/esp32-2424S012C.json +++ b/esp32-2424S012C.json @@ -17,6 +17,7 @@ "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT/4)'", "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT)'", "'-D GPIO_BCKL=3'", + "'-D LCD_IPS'", "'-D LCD_GC9A01_SPI'", "'-D GC9A01_SPI_HOST=SPI2_HOST'", "'-D GC9A01_SPI_DMA_CHANNEL=SPI_DMA_CH_AUTO'", @@ -48,7 +49,10 @@ "'-D LCD_MIRROR_X=true'", "'-D LCD_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", "'-D TOUCH_CST816S_I2C'", + "'-D CST816S_IO_I2C_CONFIG_DEV_ADDRESS=CST816S_IO_I2C_CONFIG_DEV_ADDRESS_15'", "'-D CST816S_I2C_HOST=I2C_NUM_0'", "'-D CST816S_I2C_CONFIG_SDA_IO_NUM=4'", "'-D CST816S_I2C_CONFIG_SCL_IO_NUM=5'", @@ -69,9 +73,9 @@ "'-D CST816S_TOUCH_CONFIG_INT_GPIO_NUM=0'", "'-D CST816S_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D CST816S_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_SWAP_XY=false'", - "'-D TOUCH_SWAP_X=false'", - "'-D TOUCH_SWAP_Y=false'" + "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_MIRROR_X=false'", + "'-D TOUCH_MIRROR_Y=false'" ], "mcu": "esp32c3", "variant": "esp32c3" diff --git a/esp32-2424S012N.json b/esp32-2424S012N.json index 3c5636d..325b186 100644 --- a/esp32-2424S012N.json +++ b/esp32-2424S012N.json @@ -17,6 +17,7 @@ "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT/4)'", "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT)'", "'-D GPIO_BCKL=3'", + "'-D LCD_IPS'", "'-D LCD_GC9A01_SPI'", "'-D GC9A01_SPI_HOST=SPI2_HOST'", "'-D GC9A01_SPI_DMA_CHANNEL=SPI_DMA_CH_AUTO'", diff --git a/esp32-2432S022C.json b/esp32-2432S022C.json index c661331..3c9d54e 100644 --- a/esp32-2432S022C.json +++ b/esp32-2432S022C.json @@ -52,7 +52,10 @@ "'-D LCD_MIRROR_X=false'", "'-D LCD_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", "'-D TOUCH_CST816S_I2C'", + "'-D CST816S_IO_I2C_CONFIG_DEV_ADDRESS=CST816S_IO_I2C_CONFIG_DEV_ADDRESS_15'", "'-D CST816S_I2C_HOST=I2C_NUM_0'", "'-D CST816S_I2C_CONFIG_SDA_IO_NUM=21'", "'-D CST816S_I2C_CONFIG_SCL_IO_NUM=22'", @@ -73,9 +76,9 @@ "'-D CST816S_TOUCH_CONFIG_INT_GPIO_NUM=GPIO_NUM_NC'", "'-D CST816S_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D CST816S_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_SWAP_XY=false'", - "'-D TOUCH_SWAP_X=false'", - "'-D TOUCH_SWAP_Y=false'", + "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_MIRROR_X=false'", + "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", "'-D TF_CS=5'", "'-D TF_SPI_MOSI=23'", diff --git a/esp32-2432S024C.json b/esp32-2432S024C.json index 61664b3..137c9d9 100644 --- a/esp32-2432S024C.json +++ b/esp32-2432S024C.json @@ -43,7 +43,10 @@ "'-D LCD_MIRROR_X=true'", "'-D LCD_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", "'-D TOUCH_CST816S_I2C'", + "'-D CST816S_IO_I2C_CONFIG_DEV_ADDRESS=CST816S_IO_I2C_CONFIG_DEV_ADDRESS_15'", "'-D CST816S_I2C_HOST=I2C_NUM_0'", "'-D CST816S_I2C_CONFIG_SDA_IO_NUM=33'", "'-D CST816S_I2C_CONFIG_SCL_IO_NUM=32'", @@ -64,9 +67,9 @@ "'-D CST816S_TOUCH_CONFIG_INT_GPIO_NUM=21'", "'-D CST816S_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D CST816S_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_SWAP_XY=false'", - "'-D TOUCH_SWAP_X=false'", - "'-D TOUCH_SWAP_Y=false'", + "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_MIRROR_X=false'", + "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", "'-D TF_CS=5'", "'-D TF_SPI_MOSI=23'", diff --git a/esp32-2432S024R.json b/esp32-2432S024R.json index 64a2d7b..5e7061f 100644 --- a/esp32-2432S024R.json +++ b/esp32-2432S024R.json @@ -43,7 +43,10 @@ "'-D LCD_MIRROR_X=true'", "'-D LCD_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", "'-D TOUCH_XPT2046_SPI'", + "'-D XPT2046_Z_THRESHOLD=600'", "'-D XPT2046_SPI_HOST=SPI2_HOST'", "'-D XPT2046_SPI_DMA_CHANNEL=SPI_DMA_CH_AUTO'", "'-D XPT2046_SPI_BUS_MOSI_IO_NUM=13'", @@ -68,9 +71,9 @@ "'-D XPT2046_TOUCH_CONFIG_INT_GPIO_NUM=36'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_SWAP_XY=false'", - "'-D TOUCH_SWAP_X=true'", - "'-D TOUCH_SWAP_Y=false'", + "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_MIRROR_X=true'", + "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", "'-D TF_CS=5'", "'-D TF_SPI_MOSI=23'", diff --git a/esp32-2432S028R.json b/esp32-2432S028R.json index 8d30ec3..148b67c 100644 --- a/esp32-2432S028R.json +++ b/esp32-2432S028R.json @@ -43,7 +43,10 @@ "'-D LCD_MIRROR_X=true'", "'-D LCD_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", "'-D TOUCH_XPT2046_SPI'", + "'-D XPT2046_Z_THRESHOLD=600'", "'-D XPT2046_SPI_HOST=SPI3_HOST'", "'-D XPT2046_SPI_DMA_CHANNEL=SPI_DMA_CH_AUTO'", "'-D XPT2046_SPI_BUS_MOSI_IO_NUM=32'", @@ -68,9 +71,9 @@ "'-D XPT2046_TOUCH_CONFIG_INT_GPIO_NUM=36'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_SWAP_XY=false'", - "'-D TOUCH_SWAP_X=true'", - "'-D TOUCH_SWAP_Y=false'", + "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_MIRROR_X=true'", + "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", "'-D TF_CS=5'", "'-D TF_SPI_MOSI=23'", diff --git a/esp32-2432S028Rv2.json b/esp32-2432S028Rv2.json index cab4437..4a54f6b 100644 --- a/esp32-2432S028Rv2.json +++ b/esp32-2432S028Rv2.json @@ -38,12 +38,15 @@ "'-D ILI9341_DEV_CONFIG_COLOR_SPACE=ESP_LCD_COLOR_SPACE_BGR'", "'-D ILI9341_DEV_CONFIG_BITS_PER_PIXEL=16'", "'-D ILI9341_DEV_CONFIG_FLAGS_RESET_ACTIVE_HIGH=false'", - "'-D ILI9341_DEV_CONFIG_VENDOR_CONFIG=(ili9341_vendor_config_t[]){{.init_cmds=(ili9341_lcd_init_cmd_t[]){{.cmd=0xCF,.data=(uint8_t[]){0x00,0xC1,0x30},.data_bytes=3},{.cmd=0xED,.data=(uint8_t[]){0x64,0x03,0x12,0x81},.data_bytes=4},{.cmd=0xE8,.data=(uint8_t[]){0x85,0x00,0x78},.data_bytes=3},{.cmd=0xCB,.data=(uint8_t[]){0x39,0x2C,0x00,0x34,0x02},.data_bytes=5},{.cmd=0xF7,.data=(uint8_t[]){0x20},.data_bytes=1},{.cmd=0xEA,.data=(uint8_t[]){0x00,0x00},.data_bytes=2},{.cmd=0xC0,.data=(uint8_t[]){0x10},.data_bytes=1},{.cmd=0xC1,.data=(uint8_t[]){0x00},.data_bytes=1},{.cmd=0xC5,.data=(uint8_t[]){0x30,0x30},.data_bytes=2,},{.cmd=0xC7,.data=(uint8_t[]){0xB7},.data_bytes=1},{.cmd=0x3A,.data=(uint8_t[]){0x55},.data_bytes=1},{.cmd=0x36,.data=(uint8_t[]){0x08},.data_bytes=1},{.cmd=0xB1,.data=(uint8_t[]){0x00,0x1A},.data_bytes=2},{.cmd=0xB6,.data=(uint8_t[]){0x08,0x82,0x27},.data_bytes=3},{.cmd=0xF2,.data=(uint8_t[]){0x00},.data_bytes=1},{.cmd=0x26,.data=(uint8_t[]){0x01},.data_bytes=1},{.cmd=0xE0,.data=(uint8_t[]){0x0F,0x2A,0x28,0x08,0x0E,0x08,0x54,0xA9,0x43,0x0A,0x0F,0x00,0x00,0x00,0x00},.data_bytes=15},{.cmd=0xE1,.data=(uint8_t[]){0x00,0x15,0x17,0x07,0x11,0x06,0x2B,0x56,0x3C,0x05,0x10,0x0F,0x3F,0x3F,0x0F},.data_bytes=15},{.cmd=0x2B,.data=(uint8_t[]){0x00,0x00,0x01,0x3F},.data_bytes=4},{.cmd=0x2A,.data=(uint8_t[]){0x00,0x00,0x00,0xEF},.data_bytes=4},{.cmd=0x21},{.cmd=0x11,.delay_ms=120},{.cmd=0x29,.delay_ms=1}},.init_cmds_size=23}}'", + "'-D ILI9341_DEV_CONFIG_VENDOR_CONFIG=(ili9341_vendor_config_t[]){{.init_cmds=(lcd_init_cmd_t[]){{.cmd=0xCF,.data=(uint8_t[]){0x00,0xC1,0x30},.bytes=3},{.cmd=0xED,.data=(uint8_t[]){0x64,0x03,0x12,0x81},.bytes=4},{.cmd=0xE8,.data=(uint8_t[]){0x85,0x00,0x78},.bytes=3},{.cmd=0xCB,.data=(uint8_t[]){0x39,0x2C,0x00,0x34,0x02},.bytes=5},{.cmd=0xF7,.data=(uint8_t[]){0x20},.bytes=1},{.cmd=0xEA,.data=(uint8_t[]){0x00,0x00},.bytes=2},{.cmd=0xC0,.data=(uint8_t[]){0x10},.bytes=1},{.cmd=0xC1,.data=(uint8_t[]){0x00},.bytes=1},{.cmd=0xC5,.data=(uint8_t[]){0x30,0x30},.bytes=2,},{.cmd=0xC7,.data=(uint8_t[]){0xB7},.bytes=1},{.cmd=0x3A,.data=(uint8_t[]){0x55},.bytes=1},{.cmd=0x36,.data=(uint8_t[]){0x08},.bytes=1},{.cmd=0xB1,.data=(uint8_t[]){0x00,0x1A},.bytes=2},{.cmd=0xB6,.data=(uint8_t[]){0x08,0x82,0x27},.bytes=3},{.cmd=0xF2,.data=(uint8_t[]){0x00},.bytes=1},{.cmd=0x26,.data=(uint8_t[]){0x01},.bytes=1},{.cmd=0xE0,.data=(uint8_t[]){0x0F,0x2A,0x28,0x08,0x0E,0x08,0x54,0xA9,0x43,0x0A,0x0F,0x00,0x00,0x00,0x00},.bytes=15},{.cmd=0xE1,.data=(uint8_t[]){0x00,0x15,0x17,0x07,0x11,0x06,0x2B,0x56,0x3C,0x05,0x10,0x0F,0x3F,0x3F,0x0F},.bytes=15},{.cmd=0x2B,.data=(uint8_t[]){0x00,0x00,0x01,0x3F},.bytes=4},{.cmd=0x2A,.data=(uint8_t[]){0x00,0x00,0x00,0xEF},.bytes=4},{.cmd=0x21},{.cmd=0x11,.delay_ms=120},{.cmd=0x29,.delay_ms=1}},.init_cmds_size=23}}'", "'-D LCD_SWAP_XY=false'", "'-D LCD_MIRROR_X=true'", "'-D LCD_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", "'-D TOUCH_XPT2046_SPI'", + "'-D XPT2046_Z_THRESHOLD=600'", "'-D XPT2046_SPI_HOST=SPI3_HOST'", "'-D XPT2046_SPI_DMA_CHANNEL=SPI_DMA_CH_AUTO'", "'-D XPT2046_SPI_BUS_MOSI_IO_NUM=32'", @@ -68,9 +71,9 @@ "'-D XPT2046_TOUCH_CONFIG_INT_GPIO_NUM=36'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_SWAP_XY=false'", - "'-D TOUCH_SWAP_X=true'", - "'-D TOUCH_SWAP_Y=false'", + "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_MIRROR_X=true'", + "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", "'-D TF_CS=5'", "'-D TF_SPI_MOSI=23'", diff --git a/esp32-2432S028Rv3.json b/esp32-2432S028Rv3.json index e99fb52..7d331c5 100644 --- a/esp32-2432S028Rv3.json +++ b/esp32-2432S028Rv3.json @@ -43,7 +43,10 @@ "'-D LCD_MIRROR_X=false'", "'-D LCD_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", "'-D TOUCH_XPT2046_SPI'", + "'-D XPT2046_Z_THRESHOLD=600'", "'-D XPT2046_SPI_HOST=SPI3_HOST'", "'-D XPT2046_SPI_DMA_CHANNEL=SPI_DMA_CH_AUTO'", "'-D XPT2046_SPI_BUS_MOSI_IO_NUM=32'", @@ -68,9 +71,9 @@ "'-D XPT2046_TOUCH_CONFIG_INT_GPIO_NUM=36'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_SWAP_XY=false'", - "'-D TOUCH_SWAP_X=true'", - "'-D TOUCH_SWAP_Y=false'", + "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_MIRROR_X=true'", + "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", "'-D TF_CS=5'", "'-D TF_SPI_MOSI=23'", diff --git a/esp32-2432S032C.json b/esp32-2432S032C.json index a7b2b5f..a1b123b 100644 --- a/esp32-2432S032C.json +++ b/esp32-2432S032C.json @@ -44,6 +44,8 @@ "'-D LCD_MIRROR_X=false'", "'-D LCD_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", "'-D TOUCH_GT911_I2C'", "'-D GT911_I2C_HOST=I2C_NUM_0'", "'-D GT911_I2C_CONFIG_SDA_IO_NUM=33'", @@ -52,7 +54,7 @@ "'-D GT911_I2C_CONFIG_SCL_PULLUP_EN=GPIO_PULLUP_DISABLE'", "'-D GT911_I2C_CONFIG_MASTER_CLK_SPEED=400000'", "'-D GT911_I2C_CONFIG_CLK_FLAGS=I2C_SCLK_SRC_FLAG_FOR_NOMAL'", - "'-D GT911_IO_I2C_CONFIG_DEV_ADDR=ESP_LCD_TOUCH_IO_I2C_GT911_ADDRESS'", + "'-D GT911_IO_I2C_CONFIG_DEV_ADDR=GT911_IO_I2C_CONFIG_DEV_ADDRESS_5D'", "'-D GT911_IO_I2C_CONFIG_CONTROL_PHASE_BYTES=1'", "'-D GT911_IO_I2C_CONFIG_DC_BIT_OFFSET=0'", "'-D GT911_IO_I2C_CONFIG_LCD_CMD_BITS=16'", @@ -65,9 +67,9 @@ "'-D GT911_TOUCH_CONFIG_INT_GPIO_NUM=21'", "'-D GT911_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D GT911_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_SWAP_XY=false'", - "'-D TOUCH_SWAP_X=false'", - "'-D TOUCH_SWAP_Y=false'", + "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_MIRROR_X=false'", + "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", "'-D TF_CS=5'", "'-D TF_SPI_MOSI=23'", diff --git a/esp32-2432S032R.json b/esp32-2432S032R.json index c7c5559..1fc54e8 100644 --- a/esp32-2432S032R.json +++ b/esp32-2432S032R.json @@ -44,7 +44,10 @@ "'-D LCD_MIRROR_X=false'", "'-D LCD_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", "'-D TOUCH_XPT2046_SPI'", + "'-D XPT2046_Z_THRESHOLD=600'", "'-D XPT2046_SPI_HOST=SPI2_HOST'", "'-D XPT2046_SPI_DMA_CHANNEL=SPI_DMA_CH_AUTO'", "'-D XPT2046_SPI_BUS_MOSI_IO_NUM=13'", @@ -69,9 +72,9 @@ "'-D XPT2046_TOUCH_CONFIG_INT_GPIO_NUM=36'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_SWAP_XY=false'", - "'-D TOUCH_SWAP_X=false'", - "'-D TOUCH_SWAP_Y=false'", + "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_MIRROR_X=false'", + "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", "'-D TF_CS=5'", "'-D TF_SPI_MOSI=23'", diff --git a/esp32-3248S035C.json b/esp32-3248S035C.json index b53629e..6ebfd02 100644 --- a/esp32-3248S035C.json +++ b/esp32-3248S035C.json @@ -43,6 +43,8 @@ "'-D LCD_MIRROR_X=true'", "'-D LCD_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", "'-D TOUCH_GT911_I2C'", "'-D GT911_I2C_HOST=I2C_NUM_0'", "'-D GT911_I2C_CONFIG_SDA_IO_NUM=33'", @@ -51,7 +53,7 @@ "'-D GT911_I2C_CONFIG_SCL_PULLUP_EN=GPIO_PULLUP_DISABLE'", "'-D GT911_I2C_CONFIG_MASTER_CLK_SPEED=400000'", "'-D GT911_I2C_CONFIG_CLK_FLAGS=I2C_SCLK_SRC_FLAG_FOR_NOMAL'", - "'-D GT911_IO_I2C_CONFIG_DEV_ADDR=ESP_LCD_TOUCH_IO_I2C_GT911_ADDRESS'", + "'-D GT911_IO_I2C_CONFIG_DEV_ADDR=GT911_IO_I2C_CONFIG_DEV_ADDRESS_5D'", "'-D GT911_IO_I2C_CONFIG_CONTROL_PHASE_BYTES=1'", "'-D GT911_IO_I2C_CONFIG_DC_BIT_OFFSET=0'", "'-D GT911_IO_I2C_CONFIG_LCD_CMD_BITS=16'", @@ -64,9 +66,9 @@ "'-D GT911_TOUCH_CONFIG_INT_GPIO_NUM=21'", "'-D GT911_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D GT911_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_SWAP_XY=false'", - "'-D TOUCH_SWAP_X=false'", - "'-D TOUCH_SWAP_Y=false'", + "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_MIRROR_X=false'", + "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", "'-D TF_CS=5'", "'-D TF_SPI_MOSI=23'", diff --git a/esp32-3248S035R.json b/esp32-3248S035R.json index 90c83b7..73b33cb 100644 --- a/esp32-3248S035R.json +++ b/esp32-3248S035R.json @@ -43,7 +43,10 @@ "'-D LCD_MIRROR_X=true'", "'-D LCD_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", "'-D TOUCH_XPT2046_SPI'", + "'-D XPT2046_Z_THRESHOLD=600'", "'-D XPT2046_SPI_HOST=SPI2_HOST'", "'-D XPT2046_SPI_DMA_CHANNEL=SPI_DMA_CH_AUTO'", "'-D XPT2046_SPI_BUS_MOSI_IO_NUM=13'", @@ -68,9 +71,9 @@ "'-D XPT2046_TOUCH_CONFIG_INT_GPIO_NUM=36'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_SWAP_XY=false'", - "'-D TOUCH_SWAP_X=true'", - "'-D TOUCH_SWAP_Y=false'", + "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_MIRROR_X=true'", + "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", "'-D TF_CS=5'", "'-D TF_SPI_MOSI=23'", diff --git a/esp32-4827S043C.json b/esp32-4827S043C.json index 318659a..1431147 100644 --- a/esp32-4827S043C.json +++ b/esp32-4827S043C.json @@ -63,6 +63,8 @@ "'-D ST7262_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_FB_IN_PSRAM=true'", "'-D BOARD_HAS_TOUCH'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", "'-D TOUCH_GT911_I2C'", "'-D GT911_I2C_HOST=I2C_NUM_0'", "'-D GT911_I2C_CONFIG_SDA_IO_NUM=19'", @@ -71,7 +73,7 @@ "'-D GT911_I2C_CONFIG_SCL_PULLUP_EN=GPIO_PULLUP_DISABLE'", "'-D GT911_I2C_CONFIG_MASTER_CLK_SPEED=400000'", "'-D GT911_I2C_CONFIG_CLK_FLAGS=I2C_SCLK_SRC_FLAG_FOR_NOMAL'", - "'-D GT911_IO_I2C_CONFIG_DEV_ADDR=ESP_LCD_TOUCH_IO_I2C_GT911_ADDRESS'", + "'-D GT911_IO_I2C_CONFIG_DEV_ADDR=GT911_IO_I2C_CONFIG_DEV_ADDRESS_5D'", "'-D GT911_IO_I2C_CONFIG_CONTROL_PHASE_BYTES=1'", "'-D GT911_IO_I2C_CONFIG_DC_BIT_OFFSET=0'", "'-D GT911_IO_I2C_CONFIG_LCD_CMD_BITS=16'", @@ -84,9 +86,9 @@ "'-D GT911_TOUCH_CONFIG_INT_GPIO_NUM=18'", "'-D GT911_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D GT911_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_SWAP_XY=false'", - "'-D TOUCH_SWAP_X=false'", - "'-D TOUCH_SWAP_Y=false'", + "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_MIRROR_X=false'", + "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", "'-D TF_CS=10'", "'-D TF_SPI_MOSI=11'", diff --git a/esp32-4827S043R.json b/esp32-4827S043R.json index bdc13dd..8a82172 100644 --- a/esp32-4827S043R.json +++ b/esp32-4827S043R.json @@ -63,7 +63,10 @@ "'-D ST7262_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_FB_IN_PSRAM=true'", "'-D BOARD_HAS_TOUCH'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", "'-D TOUCH_XPT2046_SPI'", + "'-D XPT2046_Z_THRESHOLD=600'", "'-D XPT2046_SPI_HOST=SPI2_HOST'", "'-D XPT2046_SPI_DMA_CHANNEL=SPI_DMA_CH_AUTO'", "'-D XPT2046_SPI_BUS_MOSI_IO_NUM=11'", @@ -88,9 +91,9 @@ "'-D XPT2046_TOUCH_CONFIG_INT_GPIO_NUM=18'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_SWAP_XY=false'", - "'-D TOUCH_SWAP_X=false'", - "'-D TOUCH_SWAP_Y=false'", + "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_MIRROR_X=false'", + "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", "'-D TF_CS=10'", "'-D TF_SPI_MOSI=11'", diff --git a/esp32-4848S040CIY1.json b/esp32-4848S040CIY1.json index ca185b9..fb46843 100644 --- a/esp32-4848S040CIY1.json +++ b/esp32-4848S040CIY1.json @@ -74,15 +74,14 @@ "'-D ST7701_PANEL_CONFIG_FLAGS_DISP_ACTIVE_LOW=false'", "'-D ST7701_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'", "'-D ST7701_PANEL_CONFIG_FLAGS_FB_IN_PSRAM=true'", - "'-D ST7701_VENDOR_CONFIG_INIT_CMDS=NULL'", - "'-D ST7701_VENDOR_CONFIG_INIT_CMDS_SIZE=0'", - "'-D ST7701_VENDOR_CONFIG_FLAGS_MIRROR_BY_CMD=0'", - "'-D ST7701_VENDOR_CONFIG_FLAGS_AUTO_DEL_PANEL_IO=0'", "'-D ST7701_DEV_CONFIG_RESET_GPIO_NUM=GPIO_NUM_NC'", "'-D ST7701_DEV_CONFIG_COLOR_SPACE=ESP_LCD_COLOR_SPACE_BGR'", "'-D ST7701_DEV_CONFIG_BITS_PER_PIXEL=16'", "'-D ST7701_DEV_CONFIG_FLAGS_RESET_ACTIVE_HIGH=false'", + "'-D ST7701_DEV_CONFIG_VENDOR_CONFIG=NULL'", "'-D BOARD_HAS_TOUCH'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", "'-D TOUCH_GT911_I2C'", "'-D GT911_I2C_HOST=I2C_NUM_0'", "'-D GT911_I2C_CONFIG_SDA_IO_NUM=19'", @@ -91,7 +90,7 @@ "'-D GT911_I2C_CONFIG_SCL_PULLUP_EN=GPIO_PULLUP_DISABLE'", "'-D GT911_I2C_CONFIG_MASTER_CLK_SPEED=400000'", "'-D GT911_I2C_CONFIG_CLK_FLAGS=I2C_SCLK_SRC_FLAG_FOR_NOMAL'", - "'-D GT911_IO_I2C_CONFIG_DEV_ADDR=ESP_LCD_TOUCH_IO_I2C_GT911_ADDRESS'", + "'-D GT911_IO_I2C_CONFIG_DEV_ADDR=GT911_IO_I2C_CONFIG_DEV_ADDRESS_5D'", "'-D GT911_IO_I2C_CONFIG_CONTROL_PHASE_BYTES=1'", "'-D GT911_IO_I2C_CONFIG_DC_BIT_OFFSET=0'", "'-D GT911_IO_I2C_CONFIG_LCD_CMD_BITS=16'", @@ -104,9 +103,9 @@ "'-D GT911_TOUCH_CONFIG_INT_GPIO_NUM=GPIO_NUM_NC'", "'-D GT911_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D GT911_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_SWAP_XY=false'", - "'-D TOUCH_SWAP_X=false'", - "'-D TOUCH_SWAP_Y=false'", + "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_MIRROR_X=false'", + "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_LED'", "'-D LED_GPIO=16'", "'-D BOARD_HAS_RELAY1'", diff --git a/esp32-4848S040CIY3.json b/esp32-4848S040CIY3.json index 5e19d88..78bdac0 100644 --- a/esp32-4848S040CIY3.json +++ b/esp32-4848S040CIY3.json @@ -74,15 +74,14 @@ "'-D ST7701_PANEL_CONFIG_FLAGS_DISP_ACTIVE_LOW=false'", "'-D ST7701_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'", "'-D ST7701_PANEL_CONFIG_FLAGS_FB_IN_PSRAM=true'", - "'-D ST7701_VENDOR_CONFIG_INIT_CMDS=NULL'", - "'-D ST7701_VENDOR_CONFIG_INIT_CMDS_SIZE=0'", - "'-D ST7701_VENDOR_CONFIG_FLAGS_MIRROR_BY_CMD=0'", - "'-D ST7701_VENDOR_CONFIG_FLAGS_AUTO_DEL_PANEL_IO=0'", "'-D ST7701_DEV_CONFIG_RESET_GPIO_NUM=GPIO_NUM_NC'", "'-D ST7701_DEV_CONFIG_COLOR_SPACE=ESP_LCD_COLOR_SPACE_BGR'", "'-D ST7701_DEV_CONFIG_BITS_PER_PIXEL=16'", "'-D ST7701_DEV_CONFIG_FLAGS_RESET_ACTIVE_HIGH=false'", + "'-D ST7701_DEV_CONFIG_VENDOR_CONFIG=NULL'", "'-D BOARD_HAS_TOUCH'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", "'-D TOUCH_GT911_I2C'", "'-D GT911_I2C_HOST=I2C_NUM_0'", "'-D GT911_I2C_CONFIG_SDA_IO_NUM=19'", @@ -91,7 +90,7 @@ "'-D GT911_I2C_CONFIG_SCL_PULLUP_EN=GPIO_PULLUP_DISABLE'", "'-D GT911_I2C_CONFIG_MASTER_CLK_SPEED=400000'", "'-D GT911_I2C_CONFIG_CLK_FLAGS=I2C_SCLK_SRC_FLAG_FOR_NOMAL'", - "'-D GT911_IO_I2C_CONFIG_DEV_ADDR=ESP_LCD_TOUCH_IO_I2C_GT911_ADDRESS'", + "'-D GT911_IO_I2C_CONFIG_DEV_ADDR=GT911_IO_I2C_CONFIG_DEV_ADDRESS_5D'", "'-D GT911_IO_I2C_CONFIG_CONTROL_PHASE_BYTES=1'", "'-D GT911_IO_I2C_CONFIG_DC_BIT_OFFSET=0'", "'-D GT911_IO_I2C_CONFIG_LCD_CMD_BITS=16'", @@ -104,9 +103,9 @@ "'-D GT911_TOUCH_CONFIG_INT_GPIO_NUM=GPIO_NUM_NC'", "'-D GT911_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D GT911_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_SWAP_XY=false'", - "'-D TOUCH_SWAP_X=false'", - "'-D TOUCH_SWAP_Y=false'", + "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_MIRROR_X=false'", + "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_LED'", "'-D LED_GPIO=16'", "'-D BOARD_HAS_RELAY1'", diff --git a/esp32-8048S043C.json b/esp32-8048S043C.json index b55b16c..6df0976 100644 --- a/esp32-8048S043C.json +++ b/esp32-8048S043C.json @@ -63,6 +63,8 @@ "'-D ST7262_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_FB_IN_PSRAM=true'", "'-D BOARD_HAS_TOUCH'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", "'-D TOUCH_GT911_I2C'", "'-D GT911_I2C_HOST=I2C_NUM_0'", "'-D GT911_I2C_CONFIG_SDA_IO_NUM=19'", @@ -71,7 +73,7 @@ "'-D GT911_I2C_CONFIG_SCL_PULLUP_EN=GPIO_PULLUP_DISABLE'", "'-D GT911_I2C_CONFIG_MASTER_CLK_SPEED=400000'", "'-D GT911_I2C_CONFIG_CLK_FLAGS=I2C_SCLK_SRC_FLAG_FOR_NOMAL'", - "'-D GT911_IO_I2C_CONFIG_DEV_ADDR=ESP_LCD_TOUCH_IO_I2C_GT911_ADDRESS'", + "'-D GT911_IO_I2C_CONFIG_DEV_ADDR=GT911_IO_I2C_CONFIG_DEV_ADDRESS_5D'", "'-D GT911_IO_I2C_CONFIG_CONTROL_PHASE_BYTES=1'", "'-D GT911_IO_I2C_CONFIG_DC_BIT_OFFSET=0'", "'-D GT911_IO_I2C_CONFIG_LCD_CMD_BITS=16'", @@ -84,9 +86,9 @@ "'-D GT911_TOUCH_CONFIG_INT_GPIO_NUM=18'", "'-D GT911_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D GT911_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_SWAP_XY=false'", - "'-D TOUCH_SWAP_X=false'", - "'-D TOUCH_SWAP_Y=false'", + "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_MIRROR_X=false'", + "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", "'-D TF_CS=10'", "'-D TF_SPI_MOSI=11'", diff --git a/esp32-8048S043R.json b/esp32-8048S043R.json index e830a4b..28176ae 100644 --- a/esp32-8048S043R.json +++ b/esp32-8048S043R.json @@ -63,7 +63,10 @@ "'-D ST7262_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_FB_IN_PSRAM=true'", "'-D BOARD_HAS_TOUCH'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", "'-D TOUCH_XPT2046_SPI'", + "'-D XPT2046_Z_THRESHOLD=600'", "'-D XPT2046_SPI_HOST=SPI2_HOST'", "'-D XPT2046_SPI_DMA_CHANNEL=SPI_DMA_CH_AUTO'", "'-D XPT2046_SPI_BUS_MOSI_IO_NUM=11'", @@ -88,9 +91,9 @@ "'-D XPT2046_TOUCH_CONFIG_INT_GPIO_NUM=18'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_SWAP_XY=false'", - "'-D TOUCH_SWAP_X=false'", - "'-D TOUCH_SWAP_Y=false'", + "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_MIRROR_X=false'", + "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", "'-D TF_CS=10'", "'-D TF_SPI_MOSI=11'", diff --git a/esp32-8048S050C.json b/esp32-8048S050C.json index 614e0eb..e229c8e 100644 --- a/esp32-8048S050C.json +++ b/esp32-8048S050C.json @@ -26,10 +26,10 @@ "'-D ST7262_PANEL_CONFIG_TIMINGS_V_RES=LCD_HEIGHT'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_PULSE_WIDTH=4'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_BACK_PORCH=8'", - "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_FRONT_PORCH=48'", + "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_FRONT_PORCH=8'", "'-D ST7262_PANEL_CONFIG_TIMINGS_VSYNC_PULSE_WIDTH=4'", "'-D ST7262_PANEL_CONFIG_TIMINGS_VSYNC_BACK_PORCH=8'", - "'-D ST7262_PANEL_CONFIG_TIMINGS_VSYNC_FRONT_PORCH=12'", + "'-D ST7262_PANEL_CONFIG_TIMINGS_VSYNC_FRONT_PORCH=8'", "'-D ST7262_PANEL_CONFIG_TIMINGS_FLAGS_HSYNC_IDLE_LOW=false'", "'-D ST7262_PANEL_CONFIG_TIMINGS_FLAGS_VSYNC_IDLE_LOW=false'", "'-D ST7262_PANEL_CONFIG_TIMINGS_FLAGS_DE_IDLE_HIGH=false'", @@ -42,27 +42,29 @@ "'-D ST7262_PANEL_CONFIG_VSYNC_GPIO_NUM=41'", "'-D ST7262_PANEL_CONFIG_DE_GPIO_NUM=40'", "'-D ST7262_PANEL_CONFIG_PCLK_GPIO_NUM=42'", - "'-D ST7262_PANEL_CONFIG_DATA_GPIO_R0=45'", - "'-D ST7262_PANEL_CONFIG_DATA_GPIO_R1=48'", - "'-D ST7262_PANEL_CONFIG_DATA_GPIO_R2=47'", - "'-D ST7262_PANEL_CONFIG_DATA_GPIO_R3=21'", - "'-D ST7262_PANEL_CONFIG_DATA_GPIO_R4=14'", + "'-D ST7262_PANEL_CONFIG_DATA_GPIO_R0=8'", + "'-D ST7262_PANEL_CONFIG_DATA_GPIO_R1=3'", + "'-D ST7262_PANEL_CONFIG_DATA_GPIO_R2=46'", + "'-D ST7262_PANEL_CONFIG_DATA_GPIO_R3=9'", + "'-D ST7262_PANEL_CONFIG_DATA_GPIO_R4=1'", "'-D ST7262_PANEL_CONFIG_DATA_GPIO_G0=5'", "'-D ST7262_PANEL_CONFIG_DATA_GPIO_G1=6'", "'-D ST7262_PANEL_CONFIG_DATA_GPIO_G2=7'", "'-D ST7262_PANEL_CONFIG_DATA_GPIO_G3=15'", "'-D ST7262_PANEL_CONFIG_DATA_GPIO_G4=16'", "'-D ST7262_PANEL_CONFIG_DATA_GPIO_G5=4'", - "'-D ST7262_PANEL_CONFIG_DATA_GPIO_B0=8'", - "'-D ST7262_PANEL_CONFIG_DATA_GPIO_B1=3'", - "'-D ST7262_PANEL_CONFIG_DATA_GPIO_B2=46'", - "'-D ST7262_PANEL_CONFIG_DATA_GPIO_B3=9'", - "'-D ST7262_PANEL_CONFIG_DATA_GPIO_B4=1'", + "'-D ST7262_PANEL_CONFIG_DATA_GPIO_B0=45'", + "'-D ST7262_PANEL_CONFIG_DATA_GPIO_B1=48'", + "'-D ST7262_PANEL_CONFIG_DATA_GPIO_B2=47'", + "'-D ST7262_PANEL_CONFIG_DATA_GPIO_B3=12'", + "'-D ST7262_PANEL_CONFIG_DATA_GPIO_B4=14'", "'-D ST7262_PANEL_CONFIG_DISP_GPIO_NUM=GPIO_NUM_NC'", "'-D ST7262_PANEL_CONFIG_FLAGS_DISP_ACTIVE_LOW=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_FB_IN_PSRAM=true'", "'-D BOARD_HAS_TOUCH'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", "'-D TOUCH_GT911_I2C'", "'-D GT911_I2C_HOST=I2C_NUM_0'", "'-D GT911_I2C_CONFIG_SDA_IO_NUM=19'", @@ -71,7 +73,7 @@ "'-D GT911_I2C_CONFIG_SCL_PULLUP_EN=GPIO_PULLUP_DISABLE'", "'-D GT911_I2C_CONFIG_MASTER_CLK_SPEED=400000'", "'-D GT911_I2C_CONFIG_CLK_FLAGS=I2C_SCLK_SRC_FLAG_FOR_NOMAL'", - "'-D GT911_IO_I2C_CONFIG_DEV_ADDR=ESP_LCD_TOUCH_IO_I2C_GT911_ADDRESS'", + "'-D GT911_IO_I2C_CONFIG_DEV_ADDR=GT911_IO_I2C_CONFIG_DEV_ADDRESS_5D'", "'-D GT911_IO_I2C_CONFIG_CONTROL_PHASE_BYTES=1'", "'-D GT911_IO_I2C_CONFIG_DC_BIT_OFFSET=0'", "'-D GT911_IO_I2C_CONFIG_LCD_CMD_BITS=16'", @@ -84,9 +86,9 @@ "'-D GT911_TOUCH_CONFIG_INT_GPIO_NUM=18'", "'-D GT911_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D GT911_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_SWAP_XY=false'", - "'-D TOUCH_SWAP_X=false'", - "'-D TOUCH_SWAP_Y=false'", + "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_MIRROR_X=false'", + "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", "'-D TF_CS=10'", "'-D TF_SPI_MOSI=11'", diff --git a/esp32-8048S050N.json b/esp32-8048S050N.json index 2f3f673..31119eb 100644 --- a/esp32-8048S050N.json +++ b/esp32-8048S050N.json @@ -26,10 +26,10 @@ "'-D ST7262_PANEL_CONFIG_TIMINGS_V_RES=LCD_HEIGHT'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_PULSE_WIDTH=4'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_BACK_PORCH=8'", - "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_FRONT_PORCH=48'", + "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_FRONT_PORCH=8'", "'-D ST7262_PANEL_CONFIG_TIMINGS_VSYNC_PULSE_WIDTH=4'", "'-D ST7262_PANEL_CONFIG_TIMINGS_VSYNC_BACK_PORCH=8'", - "'-D ST7262_PANEL_CONFIG_TIMINGS_VSYNC_FRONT_PORCH=12'", + "'-D ST7262_PANEL_CONFIG_TIMINGS_VSYNC_FRONT_PORCH=8'", "'-D ST7262_PANEL_CONFIG_TIMINGS_FLAGS_HSYNC_IDLE_LOW=false'", "'-D ST7262_PANEL_CONFIG_TIMINGS_FLAGS_VSYNC_IDLE_LOW=false'", "'-D ST7262_PANEL_CONFIG_TIMINGS_FLAGS_DE_IDLE_HIGH=false'", @@ -42,22 +42,22 @@ "'-D ST7262_PANEL_CONFIG_VSYNC_GPIO_NUM=41'", "'-D ST7262_PANEL_CONFIG_DE_GPIO_NUM=40'", "'-D ST7262_PANEL_CONFIG_PCLK_GPIO_NUM=42'", - "'-D ST7262_PANEL_CONFIG_DATA_GPIO_R0=45'", - "'-D ST7262_PANEL_CONFIG_DATA_GPIO_R1=48'", - "'-D ST7262_PANEL_CONFIG_DATA_GPIO_R2=47'", - "'-D ST7262_PANEL_CONFIG_DATA_GPIO_R3=21'", - "'-D ST7262_PANEL_CONFIG_DATA_GPIO_R4=14'", + "'-D ST7262_PANEL_CONFIG_DATA_GPIO_R0=8'", + "'-D ST7262_PANEL_CONFIG_DATA_GPIO_R1=3'", + "'-D ST7262_PANEL_CONFIG_DATA_GPIO_R2=46'", + "'-D ST7262_PANEL_CONFIG_DATA_GPIO_R3=9'", + "'-D ST7262_PANEL_CONFIG_DATA_GPIO_R4=1'", "'-D ST7262_PANEL_CONFIG_DATA_GPIO_G0=5'", "'-D ST7262_PANEL_CONFIG_DATA_GPIO_G1=6'", "'-D ST7262_PANEL_CONFIG_DATA_GPIO_G2=7'", "'-D ST7262_PANEL_CONFIG_DATA_GPIO_G3=15'", "'-D ST7262_PANEL_CONFIG_DATA_GPIO_G4=16'", "'-D ST7262_PANEL_CONFIG_DATA_GPIO_G5=4'", - "'-D ST7262_PANEL_CONFIG_DATA_GPIO_B0=8'", - "'-D ST7262_PANEL_CONFIG_DATA_GPIO_B1=3'", - "'-D ST7262_PANEL_CONFIG_DATA_GPIO_B2=46'", - "'-D ST7262_PANEL_CONFIG_DATA_GPIO_B3=9'", - "'-D ST7262_PANEL_CONFIG_DATA_GPIO_B4=1'", + "'-D ST7262_PANEL_CONFIG_DATA_GPIO_B0=45'", + "'-D ST7262_PANEL_CONFIG_DATA_GPIO_B1=48'", + "'-D ST7262_PANEL_CONFIG_DATA_GPIO_B2=47'", + "'-D ST7262_PANEL_CONFIG_DATA_GPIO_B3=12'", + "'-D ST7262_PANEL_CONFIG_DATA_GPIO_B4=14'", "'-D ST7262_PANEL_CONFIG_DISP_GPIO_NUM=GPIO_NUM_NC'", "'-D ST7262_PANEL_CONFIG_FLAGS_DISP_ACTIVE_LOW=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'", diff --git a/esp32-8048S050R.json b/esp32-8048S050R.json index 4bf3b06..ead867d 100644 --- a/esp32-8048S050R.json +++ b/esp32-8048S050R.json @@ -26,10 +26,10 @@ "'-D ST7262_PANEL_CONFIG_TIMINGS_V_RES=LCD_HEIGHT'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_PULSE_WIDTH=4'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_BACK_PORCH=8'", - "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_FRONT_PORCH=48'", + "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_FRONT_PORCH=8'", "'-D ST7262_PANEL_CONFIG_TIMINGS_VSYNC_PULSE_WIDTH=4'", "'-D ST7262_PANEL_CONFIG_TIMINGS_VSYNC_BACK_PORCH=8'", - "'-D ST7262_PANEL_CONFIG_TIMINGS_VSYNC_FRONT_PORCH=12'", + "'-D ST7262_PANEL_CONFIG_TIMINGS_VSYNC_FRONT_PORCH=8'", "'-D ST7262_PANEL_CONFIG_TIMINGS_FLAGS_HSYNC_IDLE_LOW=false'", "'-D ST7262_PANEL_CONFIG_TIMINGS_FLAGS_VSYNC_IDLE_LOW=false'", "'-D ST7262_PANEL_CONFIG_TIMINGS_FLAGS_DE_IDLE_HIGH=false'", @@ -42,30 +42,33 @@ "'-D ST7262_PANEL_CONFIG_VSYNC_GPIO_NUM=41'", "'-D ST7262_PANEL_CONFIG_DE_GPIO_NUM=40'", "'-D ST7262_PANEL_CONFIG_PCLK_GPIO_NUM=42'", - "'-D ST7262_PANEL_CONFIG_DATA_GPIO_R0=45'", - "'-D ST7262_PANEL_CONFIG_DATA_GPIO_R1=48'", - "'-D ST7262_PANEL_CONFIG_DATA_GPIO_R2=47'", - "'-D ST7262_PANEL_CONFIG_DATA_GPIO_R3=21'", - "'-D ST7262_PANEL_CONFIG_DATA_GPIO_R4=14'", + "'-D ST7262_PANEL_CONFIG_DATA_GPIO_R0=8'", + "'-D ST7262_PANEL_CONFIG_DATA_GPIO_R1=3'", + "'-D ST7262_PANEL_CONFIG_DATA_GPIO_R2=46'", + "'-D ST7262_PANEL_CONFIG_DATA_GPIO_R3=9'", + "'-D ST7262_PANEL_CONFIG_DATA_GPIO_R4=1'", "'-D ST7262_PANEL_CONFIG_DATA_GPIO_G0=5'", "'-D ST7262_PANEL_CONFIG_DATA_GPIO_G1=6'", "'-D ST7262_PANEL_CONFIG_DATA_GPIO_G2=7'", "'-D ST7262_PANEL_CONFIG_DATA_GPIO_G3=15'", "'-D ST7262_PANEL_CONFIG_DATA_GPIO_G4=16'", "'-D ST7262_PANEL_CONFIG_DATA_GPIO_G5=4'", - "'-D ST7262_PANEL_CONFIG_DATA_GPIO_B0=8'", - "'-D ST7262_PANEL_CONFIG_DATA_GPIO_B1=3'", - "'-D ST7262_PANEL_CONFIG_DATA_GPIO_B2=46'", - "'-D ST7262_PANEL_CONFIG_DATA_GPIO_B3=9'", - "'-D ST7262_PANEL_CONFIG_DATA_GPIO_B4=1'", + "'-D ST7262_PANEL_CONFIG_DATA_GPIO_B0=45'", + "'-D ST7262_PANEL_CONFIG_DATA_GPIO_B1=48'", + "'-D ST7262_PANEL_CONFIG_DATA_GPIO_B2=47'", + "'-D ST7262_PANEL_CONFIG_DATA_GPIO_B3=12'", + "'-D ST7262_PANEL_CONFIG_DATA_GPIO_B4=14'", "'-D ST7262_PANEL_CONFIG_DISP_GPIO_NUM=GPIO_NUM_NC'", "'-D ST7262_PANEL_CONFIG_FLAGS_DISP_ACTIVE_LOW=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_FB_IN_PSRAM=true'", "'-D BOARD_HAS_TOUCH'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", "'-D TOUCH_XPT2046_SPI'", + "'-D XPT2046_Z_THRESHOLD=600'", "'-D XPT2046_SPI_HOST=SPI2_HOST'", - "'-D XPT2046_SPI_DMA_CHANNEL=SPI_DMA_CH_AUTO'", + "'-D XPT2046_SPI_DMA_CHANNEL=SPI_DMA_CH_AUTO'", "'-D XPT2046_SPI_BUS_MOSI_IO_NUM=11'", "'-D XPT2046_SPI_BUS_MISO_IO_NUM=13'", "'-D XPT2046_SPI_BUS_SCLK_IO_NUM=12'", @@ -88,9 +91,9 @@ "'-D XPT2046_TOUCH_CONFIG_INT_GPIO_NUM=18'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_SWAP_XY=false'", - "'-D TOUCH_SWAP_X=false'", - "'-D TOUCH_SWAP_Y=false'", + "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_MIRROR_X=false'", + "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", "'-D TF_CS=10'", "'-D TF_SPI_MOSI=11'", diff --git a/esp32-8048S070C.json b/esp32-8048S070C.json index 1dea88b..da7e3e5 100644 --- a/esp32-8048S070C.json +++ b/esp32-8048S070C.json @@ -63,6 +63,8 @@ "'-D ST7262_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_FB_IN_PSRAM=true'", "'-D BOARD_HAS_TOUCH'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", "'-D TOUCH_GT911_I2C'", "'-D GT911_I2C_HOST=I2C_NUM_0'", "'-D GT911_I2C_CONFIG_SDA_IO_NUM=19'", @@ -71,6 +73,7 @@ "'-D GT911_I2C_CONFIG_SCL_PULLUP_EN=GPIO_PULLUP_DISABLE'", "'-D GT911_I2C_CONFIG_MASTER_CLK_SPEED=400000'", "'-D GT911_I2C_CONFIG_CLK_FLAGS=I2C_SCLK_SRC_FLAG_FOR_NOMAL'", + "'-D GT911_IO_I2C_CONFIG_DEV_ADDR=GT911_IO_I2C_CONFIG_DEV_ADDRESS_5D'", "'-D GT911_IO_I2C_CONFIG_DEV_ADDR=ESP_LCD_TOUCH_IO_I2C_GT911_ADDRESS'", "'-D GT911_IO_I2C_CONFIG_CONTROL_PHASE_BYTES=1'", "'-D GT911_IO_I2C_CONFIG_DC_BIT_OFFSET=0'", @@ -84,9 +87,9 @@ "'-D GT911_TOUCH_CONFIG_INT_GPIO_NUM=18'", "'-D GT911_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D GT911_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_SWAP_XY=false'", - "'-D TOUCH_SWAP_X=false'", - "'-D TOUCH_SWAP_Y=false'", + "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_MIRROR_X=false'", + "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", "'-D TF_CS=10'", "'-D TF_SPI_MOSI=11'", diff --git a/esp32-8048S070R.json b/esp32-8048S070R.json index 8c443f0..9224b24 100644 --- a/esp32-8048S070R.json +++ b/esp32-8048S070R.json @@ -63,7 +63,10 @@ "'-D ST7262_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_FB_IN_PSRAM=true'", "'-D BOARD_HAS_TOUCH'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", + "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", "'-D TOUCH_XPT2046_SPI'", + "'-D XPT2046_Z_THRESHOLD=600'", "'-D XPT2046_SPI_HOST=SPI2_HOST'", "'-D XPT2046_SPI_DMA_CHANNEL=SPI_DMA_CH_AUTO'", "'-D XPT2046_SPI_BUS_MOSI_IO_NUM=11'", @@ -88,9 +91,9 @@ "'-D XPT2046_TOUCH_CONFIG_INT_GPIO_NUM=18'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_SWAP_XY=false'", - "'-D TOUCH_SWAP_X=false'", - "'-D TOUCH_SWAP_Y=false'", + "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_MIRROR_X=false'", + "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", "'-D TF_CS=10'", "'-D TF_SPI_MOSI=11'",