From 7d63797dfa92a5d1b29bc8c491a62643b1d8cd4c Mon Sep 17 00:00:00 2001 From: Y1hsiaochunnn Date: Mon, 30 Mar 2026 15:05:20 +0800 Subject: [PATCH 1/3] fix: GT911 config errors --- main/boards/m5stack-tab5/m5stack_tab5.cc | 10 +++++++++- main/boards/waveshare/esp32-p4-nano/esp32-p4-nano.cc | 10 +++++++++- .../esp32-p4-wifi6-touch-lcd.cc | 12 ++++++++++-- .../esp32_s3_touch_lcd_4.3c.cc | 10 +++++++++- .../esp32-s3-touch-lcd-4b/esp32-s3-touch-lcd-4b.cc | 10 +++++++++- .../wireless-tag-wtp4c5mp07s.cc | 10 +++++++++- 6 files changed, 55 insertions(+), 7 deletions(-) diff --git a/main/boards/m5stack-tab5/m5stack_tab5.cc b/main/boards/m5stack-tab5/m5stack_tab5.cc index 843824e..356b349 100644 --- a/main/boards/m5stack-tab5/m5stack_tab5.cc +++ b/main/boards/m5stack-tab5/m5stack_tab5.cc @@ -178,7 +178,15 @@ private: }, }; esp_lcd_panel_io_handle_t tp_io_handle = NULL; - esp_lcd_panel_io_i2c_config_t tp_io_config = ESP_LCD_TOUCH_IO_I2C_GT911_CONFIG(); + esp_lcd_panel_io_i2c_config_t tp_io_config = { + .control_phase_bytes = 1, + .dc_bit_offset = 0, + .lcd_cmd_bits = 16, + .flags = + { + .disable_control_phase = 1, + } + }; tp_io_config.dev_addr = ESP_LCD_TOUCH_IO_I2C_GT911_ADDRESS_BACKUP; // 更改 GT911 地址 tp_io_config.scl_speed_hz = 100000; esp_lcd_new_panel_io_i2c(i2c_bus_, &tp_io_config, &tp_io_handle); diff --git a/main/boards/waveshare/esp32-p4-nano/esp32-p4-nano.cc b/main/boards/waveshare/esp32-p4-nano/esp32-p4-nano.cc index 9744939..143a602 100644 --- a/main/boards/waveshare/esp32-p4-nano/esp32-p4-nano.cc +++ b/main/boards/waveshare/esp32-p4-nano/esp32-p4-nano.cc @@ -200,7 +200,15 @@ private: }, }; esp_lcd_panel_io_handle_t tp_io_handle = NULL; - esp_lcd_panel_io_i2c_config_t tp_io_config = ESP_LCD_TOUCH_IO_I2C_GT911_CONFIG(); + esp_lcd_panel_io_i2c_config_t tp_io_config = { + .control_phase_bytes = 1, + .dc_bit_offset = 0, + .lcd_cmd_bits = 16, + .flags = + { + .disable_control_phase = 1, + } + }; tp_io_config.scl_speed_hz = 100 * 1000; ESP_ERROR_CHECK(esp_lcd_new_panel_io_i2c(codec_i2c_bus_, &tp_io_config, &tp_io_handle)); ESP_LOGI(TAG, "Initialize touch controller"); diff --git a/main/boards/waveshare/esp32-p4-wifi6-touch-lcd/esp32-p4-wifi6-touch-lcd.cc b/main/boards/waveshare/esp32-p4-wifi6-touch-lcd/esp32-p4-wifi6-touch-lcd.cc index 556fefa..caeaa7f 100644 --- a/main/boards/waveshare/esp32-p4-wifi6-touch-lcd/esp32-p4-wifi6-touch-lcd.cc +++ b/main/boards/waveshare/esp32-p4-wifi6-touch-lcd/esp32-p4-wifi6-touch-lcd.cc @@ -349,8 +349,16 @@ private: }, }; esp_lcd_panel_io_handle_t tp_io_handle = NULL; - esp_lcd_panel_io_i2c_config_t tp_io_config = ESP_LCD_TOUCH_IO_I2C_GT911_CONFIG(); - if (ESP_OK == i2c_device_probe(ESP_LCD_TOUCH_IO_I2C_GT911_ADDRESS)) { + esp_lcd_panel_io_i2c_config_t tp_io_config = { + .control_phase_bytes = 1, + .dc_bit_offset = 0, + .lcd_cmd_bits = 16, + .flags = + { + .disable_control_phase = 1, + } + }; + if (ESP_OK == i2c_device_probe(ESP_LCD_TOUCH_IO_I2C_GT911_ADDRESS)) { ESP_LOGI(TAG, "Touch panel found at address 0x%02X", ESP_LCD_TOUCH_IO_I2C_GT911_ADDRESS); } else if (ESP_OK == i2c_device_probe(ESP_LCD_TOUCH_IO_I2C_GT911_ADDRESS_BACKUP)) { ESP_LOGI(TAG, "Touch panel found at address 0x%02X", ESP_LCD_TOUCH_IO_I2C_GT911_ADDRESS_BACKUP); diff --git a/main/boards/waveshare/esp32-s3-touch-lcd-4.3c/esp32_s3_touch_lcd_4.3c.cc b/main/boards/waveshare/esp32-s3-touch-lcd-4.3c/esp32_s3_touch_lcd_4.3c.cc index c265cb1..807bce4 100755 --- a/main/boards/waveshare/esp32-s3-touch-lcd-4.3c/esp32_s3_touch_lcd_4.3c.cc +++ b/main/boards/waveshare/esp32-s3-touch-lcd-4.3c/esp32_s3_touch_lcd_4.3c.cc @@ -168,7 +168,15 @@ private: }, }; esp_lcd_panel_io_handle_t tp_io_handle = NULL; - esp_lcd_panel_io_i2c_config_t tp_io_config = ESP_LCD_TOUCH_IO_I2C_GT911_CONFIG(); + esp_lcd_panel_io_i2c_config_t tp_io_config = { + .control_phase_bytes = 1, + .dc_bit_offset = 0, + .lcd_cmd_bits = 16, + .flags = + { + .disable_control_phase = 1, + } + }; tp_io_config.scl_speed_hz = 400 * 1000; esp_lcd_new_panel_io_i2c(i2c_bus_, &tp_io_config, &tp_io_handle); diff --git a/main/boards/waveshare/esp32-s3-touch-lcd-4b/esp32-s3-touch-lcd-4b.cc b/main/boards/waveshare/esp32-s3-touch-lcd-4b/esp32-s3-touch-lcd-4b.cc index 5b65e79..6f7dd17 100644 --- a/main/boards/waveshare/esp32-s3-touch-lcd-4b/esp32-s3-touch-lcd-4b.cc +++ b/main/boards/waveshare/esp32-s3-touch-lcd-4b/esp32-s3-touch-lcd-4b.cc @@ -276,7 +276,15 @@ private: }, }; esp_lcd_panel_io_handle_t tp_io_handle = NULL; - esp_lcd_panel_io_i2c_config_t tp_io_config = ESP_LCD_TOUCH_IO_I2C_GT911_CONFIG(); + esp_lcd_panel_io_i2c_config_t tp_io_config = { + .control_phase_bytes = 1, + .dc_bit_offset = 0, + .lcd_cmd_bits = 16, + .flags = + { + .disable_control_phase = 1, + } + }; tp_io_config.scl_speed_hz = 400* 1000; ESP_ERROR_CHECK(esp_lcd_new_panel_io_i2c(i2c_bus_, &tp_io_config, &tp_io_handle)); ESP_LOGI(TAG, "Initialize touch controller"); diff --git a/main/boards/wireless-tag-wtp4c5mp07s/wireless-tag-wtp4c5mp07s.cc b/main/boards/wireless-tag-wtp4c5mp07s/wireless-tag-wtp4c5mp07s.cc index 2cef78b..3c2a95a 100644 --- a/main/boards/wireless-tag-wtp4c5mp07s/wireless-tag-wtp4c5mp07s.cc +++ b/main/boards/wireless-tag-wtp4c5mp07s/wireless-tag-wtp4c5mp07s.cc @@ -152,7 +152,15 @@ private: }, }; esp_lcd_panel_io_handle_t tp_io_handle = NULL; - esp_lcd_panel_io_i2c_config_t tp_io_config = ESP_LCD_TOUCH_IO_I2C_GT911_CONFIG(); + esp_lcd_panel_io_i2c_config_t tp_io_config = { + .control_phase_bytes = 1, + .dc_bit_offset = 0, + .lcd_cmd_bits = 16, + .flags = + { + .disable_control_phase = 1, + } + }; tp_io_config.scl_speed_hz = 400 * 1000; ESP_ERROR_CHECK(esp_lcd_new_panel_io_i2c(i2c_bus_, &tp_io_config, &tp_io_handle)); ESP_LOGI(TAG, "Initialize touch controller"); From a877d95f74bfcddcbd72d5267216fd80e102455a Mon Sep 17 00:00:00 2001 From: Y1hsiaochunnn Date: Mon, 30 Mar 2026 15:12:22 +0800 Subject: [PATCH 2/3] fix: touch_config errors --- .../esp-s3-lcd-ev-board-2.cc | 11 ++++++++++- .../esp32-c6-touch-lcd-1.83.cc | 15 ++++++++++++++- .../esp32-s3-touch-lcd-1.54.cc | 15 ++++++++++++++- .../esp32-s3-touch-lcd-1.83.cc | 15 ++++++++++++++- 4 files changed, 52 insertions(+), 4 deletions(-) diff --git a/main/boards/esp-s3-lcd-ev-board-2/esp-s3-lcd-ev-board-2.cc b/main/boards/esp-s3-lcd-ev-board-2/esp-s3-lcd-ev-board-2.cc index 9cf9545..cf8f615 100644 --- a/main/boards/esp-s3-lcd-ev-board-2/esp-s3-lcd-ev-board-2.cc +++ b/main/boards/esp-s3-lcd-ev-board-2/esp-s3-lcd-ev-board-2.cc @@ -186,7 +186,16 @@ private: }, }; esp_lcd_panel_io_handle_t tp_io_handle = NULL; - esp_lcd_panel_io_i2c_config_t tp_io_config = ESP_LCD_TOUCH_IO_I2C_GT1151_CONFIG(); + esp_lcd_panel_io_i2c_config_t tp_io_config = { + .dev_addr = ESP_LCD_TOUCH_IO_I2C_GT1151_ADDRESS, + .control_phase_bytes = 1, + .dc_bit_offset = 0, + .lcd_cmd_bits = 16, + .flags = + { + .disable_control_phase = 1, + } + } tp_io_config.scl_speed_hz = 400 * 1000; ESP_ERROR_CHECK(esp_lcd_new_panel_io_i2c(i2c_bus_, &tp_io_config, &tp_io_handle)); ESP_ERROR_CHECK(esp_lcd_touch_new_i2c_gt1151(tp_io_handle, &tp_cfg, &tp)); diff --git a/main/boards/waveshare/esp32-c6-touch-lcd-1.83/esp32-c6-touch-lcd-1.83.cc b/main/boards/waveshare/esp32-c6-touch-lcd-1.83/esp32-c6-touch-lcd-1.83.cc index dee60dd..014a073 100644 --- a/main/boards/waveshare/esp32-c6-touch-lcd-1.83/esp32-c6-touch-lcd-1.83.cc +++ b/main/boards/waveshare/esp32-c6-touch-lcd-1.83/esp32-c6-touch-lcd-1.83.cc @@ -171,7 +171,20 @@ private: }, }; esp_lcd_panel_io_handle_t tp_io_handle = NULL; - esp_lcd_panel_io_i2c_config_t tp_io_config = ESP_LCD_TOUCH_IO_I2C_CST816S_CONFIG(); + esp_lcd_panel_io_i2c_config_t tp_io_config = { + .dev_addr = ESP_LCD_TOUCH_IO_I2C_CST816S_ADDRESS, + .on_color_trans_done = 0, + .user_ctx = 0, + .control_phase_bytes = 1, + .dc_bit_offset = 0, + .lcd_cmd_bits = 8, + .lcd_param_bits = 0, + .flags = + { + .dc_low_on_data = 0, + .disable_control_phase = 1, + }, + } tp_io_config.scl_speed_hz = 400* 1000; ESP_ERROR_CHECK(esp_lcd_new_panel_io_i2c(i2c_bus_, &tp_io_config, &tp_io_handle)); ESP_LOGI(TAG, "Initialize touch controller"); diff --git a/main/boards/waveshare/esp32-s3-touch-lcd-1.54/esp32-s3-touch-lcd-1.54.cc b/main/boards/waveshare/esp32-s3-touch-lcd-1.54/esp32-s3-touch-lcd-1.54.cc index 10e384a..59a73ec 100644 --- a/main/boards/waveshare/esp32-s3-touch-lcd-1.54/esp32-s3-touch-lcd-1.54.cc +++ b/main/boards/waveshare/esp32-s3-touch-lcd-1.54/esp32-s3-touch-lcd-1.54.cc @@ -122,7 +122,20 @@ private: esp_lcd_panel_io_handle_t tp_io_handle = NULL; - esp_lcd_panel_io_i2c_config_t tp_io_config = ESP_LCD_TOUCH_IO_I2C_CST816S_CONFIG(); + esp_lcd_panel_io_i2c_config_t tp_io_config = { + .dev_addr = ESP_LCD_TOUCH_IO_I2C_CST816S_ADDRESS, + .on_color_trans_done = 0, + .user_ctx = 0, + .control_phase_bytes = 1, + .dc_bit_offset = 0, + .lcd_cmd_bits = 8, + .lcd_param_bits = 0, + .flags = + { + .dc_low_on_data = 0, + .disable_control_phase = 1, + }, + } ESP_ERROR_CHECK(esp_lcd_new_panel_io_i2c(i2c_bus_, &tp_io_config, &tp_io_handle)); esp_lcd_touch_config_t tp_cfg = { diff --git a/main/boards/waveshare/esp32-s3-touch-lcd-1.83/esp32-s3-touch-lcd-1.83.cc b/main/boards/waveshare/esp32-s3-touch-lcd-1.83/esp32-s3-touch-lcd-1.83.cc index dd466cd..3804502 100644 --- a/main/boards/waveshare/esp32-s3-touch-lcd-1.83/esp32-s3-touch-lcd-1.83.cc +++ b/main/boards/waveshare/esp32-s3-touch-lcd-1.83/esp32-s3-touch-lcd-1.83.cc @@ -172,7 +172,20 @@ private: }, }; esp_lcd_panel_io_handle_t tp_io_handle = NULL; - esp_lcd_panel_io_i2c_config_t tp_io_config = ESP_LCD_TOUCH_IO_I2C_CST816S_CONFIG(); + esp_lcd_panel_io_i2c_config_t tp_io_config = { + .dev_addr = ESP_LCD_TOUCH_IO_I2C_CST816S_ADDRESS, + .on_color_trans_done = 0, + .user_ctx = 0, + .control_phase_bytes = 1, + .dc_bit_offset = 0, + .lcd_cmd_bits = 8, + .lcd_param_bits = 0, + .flags = + { + .dc_low_on_data = 0, + .disable_control_phase = 1, + }, + } tp_io_config.scl_speed_hz = 400* 1000; ESP_ERROR_CHECK(esp_lcd_new_panel_io_i2c(i2c_bus_, &tp_io_config, &tp_io_handle)); ESP_LOGI(TAG, "Initialize touch controller"); From addf5fcc645997a78e6fb3b2ddff6b1b98b0d3f4 Mon Sep 17 00:00:00 2001 From: Y1hsiaochunnn Date: Mon, 30 Mar 2026 15:29:31 +0800 Subject: [PATCH 3/3] fix: touch configuration security risk fixed --- .../esp-s3-lcd-ev-board-2/esp-s3-lcd-ev-board-2.cc | 2 +- main/boards/lichuang-dev/lichuang_dev_board.cc | 11 ++++++++++- .../esp32-c6-touch-amoled-1.8.cc | 11 ++++++++++- .../esp32-c6-touch-lcd-1.83.cc | 2 +- .../esp32-s3-touch-amoled-1.8.cc | 11 ++++++++++- .../esp32-s3-touch-amoled-2.06.cc | 11 ++++++++++- .../esp32-s3-touch-lcd-1.54.cc | 2 +- .../esp32-s3-touch-lcd-1.83.cc | 2 +- .../esp32-s3-touch-lcd-3.5/esp32-s3-touch-lcd-3.5.cc | 11 ++++++++++- .../esp32-touch-lcd-3.5/esp32-touch-lcd-3.5.cc | 11 ++++++++++- main/idf_component.yml | 4 ++-- 11 files changed, 66 insertions(+), 12 deletions(-) diff --git a/main/boards/esp-s3-lcd-ev-board-2/esp-s3-lcd-ev-board-2.cc b/main/boards/esp-s3-lcd-ev-board-2/esp-s3-lcd-ev-board-2.cc index cf8f615..4bd5cb2 100644 --- a/main/boards/esp-s3-lcd-ev-board-2/esp-s3-lcd-ev-board-2.cc +++ b/main/boards/esp-s3-lcd-ev-board-2/esp-s3-lcd-ev-board-2.cc @@ -195,7 +195,7 @@ private: { .disable_control_phase = 1, } - } + }; tp_io_config.scl_speed_hz = 400 * 1000; ESP_ERROR_CHECK(esp_lcd_new_panel_io_i2c(i2c_bus_, &tp_io_config, &tp_io_handle)); ESP_ERROR_CHECK(esp_lcd_touch_new_i2c_gt1151(tp_io_handle, &tp_cfg, &tp)); diff --git a/main/boards/lichuang-dev/lichuang_dev_board.cc b/main/boards/lichuang-dev/lichuang_dev_board.cc index 8b136f4..f3cf78a 100644 --- a/main/boards/lichuang-dev/lichuang_dev_board.cc +++ b/main/boards/lichuang-dev/lichuang_dev_board.cc @@ -184,7 +184,16 @@ private: }, }; esp_lcd_panel_io_handle_t tp_io_handle = NULL; - esp_lcd_panel_io_i2c_config_t tp_io_config = ESP_LCD_TOUCH_IO_I2C_FT5x06_CONFIG(); + esp_lcd_panel_io_i2c_config_t tp_io_config = { + .dev_addr = ESP_LCD_TOUCH_IO_I2C_FT5x06_ADDRESS, + .control_phase_bytes = 1, + .dc_bit_offset = 0, + .lcd_cmd_bits = 8, + .flags = + { + .disable_control_phase = 1, + } + }; tp_io_config.scl_speed_hz = 400000; esp_lcd_new_panel_io_i2c(i2c_bus_, &tp_io_config, &tp_io_handle); diff --git a/main/boards/waveshare/esp32-c6-touch-amoled-1.8/esp32-c6-touch-amoled-1.8.cc b/main/boards/waveshare/esp32-c6-touch-amoled-1.8/esp32-c6-touch-amoled-1.8.cc index 5f56386..4c79cd2 100644 --- a/main/boards/waveshare/esp32-c6-touch-amoled-1.8/esp32-c6-touch-amoled-1.8.cc +++ b/main/boards/waveshare/esp32-c6-touch-amoled-1.8/esp32-c6-touch-amoled-1.8.cc @@ -265,7 +265,16 @@ private: }, }; esp_lcd_panel_io_handle_t tp_io_handle = NULL; - esp_lcd_panel_io_i2c_config_t tp_io_config = ESP_LCD_TOUCH_IO_I2C_FT5x06_CONFIG(); + esp_lcd_panel_io_i2c_config_t tp_io_config = { + .dev_addr = ESP_LCD_TOUCH_IO_I2C_FT5x06_ADDRESS, + .control_phase_bytes = 1, + .dc_bit_offset = 0, + .lcd_cmd_bits = 8, + .flags = + { + .disable_control_phase = 1, + } + }; tp_io_config.scl_speed_hz = 400 * 1000; ESP_ERROR_CHECK(esp_lcd_new_panel_io_i2c(codec_i2c_bus_, &tp_io_config, &tp_io_handle)); ESP_LOGI(TAG, "Initialize touch controller"); diff --git a/main/boards/waveshare/esp32-c6-touch-lcd-1.83/esp32-c6-touch-lcd-1.83.cc b/main/boards/waveshare/esp32-c6-touch-lcd-1.83/esp32-c6-touch-lcd-1.83.cc index 014a073..4e7a8a4 100644 --- a/main/boards/waveshare/esp32-c6-touch-lcd-1.83/esp32-c6-touch-lcd-1.83.cc +++ b/main/boards/waveshare/esp32-c6-touch-lcd-1.83/esp32-c6-touch-lcd-1.83.cc @@ -184,7 +184,7 @@ private: .dc_low_on_data = 0, .disable_control_phase = 1, }, - } + }; tp_io_config.scl_speed_hz = 400* 1000; ESP_ERROR_CHECK(esp_lcd_new_panel_io_i2c(i2c_bus_, &tp_io_config, &tp_io_handle)); ESP_LOGI(TAG, "Initialize touch controller"); diff --git a/main/boards/waveshare/esp32-s3-touch-amoled-1.8/esp32-s3-touch-amoled-1.8.cc b/main/boards/waveshare/esp32-s3-touch-amoled-1.8/esp32-s3-touch-amoled-1.8.cc index 5767ac5..90317f0 100644 --- a/main/boards/waveshare/esp32-s3-touch-amoled-1.8/esp32-s3-touch-amoled-1.8.cc +++ b/main/boards/waveshare/esp32-s3-touch-amoled-1.8/esp32-s3-touch-amoled-1.8.cc @@ -265,7 +265,16 @@ private: }, }; esp_lcd_panel_io_handle_t tp_io_handle = NULL; - esp_lcd_panel_io_i2c_config_t tp_io_config = ESP_LCD_TOUCH_IO_I2C_FT5x06_CONFIG(); + esp_lcd_panel_io_i2c_config_t tp_io_config = { + .dev_addr = ESP_LCD_TOUCH_IO_I2C_FT5x06_ADDRESS, + .control_phase_bytes = 1, + .dc_bit_offset = 0, + .lcd_cmd_bits = 8, + .flags = + { + .disable_control_phase = 1, + } + }; tp_io_config.scl_speed_hz = 400 * 1000; ESP_ERROR_CHECK(esp_lcd_new_panel_io_i2c(codec_i2c_bus_, &tp_io_config, &tp_io_handle)); ESP_LOGI(TAG, "Initialize touch controller"); diff --git a/main/boards/waveshare/esp32-s3-touch-amoled-2.06/esp32-s3-touch-amoled-2.06.cc b/main/boards/waveshare/esp32-s3-touch-amoled-2.06/esp32-s3-touch-amoled-2.06.cc index 1d48756..8dafd1d 100644 --- a/main/boards/waveshare/esp32-s3-touch-amoled-2.06/esp32-s3-touch-amoled-2.06.cc +++ b/main/boards/waveshare/esp32-s3-touch-amoled-2.06/esp32-s3-touch-amoled-2.06.cc @@ -267,7 +267,16 @@ private: }, }; esp_lcd_panel_io_handle_t tp_io_handle = NULL; - esp_lcd_panel_io_i2c_config_t tp_io_config = ESP_LCD_TOUCH_IO_I2C_FT5x06_CONFIG(); + esp_lcd_panel_io_i2c_config_t tp_io_config = { + .dev_addr = ESP_LCD_TOUCH_IO_I2C_FT5x06_ADDRESS, + .control_phase_bytes = 1, + .dc_bit_offset = 0, + .lcd_cmd_bits = 8, + .flags = + { + .disable_control_phase = 1, + } + }; tp_io_config.scl_speed_hz = 400* 1000; ESP_ERROR_CHECK(esp_lcd_new_panel_io_i2c(i2c_bus_, &tp_io_config, &tp_io_handle)); ESP_LOGI(TAG, "Initialize touch controller"); diff --git a/main/boards/waveshare/esp32-s3-touch-lcd-1.54/esp32-s3-touch-lcd-1.54.cc b/main/boards/waveshare/esp32-s3-touch-lcd-1.54/esp32-s3-touch-lcd-1.54.cc index 59a73ec..bbb1876 100644 --- a/main/boards/waveshare/esp32-s3-touch-lcd-1.54/esp32-s3-touch-lcd-1.54.cc +++ b/main/boards/waveshare/esp32-s3-touch-lcd-1.54/esp32-s3-touch-lcd-1.54.cc @@ -135,7 +135,7 @@ private: .dc_low_on_data = 0, .disable_control_phase = 1, }, - } + }; ESP_ERROR_CHECK(esp_lcd_new_panel_io_i2c(i2c_bus_, &tp_io_config, &tp_io_handle)); esp_lcd_touch_config_t tp_cfg = { diff --git a/main/boards/waveshare/esp32-s3-touch-lcd-1.83/esp32-s3-touch-lcd-1.83.cc b/main/boards/waveshare/esp32-s3-touch-lcd-1.83/esp32-s3-touch-lcd-1.83.cc index 3804502..f0d4b2e 100644 --- a/main/boards/waveshare/esp32-s3-touch-lcd-1.83/esp32-s3-touch-lcd-1.83.cc +++ b/main/boards/waveshare/esp32-s3-touch-lcd-1.83/esp32-s3-touch-lcd-1.83.cc @@ -185,7 +185,7 @@ private: .dc_low_on_data = 0, .disable_control_phase = 1, }, - } + }; tp_io_config.scl_speed_hz = 400* 1000; ESP_ERROR_CHECK(esp_lcd_new_panel_io_i2c(i2c_bus_, &tp_io_config, &tp_io_handle)); ESP_LOGI(TAG, "Initialize touch controller"); diff --git a/main/boards/waveshare/esp32-s3-touch-lcd-3.5/esp32-s3-touch-lcd-3.5.cc b/main/boards/waveshare/esp32-s3-touch-lcd-3.5/esp32-s3-touch-lcd-3.5.cc index 1cab3cd..7caf2b4 100644 --- a/main/boards/waveshare/esp32-s3-touch-lcd-3.5/esp32-s3-touch-lcd-3.5.cc +++ b/main/boards/waveshare/esp32-s3-touch-lcd-3.5/esp32-s3-touch-lcd-3.5.cc @@ -232,7 +232,16 @@ private: }, }; esp_lcd_panel_io_handle_t tp_io_handle = NULL; - esp_lcd_panel_io_i2c_config_t tp_io_config = ESP_LCD_TOUCH_IO_I2C_FT5x06_CONFIG(); + esp_lcd_panel_io_i2c_config_t tp_io_config = { + .dev_addr = ESP_LCD_TOUCH_IO_I2C_FT5x06_ADDRESS, + .control_phase_bytes = 1, + .dc_bit_offset = 0, + .lcd_cmd_bits = 8, + .flags = + { + .disable_control_phase = 1, + } + }; tp_io_config.scl_speed_hz = 400 * 1000; ESP_ERROR_CHECK(esp_lcd_new_panel_io_i2c(i2c_bus_, &tp_io_config, &tp_io_handle)); ESP_LOGI(TAG, "Initialize touch controller"); diff --git a/main/boards/waveshare/esp32-touch-lcd-3.5/esp32-touch-lcd-3.5.cc b/main/boards/waveshare/esp32-touch-lcd-3.5/esp32-touch-lcd-3.5.cc index 0154bd1..aa87995 100644 --- a/main/boards/waveshare/esp32-touch-lcd-3.5/esp32-touch-lcd-3.5.cc +++ b/main/boards/waveshare/esp32-touch-lcd-3.5/esp32-touch-lcd-3.5.cc @@ -190,7 +190,16 @@ private: }, }; esp_lcd_panel_io_handle_t tp_io_handle = NULL; - esp_lcd_panel_io_i2c_config_t tp_io_config = ESP_LCD_TOUCH_IO_I2C_FT5x06_CONFIG(); + esp_lcd_panel_io_i2c_config_t tp_io_config = { + .dev_addr = ESP_LCD_TOUCH_IO_I2C_FT5x06_ADDRESS, + .control_phase_bytes = 1, + .dc_bit_offset = 0, + .lcd_cmd_bits = 8, + .flags = + { + .disable_control_phase = 1, + } + }; tp_io_config.scl_speed_hz = 400 * 1000; ESP_ERROR_CHECK(esp_lcd_new_panel_io_i2c(i2c_bus_, &tp_io_config, &tp_io_handle)); ESP_LOGI(TAG, "Initialize touch controller"); diff --git a/main/idf_component.yml b/main/idf_component.yml index 68ad74f..b30f209 100644 --- a/main/idf_component.yml +++ b/main/idf_component.yml @@ -47,11 +47,11 @@ dependencies: version: ^1.0.1 rules: - if: target not in [esp32] - espressif/esp_lcd_touch_ft5x06: ~1.0.7 + espressif/esp_lcd_touch_ft5x06: ~1 espressif/esp_lcd_touch_gt911: ^1 espressif/esp_lcd_touch_gt1151: ^1 waveshare/esp_lcd_touch_cst9217: ^1.0.3 - espressif/esp_lcd_touch_cst816s: ^1.0.6 + espressif/esp_lcd_touch_cst816s: ^1 lvgl/lvgl: ~9.5.0 esp_lvgl_port: ~2.7.2 espressif/esp_io_expander_tca95xx_16bit: ^2.0.0