feat(multi-touch): Add multi-touch gestures to LVGL port

Author: PetrESP

components/esp_lvgl_port/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 2.7.0
+
+### Features
+
+- Added support for multi-touch gestures.
+
 ## 2.6.3
 
 ### Fixes

components/esp_lvgl_port/README.md

@@ -275,6 +275,22 @@ Display rotation can be changed at runtime.
 > [!NOTE]
 > During the hardware rotating, the component call [`esp_lcd`](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/peripherals/lcd.html) API. When using software rotation, you cannot use neither `direct_mode` nor `full_refresh` in the driver. See [LVGL documentation](https://docs.lvgl.io/8.3/porting/display.html?highlight=sw_rotate) for more info.
 
+### Detecting gestures
+
+LVGL (version 9.4 and higher) includes support for software detection of multi-touch gestures.
+This detection can be enabled by setting the `LVGL_PORT_ENABLE_GESTURES` config and having `ESP_LCD_TOUCH_MAX_POINTS` > 1.
+Example usage of the gesture callback can be found in LVGL [documentation](https://docs.lvgl.io/master/details/main-modules/indev/gestures.html).
+
+The LVGL port task is responsible for passing the touch coordinates to the gesture recognizers and calling the registered callback when a gesture is detected.
+
+To correctly distinguish two finger swipe from rotation, we recommend changing the default value (which is 0) for the rotation threshold.
+From our testing we recommend starting with 0.15 radians.
+
+```
+    lv_indev_t indev = bsp_display_get_input_dev();
+    lv_indev_set_rotation_rad_threshold(indev, 0.15f);
+```
+
 ### Using PSRAM canvas
 
 If the SRAM is insufficient, you can use the PSRAM as a canvas and use a small trans_buffer to carry it, this makes drawing more efficient.

components/esp_lvgl_port/idf_component.yml

@@ -1,4 +1,4 @@
-version: "2.6.3"
+version: "2.7.0"
 description: ESP LVGL port
 url: https://github.com/espressif/esp-bsp/tree/master/components/esp_lvgl_port
 dependencies:

components/esp_lvgl_port/src/lvgl9/esp_lvgl_port_touch.c

@@ -9,6 +9,8 @@
 #include "esp_check.h"
 #include "esp_lcd_touch.h"
 #include "esp_lvgl_port.h"
+#include "esp_timer.h"
+#include "sdkconfig.h"
 
 static const char *TAG = "LVGL";
 
@@ -117,19 +119,39 @@ static void lvgl_port_touchpad_read(lv_indev_t *indev_drv, lv_indev_data_t *data
     assert(touch_ctx);
     assert(touch_ctx->handle);
 
-    uint16_t touchpad_x[1] = {0};
-    uint16_t touchpad_y[1] = {0};
-    uint8_t touchpad_cnt = 0;
+    uint8_t touch_cnt = 0;
+    esp_lcd_touch_point_data_t touch_data[CONFIG_ESP_LCD_TOUCH_MAX_POINTS] = {0};
 
     /* Read data from touch controller into memory */
-    esp_lcd_touch_read_data(touch_ctx->handle);
+    ESP_ERROR_CHECK(esp_lcd_touch_read_data(touch_ctx->handle));
 
     /* Read data from touch controller */
-    bool touchpad_pressed = esp_lcd_touch_get_coordinates(touch_ctx->handle, touchpad_x, touchpad_y, NULL, &touchpad_cnt, 1);
+    ESP_ERROR_CHECK(esp_lcd_touch_get_data(touch_ctx->handle, touch_data, &touch_cnt, CONFIG_ESP_LCD_TOUCH_MAX_POINTS));
 
-    if (touchpad_pressed && touchpad_cnt > 0) {
-        data->point.x = touch_ctx->scale.x * touchpad_x[0];
-        data->point.y = touch_ctx->scale.y * touchpad_y[0];
+#if (CONFIG_ESP_LCD_TOUCH_MAX_POINTS > 1 && CONFIG_LV_USE_GESTURE_RECOGNITION)
+    // Number of touch points which need to be constantly updated inside gesture recognizers
+#define GESTURE_TOUCH_POINTS 2
+
+    /* Initialize LVGL touch data for each activated touch point */
+    lv_indev_touch_data_t touches[GESTURE_TOUCH_POINTS] = {0};
+
+    for (int i = 0; i < touch_cnt && i < GESTURE_TOUCH_POINTS; i++) {
+        touches[i].state = LV_INDEV_STATE_PRESSED;
+        touches[i].point.x = touch_ctx->scale.x * touch_data[i].x;
+        touches[i].point.y = touch_ctx->scale.y * touch_data[i].y;
+        touches[i].id = touch_data[i].track_id;
+        touches[i].timestamp = esp_timer_get_time() / 1000;
+    }
+
+    /* Pass touch data to LVGL gesture recognizers */
+    lv_indev_gesture_recognizers_update(indev_drv, touches, GESTURE_TOUCH_POINTS);
+    lv_indev_gesture_recognizers_set_data(indev_drv, data);
+
+#endif
+
+    if (touch_cnt > 0) {
+        data->point.x = touch_ctx->scale.x * touch_data[0].x;
+        data->point.y = touch_ctx->scale.y * touch_data[0].y;
         data->state = LV_INDEV_STATE_PRESSED;
     } else {
         data->state = LV_INDEV_STATE_RELEASED;