From bd445ea30ad78b4311f7b5138fd12fad4e2e5c24 Mon Sep 17 00:00:00 2001 From: Rashed Talukder <> Date: Tue, 19 Oct 2021 17:27:27 -0700 Subject: [PATCH 1/3] Add touch input values to a FreeRTOS queue --- lvgl_touch/ft6x36.c | 55 ++++++++++++++++++++++++++++----------------- lvgl_touch/ft6x36.h | 11 +++++++++ 2 files changed, 46 insertions(+), 20 deletions(-) diff --git a/lvgl_touch/ft6x36.c b/lvgl_touch/ft6x36.c index fcef596..a12752a 100644 --- a/lvgl_touch/ft6x36.c +++ b/lvgl_touch/ft6x36.c @@ -29,16 +29,17 @@ #include "lvgl_i2c/i2c_manager.h" #define TAG "FT6X36" +#define FT6X36_TOUCH_QUEUE_ELEMENTS 1 -ft6x36_status_t ft6x36_status; -uint8_t current_dev_addr; // set during init +static ft6x36_status_t ft6x36_status; +static uint8_t current_dev_addr; // set during init +static ft6x36_touch_t touch_inputs = { -1, -1, LV_INDEV_STATE_REL }; // -1 coordinates to designate it was never touched -esp_err_t ft6x06_i2c_read8(uint8_t slave_addr, uint8_t register_addr, uint8_t *data_buf) { +static esp_err_t ft6x06_i2c_read8(uint8_t slave_addr, uint8_t register_addr, uint8_t *data_buf) { return lvgl_i2c_read(CONFIG_LV_I2C_TOUCH_PORT, slave_addr, register_addr, data_buf, 1); } - /** * @brief Read the FT6x36 gesture ID. Initialize first! * @param dev_addr: I2C FT6x36 Slave address. @@ -84,7 +85,14 @@ void ft6x06_init(uint16_t dev_addr) { ft6x06_i2c_read8(dev_addr, FT6X36_RELEASECODE_REG, &data_buf); ESP_LOGI(TAG, "\tRelease code: 0x%02x", data_buf); - + + ft6x36_touch_queue_handle = xQueueCreate( FT6X36_TOUCH_QUEUE_ELEMENTS, sizeof( ft6x36_touch_t )); + if( ft6x36_touch_queue_handle == NULL ) + { + ESP_LOGE( TAG, "\tError creating touch input FreeRTOS queue" ); + return; + } + xQueueSend( ft6x36_touch_queue_handle, &touch_inputs, 0 ); } /** @@ -99,8 +107,6 @@ bool ft6x36_read(lv_indev_drv_t *drv, lv_indev_data_t *data) { return 0x00; } uint8_t data_buf[5]; // 1 byte status, 2 bytes X, 2 bytes Y - static int16_t last_x = 0; // 12bit pixel value - static int16_t last_y = 0; // 12bit pixel value esp_err_t ret = lvgl_i2c_read(CONFIG_LV_I2C_TOUCH_PORT, current_dev_addr, FT6X36_TD_STAT_REG, &data_buf[0], 5); if (ret != ESP_OK) { @@ -109,29 +115,38 @@ bool ft6x36_read(lv_indev_drv_t *drv, lv_indev_data_t *data) { uint8_t touch_pnt_cnt = data_buf[0]; // Number of detected touch points if (ret != ESP_OK || touch_pnt_cnt != 1) { // ignore no touch & multi touch - data->point.x = last_x; - data->point.y = last_y; - data->state = LV_INDEV_STATE_REL; + if ( touch_inputs.current_state != LV_INDEV_STATE_REL) + { + touch_inputs.current_state = LV_INDEV_STATE_REL; + xQueueOverwrite( ft6x36_touch_queue_handle, &touch_inputs ); + } + data->point.x = touch_inputs.last_x; + data->point.y = touch_inputs.last_y; + data->state = touch_inputs.current_state; return false; } - last_x = ((data_buf[1] & FT6X36_MSB_MASK) << 8) | (data_buf[2] & FT6X36_LSB_MASK); - last_y = ((data_buf[3] & FT6X36_MSB_MASK) << 8) | (data_buf[4] & FT6X36_LSB_MASK); + touch_inputs.current_state = LV_INDEV_STATE_PR; + touch_inputs.last_x = ((data_buf[1] & FT6X36_MSB_MASK) << 8) | (data_buf[2] & FT6X36_LSB_MASK); + touch_inputs.last_y = ((data_buf[3] & FT6X36_MSB_MASK) << 8) | (data_buf[4] & FT6X36_LSB_MASK); #if CONFIG_LV_FT6X36_SWAPXY - int16_t swap_buf = last_x; - last_x = last_y; - last_y = swap_buf; + int16_t swap_buf = touch_inputs.last_x; + touch_inputs.last_x = touch_inputs.last_y; + touch_inputs.last_y = swap_buf; #endif #if CONFIG_LV_FT6X36_INVERT_X - last_x = LV_HOR_RES - last_x; + touch_inputs.last_x = LV_HOR_RES - touch_inputs.last_x; #endif #if CONFIG_LV_FT6X36_INVERT_Y - last_y = LV_VER_RES - last_y; + touch_inputs.last_y = LV_VER_RES - touch_inputs.last_y; #endif - data->point.x = last_x; - data->point.y = last_y; - data->state = LV_INDEV_STATE_PR; + data->point.x = touch_inputs.last_x; + data->point.y = touch_inputs.last_y; + data->state = touch_inputs.current_state; ESP_LOGD(TAG, "X=%u Y=%u", data->point.x, data->point.y); + + xQueueOverwrite( ft6x36_touch_queue_handle, &touch_inputs ); + return false; } diff --git a/lvgl_touch/ft6x36.h b/lvgl_touch/ft6x36.h index ace2997..90f1507 100644 --- a/lvgl_touch/ft6x36.h +++ b/lvgl_touch/ft6x36.h @@ -23,6 +23,8 @@ #include #include +#include "freertos/FreeRTOS.h" +#include "freertos/queue.h" #ifdef LV_LVGL_H_INCLUDE_SIMPLE #include "lvgl.h" #else @@ -145,6 +147,15 @@ typedef struct { bool inited; } ft6x36_status_t; +typedef struct +{ + int16_t last_x; + int16_t last_y; + lv_indev_state_t current_state; +} ft6x36_touch_t; + +QueueHandle_t ft6x36_touch_queue_handle; + /** * @brief Initialize for FT6x36 communication via I2C * @param dev_addr: Device address on communication Bus (I2C slave address of FT6X36). From a56b80b362dbee31c40b98a475e8664f3d5da449 Mon Sep 17 00:00:00 2001 From: Rashed Talukder <> Date: Mon, 25 Oct 2021 11:53:26 -0700 Subject: [PATCH 2/3] Add kconfig symbol for optional coordinates queue --- lvgl_touch/Kconfig | 7 +++++++ lvgl_touch/ft6x36.c | 6 ++++++ lvgl_touch/ft6x36.h | 3 ++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/lvgl_touch/Kconfig b/lvgl_touch/Kconfig index de4d17b..b9908aa 100644 --- a/lvgl_touch/Kconfig +++ b/lvgl_touch/Kconfig @@ -201,6 +201,13 @@ menu "LVGL Touch controller" prompt "Invert Y coordinate value." default n + config LV_FT6X36_COORDINATES_QUEUE + bool + prompt "Send coordinates to FreeRTOS queue." + default n + help + Receive from the FreeRTOS queue using the handle 'ft6x36_touch_queue_handle'. + endmenu menu "Touchpanel (STMPE610) Pin Assignments" diff --git a/lvgl_touch/ft6x36.c b/lvgl_touch/ft6x36.c index a12752a..b0466e0 100644 --- a/lvgl_touch/ft6x36.c +++ b/lvgl_touch/ft6x36.c @@ -86,6 +86,7 @@ void ft6x06_init(uint16_t dev_addr) { ft6x06_i2c_read8(dev_addr, FT6X36_RELEASECODE_REG, &data_buf); ESP_LOGI(TAG, "\tRelease code: 0x%02x", data_buf); +#if CONFIG_LV_FT6X36_COORDINATES_QUEUE ft6x36_touch_queue_handle = xQueueCreate( FT6X36_TOUCH_QUEUE_ELEMENTS, sizeof( ft6x36_touch_t )); if( ft6x36_touch_queue_handle == NULL ) { @@ -93,6 +94,7 @@ void ft6x06_init(uint16_t dev_addr) { return; } xQueueSend( ft6x36_touch_queue_handle, &touch_inputs, 0 ); +#endif } /** @@ -118,7 +120,9 @@ bool ft6x36_read(lv_indev_drv_t *drv, lv_indev_data_t *data) { if ( touch_inputs.current_state != LV_INDEV_STATE_REL) { touch_inputs.current_state = LV_INDEV_STATE_REL; +#if CONFIG_LV_FT6X36_COORDINATES_QUEUE xQueueOverwrite( ft6x36_touch_queue_handle, &touch_inputs ); +#endif } data->point.x = touch_inputs.last_x; data->point.y = touch_inputs.last_y; @@ -146,7 +150,9 @@ bool ft6x36_read(lv_indev_drv_t *drv, lv_indev_data_t *data) { data->state = touch_inputs.current_state; ESP_LOGD(TAG, "X=%u Y=%u", data->point.x, data->point.y); +#if CONFIG_LV_FT6X36_COORDINATES_QUEUE xQueueOverwrite( ft6x36_touch_queue_handle, &touch_inputs ); +#endif return false; } diff --git a/lvgl_touch/ft6x36.h b/lvgl_touch/ft6x36.h index 90f1507..5152da5 100644 --- a/lvgl_touch/ft6x36.h +++ b/lvgl_touch/ft6x36.h @@ -154,8 +154,9 @@ typedef struct lv_indev_state_t current_state; } ft6x36_touch_t; +#if CONFIG_LV_FT6X36_COORDINATES_QUEUE QueueHandle_t ft6x36_touch_queue_handle; - +#endif /** * @brief Initialize for FT6x36 communication via I2C * @param dev_addr: Device address on communication Bus (I2C slave address of FT6X36). From 37548ad50fd95f742f1b1e8fa291d001a5f54252 Mon Sep 17 00:00:00 2001 From: Rashed Talukder <> Date: Wed, 27 Oct 2021 09:20:57 -0700 Subject: [PATCH 3/3] Extern the queue handle and add definition in source file. Add macro condition for dependencies. --- lvgl_touch/ft6x36.c | 6 ++++-- lvgl_touch/ft6x36.h | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lvgl_touch/ft6x36.c b/lvgl_touch/ft6x36.c index b0466e0..dae736c 100644 --- a/lvgl_touch/ft6x36.c +++ b/lvgl_touch/ft6x36.c @@ -25,7 +25,6 @@ #include #endif #include "ft6x36.h" - #include "lvgl_i2c/i2c_manager.h" #define TAG "FT6X36" @@ -35,6 +34,9 @@ static ft6x36_status_t ft6x36_status; static uint8_t current_dev_addr; // set during init static ft6x36_touch_t touch_inputs = { -1, -1, LV_INDEV_STATE_REL }; // -1 coordinates to designate it was never touched +#if CONFIG_LV_FT6X36_COORDINATES_QUEUE +QueueHandle_t ft6x36_touch_queue_handle; +#endif static esp_err_t ft6x06_i2c_read8(uint8_t slave_addr, uint8_t register_addr, uint8_t *data_buf) { return lvgl_i2c_read(CONFIG_LV_I2C_TOUCH_PORT, slave_addr, register_addr, data_buf, 1); @@ -87,7 +89,7 @@ void ft6x06_init(uint16_t dev_addr) { ESP_LOGI(TAG, "\tRelease code: 0x%02x", data_buf); #if CONFIG_LV_FT6X36_COORDINATES_QUEUE - ft6x36_touch_queue_handle = xQueueCreate( FT6X36_TOUCH_QUEUE_ELEMENTS, sizeof( ft6x36_touch_t )); + ft6x36_touch_queue_handle = xQueueCreate( FT6X36_TOUCH_QUEUE_ELEMENTS, sizeof( ft6x36_touch_t ) ); if( ft6x36_touch_queue_handle == NULL ) { ESP_LOGE( TAG, "\tError creating touch input FreeRTOS queue" ); diff --git a/lvgl_touch/ft6x36.h b/lvgl_touch/ft6x36.h index 5152da5..c4074dc 100644 --- a/lvgl_touch/ft6x36.h +++ b/lvgl_touch/ft6x36.h @@ -23,8 +23,10 @@ #include #include +#if CONFIG_LV_FT6X36_COORDINATES_QUEUE #include "freertos/FreeRTOS.h" #include "freertos/queue.h" +#endif #ifdef LV_LVGL_H_INCLUDE_SIMPLE #include "lvgl.h" #else @@ -155,7 +157,7 @@ typedef struct } ft6x36_touch_t; #if CONFIG_LV_FT6X36_COORDINATES_QUEUE -QueueHandle_t ft6x36_touch_queue_handle; +extern QueueHandle_t ft6x36_touch_queue_handle; #endif /** * @brief Initialize for FT6x36 communication via I2C