Merge pull request #509 from Lzw655/fix/lcd_touch_new_error_process

fix(lcd_touch): avoid assigning a value to handle after creation failure

Author: tore-espressif

components/lcd_touch/esp_lcd_touch_ft5x06/esp_lcd_touch_ft5x06.c

@@ -153,6 +153,8 @@ esp_err_t esp_lcd_touch_new_i2c_ft5x06(const esp_lcd_panel_io_handle_t io, const
     ret = touch_ft5x06_init(esp_lcd_touch_ft5x06);
     ESP_GOTO_ON_ERROR(ret, err, TAG, "FT5x06 init failed");
 
+    *out_touch = esp_lcd_touch_ft5x06;
+
 err:
     if (ret != ESP_OK) {
         ESP_LOGE(TAG, "Error (0x%x)! Touch controller FT5x06 initialization failed!", ret);
@@ -161,8 +163,6 @@ esp_err_t esp_lcd_touch_new_i2c_ft5x06(const esp_lcd_panel_io_handle_t io, const
         }
     }
 
-    *out_touch = esp_lcd_touch_ft5x06;
-
     return ret;
 }
 

components/lcd_touch/esp_lcd_touch_ft5x06/idf_component.yml

@@ -1,4 +1,4 @@
-version: "1.0.6~1"
+version: "1.0.7"
 description: ESP LCD Touch FT5x06 - touch controller FT5x06
 url: https://github.com/espressif/esp-bsp/tree/master/components/lcd_touch/esp_lcd_touch_ft5x06
 dependencies:

components/lcd_touch/esp_lcd_touch_gt911/esp_lcd_touch_gt911.c

@@ -158,6 +158,8 @@ esp_err_t esp_lcd_touch_new_i2c_gt911(const esp_lcd_panel_io_handle_t io, const
     ret = touch_gt911_read_cfg(esp_lcd_touch_gt911);
     ESP_GOTO_ON_ERROR(ret, err, TAG, "GT911 init failed");
 
+    *out_touch = esp_lcd_touch_gt911;
+
 err:
     if (ret != ESP_OK) {
         ESP_LOGE(TAG, "Error (0x%x)! Touch controller GT911 initialization failed!", ret);
@@ -166,8 +168,6 @@ esp_err_t esp_lcd_touch_new_i2c_gt911(const esp_lcd_panel_io_handle_t io, const
         }
     }
 
-    *out_touch = esp_lcd_touch_gt911;
-
     return ret;
 }
 

components/lcd_touch/esp_lcd_touch_gt911/idf_component.yml

@@ -1,4 +1,4 @@
-version: "1.1.1~2"
+version: "1.1.2"
 description: ESP LCD Touch GT911 - touch controller GT911
 url: https://github.com/espressif/esp-bsp/tree/master/components/lcd_touch/esp_lcd_touch_gt911
 dependencies:

components/lcd_touch/esp_lcd_touch_stmpe610/esp_lcd_touch_stmpe610.c

@@ -143,6 +143,8 @@ esp_err_t esp_lcd_touch_new_spi_stmpe610(const esp_lcd_panel_io_handle_t io, con
     ret = touch_stmpe610_read_cfg(esp_lcd_touch_stmpe610);
     ESP_GOTO_ON_ERROR(ret, err, TAG, "STMPE610 init failed");
 
+    *out_touch = esp_lcd_touch_stmpe610;
+
 err:
     if (ret != ESP_OK) {
         ESP_LOGE(TAG, "Error (0x%x)! Touch controller STMPE610 initialization failed!", ret);
@@ -151,8 +153,6 @@ esp_err_t esp_lcd_touch_new_spi_stmpe610(const esp_lcd_panel_io_handle_t io, con
         }
     }
 
-    *out_touch = esp_lcd_touch_stmpe610;
-
     return ret;
 }
 

components/lcd_touch/esp_lcd_touch_stmpe610/idf_component.yml

@@ -1,4 +1,4 @@
-version: "1.0.6"
+version: "1.0.7"
 description: ESP LCD Touch STMPE610 - touch controller STMPE610
 url: https://github.com/espressif/esp-bsp/tree/master/components/esp_lcd_touch_stmpe610
 dependencies:

components/lcd_touch/esp_lcd_touch_tt21100/esp_lcd_touch_tt21100.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -108,6 +108,8 @@ esp_err_t esp_lcd_touch_new_i2c_tt21100(const esp_lcd_panel_io_handle_t io, cons
     ret = esp_lcd_touch_tt21100_read_data(esp_lcd_touch_tt21100);
     ESP_GOTO_ON_ERROR(ret, err, TAG, "TT21100 init failed");
 
+    *out_touch = esp_lcd_touch_tt21100;
+
 err:
     if (ret != ESP_OK) {
         ESP_LOGE(TAG, "Error (0x%x)! Touch controller TT21100 initialization failed!", ret);
@@ -116,8 +118,6 @@ esp_err_t esp_lcd_touch_new_i2c_tt21100(const esp_lcd_panel_io_handle_t io, cons
         }
     }
 
-    *out_touch = esp_lcd_touch_tt21100;
-
     return ret;
 }
 
@@ -201,20 +201,22 @@ static esp_err_t esp_lcd_touch_tt21100_read_data(esp_lcd_touch_handle_t tp)
         touch_tt21100_i2c_read(tp, data, data_len);
         ESP_RETURN_ON_ERROR(err, TAG, "I2C read error!");
 
-        portENTER_CRITICAL(&tp->data.lock);
-
         if (data_len == 14) {
 #if (CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS > 0)
             /* Button event */
             p_btn_data = (button_record_struct_t *) data;
 
+            portENTER_CRITICAL(&tp->data.lock);
+
             /* Buttons count */
             tp->data.buttons = (CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS < 4 ? CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS : 4);
 
             for (i = 0; i < tp->data.buttons; i++) {
                 tp->data.button[i].status = p_btn_data->btn_signal[i];
             }
 
+            portEXIT_CRITICAL(&tp->data.lock);
+
             ESP_LOGD(TAG, "Len : %04Xh. ID : %02Xh. Time : %5u. Val : [%u] - [%04X][%04X][%04X][%04X]",
                      p_btn_data->length, p_btn_data->report_id, p_btn_data->time_stamp, p_btn_data->btn_val,
                      p_btn_data->btn_signal[0], p_btn_data->btn_signal[1], p_btn_data->btn_signal[2], p_btn_data->btn_signal[3]);
@@ -226,6 +228,9 @@ static esp_err_t esp_lcd_touch_tt21100_read_data(esp_lcd_touch_handle_t tp)
 
             /* Number of touched points */
             tp_num = (tp_num > CONFIG_ESP_LCD_TOUCH_MAX_POINTS ? CONFIG_ESP_LCD_TOUCH_MAX_POINTS : tp_num);
+
+            portENTER_CRITICAL(&tp->data.lock);
+
             tp->data.points = tp_num;
 
             /* Fill all coordinates */
@@ -235,12 +240,15 @@ static esp_err_t esp_lcd_touch_tt21100_read_data(esp_lcd_touch_handle_t tp)
                 tp->data.coords[i].x = p_touch_data->x;
                 tp->data.coords[i].y = p_touch_data->y;
                 tp->data.coords[i].strength = p_touch_data->pressure;
+            }
+
+            portEXIT_CRITICAL(&tp->data.lock);
 
+            for (i = 0; i < tp_num; i++) {
+                p_touch_data = &p_report_data->touch_record[i];
                 ESP_LOGD(TAG, "(%zu) [%3u][%3u]", i, p_touch_data->x, p_touch_data->y);
             }
         }
-
-        portEXIT_CRITICAL(&tp->data.lock);
     }
 
     return ESP_OK;

components/lcd_touch/esp_lcd_touch_tt21100/idf_component.yml

@@ -1,4 +1,4 @@
-version: "1.1.0~1"
+version: "1.1.1"
 description: ESP LCD Touch TT21100 - touch controller TT21100
 url: https://github.com/espressif/esp-bsp/tree/master/components/lcd_touch/esp_lcd_touch_tt21100
 dependencies: