feat(multi-touch): Apply feedback from review

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/Kconfig

@@ -6,10 +6,4 @@ menu "ESP LVGL PORT"
         default n
         help
             Enables using PPA for screen rotation.
-    config LVGL_PORT_ENABLE_GESTURES
-        depends on LV_USE_GESTURE_RECOGNITION
-        bool "Enable gesture detection"
-        default n
-        help
-            Enables gesture detection.
 endmenu

components/esp_lvgl_port/README.md

@@ -277,7 +277,7 @@ Display rotation can be changed at runtime.
 
 ### Detecting gestures
 
-LVGL includes support for software detection of multi-touch 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).
 

components/esp_lvgl_port/idf_component.yml

@@ -1,4 +1,4 @@
-version: "2.6.4"
+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

@@ -10,6 +10,7 @@
 #include "esp_lcd_touch.h"
 #include "esp_lvgl_port.h"
 #include "esp_timer.h"
+#include "sdkconfig.h"
 
 static const char *TAG = "LVGL";
 
@@ -128,19 +129,19 @@ static void lvgl_port_touchpad_read(lv_indev_t *indev_drv, lv_indev_data_t *data
     /* Read data from touch controller */
     bool touchpad_pressed = esp_lcd_touch_get_coordinates(touch_ctx->handle, touchpad_x, touchpad_y, NULL, &touchpad_cnt, CONFIG_ESP_LCD_TOUCH_MAX_POINTS);
 
-#if (CONFIG_ESP_LCD_TOUCH_MAX_POINTS > 1 && CONFIG_LVGL_PORT_ENABLE_GESTURES)
+#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
 
     uint8_t touchpad_track_id[CONFIG_ESP_LCD_TOUCH_MAX_POINTS] = {0};
 
-    /* Read track IDs for TODO number of touch points*/
+    /* Read track IDs for first two touch points*/
     esp_err_t err =  esp_lcd_touch_get_track_id(touch_ctx->handle, touchpad_track_id, GESTURE_TOUCH_POINTS);
 
     /* Initialize LVGL touch data for each activated touch point */
     /* static */ lv_indev_touch_data_t touches[CONFIG_ESP_LCD_TOUCH_MAX_POINTS] = {0};
     if (err != ESP_ERR_NOT_SUPPORTED) {
-        for (int i = 0; i < touchpad_cnt; i++) {
+        for (int i = 0; i < touchpad_cnt && i < CONFIG_ESP_LCD_TOUCH_MAX_POINTS; i++) {
             touches[i].state = LV_INDEV_STATE_PRESSED;
             touches[i].point.x = touchpad_x[i];
             touches[i].point.y = touchpad_y[i];

components/lcd_touch/esp_lcd_touch/idf_component.yml

@@ -1,4 +1,4 @@
-version: "1.1.3"
+version: "1.2.0"
 description: ESP LCD Touch - main component for using touch screen controllers
 url: https://github.com/espressif/esp-bsp/tree/master/components/lcd_touch/esp_lcd_touch
 dependencies:

components/lcd_touch/esp_lcd_touch_gt911/idf_component.yml

@@ -1,9 +1,9 @@
-version: "1.1.4"
+version: "1.2.0"
 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:
   idf: ">=4.4.2"
   esp_lcd_touch:
-    version: "^1.1.0"
+    version: "^1.2.0"
     public: true
     override_path: ../esp_lcd_touch

examples/display/main/lvgl_demo_ui.c

@@ -29,7 +29,7 @@ static lv_color_t arc_color[] = {
     LV_COLOR_MAKE(90, 202, 228),
 };
 
-#if (CONFIG_ESP_LCD_TOUCH_MAX_POINTS > 1 && CONFIG_LVGL_PORT_ENABLE_GESTURES)
+#if (CONFIG_ESP_LCD_TOUCH_MAX_POINTS > 1 && CONFIG_LV_USE_GESTURE_RECOGNITION)
 void gesture_cb(lv_event_t *e)
 {
     static uint32_t logo_scale = LV_SCALE_NONE;
@@ -157,7 +157,7 @@ void example_lvgl_demo_ui(lv_obj_t *scr)
     lv_img_set_src(img_logo, &esp_logo);
     lv_obj_center(img_logo);
 
-#if (CONFIG_ESP_LCD_TOUCH_MAX_POINTS > 1 && CONFIG_LVGL_PORT_ENABLE_GESTURES)
+#if (CONFIG_ESP_LCD_TOUCH_MAX_POINTS > 1 && CONFIG_LV_USE_GESTURE_RECOGNITION)
     lv_obj_add_event_cb(scr, gesture_cb, LV_EVENT_GESTURE, NULL);
 #endif
 

examples/display/main/main.c

@@ -25,7 +25,7 @@ void app_main(void)
     ESP_LOGI("example", "Display LVGL animation");
     bsp_display_lock(0);
     lv_obj_t *scr = lv_disp_get_scr_act(NULL);
-#if (CONFIG_ESP_LCD_TOUCH_MAX_POINTS > 1 && CONFIG_LVGL_PORT_ENABLE_GESTURES)
+#if (CONFIG_ESP_LCD_TOUCH_MAX_POINTS > 1 && CONFIG_LV_USE_GESTURE_RECOGNITION)
     lv_indev_t *indev = bsp_display_get_input_dev();
     lv_indev_set_rotation_rad_threshold(indev, 0.15f);
 #endif

examples/display/sdkconfig.bsp.esp-box-3

@@ -28,4 +28,3 @@ CONFIG_LV_USE_PERF_MONITOR=y
 
 CONFIG_LV_USE_FLOAT=y
 CONFIG_LV_USE_GESTURE_RECOGNITION=y
-CONFIG_LVGL_PORT_ENABLE_GESTURES=y