verachen/xiaozhi-esp32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: touch configuration security risk fixed

Browse Source
This commit is contained in:
Y1hsiaochunnn
2026-03-30 15:29:31 +08:00
parent a877d95f74
commit addf5fcc64
11 changed files with 66 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/boards/esp-s3-lcd-ev-board-2/esp-s3-lcd-ev-board-2.cc
View File

@ -195,7 +195,7 @@ private:
{ {
.disable_control_phase = 1, .disable_control_phase = 1,
} }
} };
tp_io_config.scl_speed_hz = 400 * 1000; 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_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)); ESP_ERROR_CHECK(esp_lcd_touch_new_i2c_gt1151(tp_io_handle, &tp_cfg, &tp));

11
main/boards/lichuang-dev/lichuang_dev_board.cc
View File

@ -184,7 +184,16 @@ private:
}, },
}; };
esp_lcd_panel_io_handle_t tp_io_handle = NULL; 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; tp_io_config.scl_speed_hz = 400000;
esp_lcd_new_panel_io_i2c(i2c_bus_, &tp_io_config, &tp_io_handle); esp_lcd_new_panel_io_i2c(i2c_bus_, &tp_io_config, &tp_io_handle);

11
main/boards/waveshare/esp32-c6-touch-amoled-1.8/esp32-c6-touch-amoled-1.8.cc
View File

@ -265,7 +265,16 @@ private:
}, },
}; };
esp_lcd_panel_io_handle_t tp_io_handle = NULL; 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; 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_ERROR_CHECK(esp_lcd_new_panel_io_i2c(codec_i2c_bus_, &tp_io_config, &tp_io_handle));
ESP_LOGI(TAG, "Initialize touch controller"); ESP_LOGI(TAG, "Initialize touch controller");

2
main/boards/waveshare/esp32-c6-touch-lcd-1.83/esp32-c6-touch-lcd-1.83.cc
View File

@ -184,7 +184,7 @@ private:
.dc_low_on_data = 0, .dc_low_on_data = 0,
.disable_control_phase = 1, .disable_control_phase = 1,
}, },
} };
tp_io_config.scl_speed_hz = 400* 1000; 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_new_panel_io_i2c(i2c_bus_, &tp_io_config, &tp_io_handle));
ESP_LOGI(TAG, "Initialize touch controller"); ESP_LOGI(TAG, "Initialize touch controller");

11
main/boards/waveshare/esp32-s3-touch-amoled-1.8/esp32-s3-touch-amoled-1.8.cc
View File

@ -265,7 +265,16 @@ private:
}, },
}; };
esp_lcd_panel_io_handle_t tp_io_handle = NULL; 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; 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_ERROR_CHECK(esp_lcd_new_panel_io_i2c(codec_i2c_bus_, &tp_io_config, &tp_io_handle));
ESP_LOGI(TAG, "Initialize touch controller"); ESP_LOGI(TAG, "Initialize touch controller");

11
main/boards/waveshare/esp32-s3-touch-amoled-2.06/esp32-s3-touch-amoled-2.06.cc
View File

@ -267,7 +267,16 @@ private:
}, },
}; };
esp_lcd_panel_io_handle_t tp_io_handle = NULL; 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; 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_new_panel_io_i2c(i2c_bus_, &tp_io_config, &tp_io_handle));
ESP_LOGI(TAG, "Initialize touch controller"); ESP_LOGI(TAG, "Initialize touch controller");

2
main/boards/waveshare/esp32-s3-touch-lcd-1.54/esp32-s3-touch-lcd-1.54.cc
View File

@ -135,7 +135,7 @@ private:
.dc_low_on_data = 0, .dc_low_on_data = 0,
.disable_control_phase = 1, .disable_control_phase = 1,
}, },
} };
ESP_ERROR_CHECK(esp_lcd_new_panel_io_i2c(i2c_bus_, &tp_io_config, &tp_io_handle)); ESP_ERROR_CHECK(esp_lcd_new_panel_io_i2c(i2c_bus_, &tp_io_config, &tp_io_handle));
esp_lcd_touch_config_t tp_cfg = { esp_lcd_touch_config_t tp_cfg = {

2
main/boards/waveshare/esp32-s3-touch-lcd-1.83/esp32-s3-touch-lcd-1.83.cc
View File

@ -185,7 +185,7 @@ private:
.dc_low_on_data = 0, .dc_low_on_data = 0,
.disable_control_phase = 1, .disable_control_phase = 1,
}, },
} };
tp_io_config.scl_speed_hz = 400* 1000; 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_new_panel_io_i2c(i2c_bus_, &tp_io_config, &tp_io_handle));
ESP_LOGI(TAG, "Initialize touch controller"); ESP_LOGI(TAG, "Initialize touch controller");

11
main/boards/waveshare/esp32-s3-touch-lcd-3.5/esp32-s3-touch-lcd-3.5.cc
View File

@ -232,7 +232,16 @@ private:
}, },
}; };
esp_lcd_panel_io_handle_t tp_io_handle = NULL; 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; 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_new_panel_io_i2c(i2c_bus_, &tp_io_config, &tp_io_handle));
ESP_LOGI(TAG, "Initialize touch controller"); ESP_LOGI(TAG, "Initialize touch controller");

11
main/boards/waveshare/esp32-touch-lcd-3.5/esp32-touch-lcd-3.5.cc
View File

@ -190,7 +190,16 @@ private:
}, },
}; };
esp_lcd_panel_io_handle_t tp_io_handle = NULL; 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; 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_new_panel_io_i2c(i2c_bus_, &tp_io_config, &tp_io_handle));
ESP_LOGI(TAG, "Initialize touch controller"); ESP_LOGI(TAG, "Initialize touch controller");

4
main/idf_component.yml
View File

@ -47,11 +47,11 @@ dependencies:
version: ^1.0.1 version: ^1.0.1
rules: rules:
- if: target not in [esp32] - 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_gt911: ^1
espressif/esp_lcd_touch_gt1151: ^1 espressif/esp_lcd_touch_gt1151: ^1
waveshare/esp_lcd_touch_cst9217: ^1.0.3 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 lvgl/lvgl: ~9.5.0
esp_lvgl_port: ~2.7.2 esp_lvgl_port: ~2.7.2
espressif/esp_io_expander_tca95xx_16bit: ^2.0.0 espressif/esp_io_expander_tca95xx_16bit: ^2.0.0