feat(st1633): update

Author: Lzw655

src/touch/base/esp_lcd_touch_st1633.c

@@ -125,24 +125,27 @@ static esp_err_t read_data(esp_lcd_touch_handle_t tp)
         uint8_t keys;
         xy_coord_t xy_coord[MAX_TOUCH_NUM];
     } tp_report_t;
-    static_assert(sizeof(tp_report_t) == 42, "Invalid size of tp_report_t");
+    static_assert((sizeof(xy_coord_t) == 4) && (sizeof(tp_report_t) == 42), "Invalid size of tp xy_coord_t or_report_t");
 
     tp_report_t tp_report = { 0 };
     ESP_RETURN_ON_ERROR(i2c_read_bytes(tp, ADVANCED_INFO_REG, (uint8_t *)&tp_report, sizeof(tp_report)), TAG, "Read advanced info failed");
 
+    uint16_t x = 0;
+    uint16_t y = 0;
     portENTER_CRITICAL(&tp->data.lock);
     int j = 0;
-    if (tp_report.gesture_type) {
-        /* Fill all coordinates */
-        for (int i = 0; (i < MAX_TOUCH_NUM) && (j < CONFIG_ESP_LCD_TOUCH_MAX_POINTS); i++) {
-            if (!tp_report.xy_coord[i].valid) {
-                continue;
-            }
-            tp->data.coords[j].x = tp_report.xy_coord[i].x_h << 8 | tp_report.xy_coord[i].x_l;
-            tp->data.coords[j].y = tp_report.xy_coord[i].y_h << 8 | tp_report.xy_coord[i].y_l;
+    /* Fill all coordinates */
+    for (int i = 0; (i < MAX_TOUCH_NUM) && (j < CONFIG_ESP_LCD_TOUCH_MAX_POINTS); i++) {
+        x = (((uint16_t)tp_report.xy_coord[i].x_h) << 8) | tp_report.xy_coord[i].x_l;
+        y = (((uint16_t)tp_report.xy_coord[i].y_h) << 8) | tp_report.xy_coord[i].y_l;
+        if (((x == 0) && (y == 0)) || (x > tp->config.x_max) || (y > tp->config.y_max)) {
+            continue;
         }
-        /* Expect Number of touched points */
+        tp->data.coords[j].x = x;
+        tp->data.coords[j].y = y;
+        j++;
     }
+    /* Expect Number of touched points */
     tp->data.points = j;
     portEXIT_CRITICAL(&tp->data.lock);
 
@@ -215,20 +218,21 @@ static esp_err_t read_fw_info(esp_lcd_touch_handle_t tp)
     uint8_t revision[4] = { 0 };
     struct {
         uint8_t y_res_h: 3;
-        uint8_t reserved_3_7: 5;
+        uint8_t reserved_3: 1;
         uint8_t x_res_h: 3;
-        uint8_t reserved_11_15: 5;
+        uint8_t reserved_7: 1;
         uint8_t x_res_l;
         uint8_t y_res_l;
     } xy_res;
-    static_assert(sizeof(xy_res) == 4, "Invalid size of info");
+    static_assert(sizeof(xy_res) == 3, "Invalid size of info");
 
     ESP_RETURN_ON_ERROR(i2c_read_bytes(tp, FW_VERSION_REG, &version, 1), TAG, "Read version failed");
     ESP_RETURN_ON_ERROR(i2c_read_bytes(tp, FW_REVISION_REG, (uint8_t *)&revision[0], sizeof(revision)), TAG, "Read revision failed");
     ESP_RETURN_ON_ERROR(i2c_read_bytes(tp, XY_RES_H_REG, (uint8_t *)&xy_res, sizeof(xy_res)), TAG, "Read XY Resolution failed");
 
     ESP_LOGI(TAG, "Firmware version: %d(%d.%d.%d.%d), Max.X: %d, Max.Y: %d", version, revision[3], revision[2],
-             revision[1], revision[0], (xy_res.x_res_h << 8) | xy_res.x_res_l, (xy_res.y_res_h << 8) | xy_res.y_res_l);
+             revision[1], revision[0], (((uint16_t)xy_res.x_res_h) << 8) | xy_res.x_res_l,
+             (((uint16_t)xy_res.y_res_h) << 8) | xy_res.y_res_l);
 
     return ESP_OK;
 }