From 919d644dc842ce4a45ac41eba4888a1c3f4616b9 Mon Sep 17 00:00:00 2001
From: Rashed Talukder <>
Date: Tue, 19 Oct 2021 17:27:27 -0700
Subject: [PATCH] Add touch input values to a FreeRTOS queue

---
 lvgl_touch/ft6x36.c | 65 +++++++++++++++++++++++++++++++++------------
 lvgl_touch/ft6x36.h | 11 ++++++++
 2 files changed, 59 insertions(+), 17 deletions(-)

diff --git a/lvgl_touch/ft6x36.c b/lvgl_touch/ft6x36.c
index 5b9b46d..cf9ef6f 100644
--- a/lvgl_touch/ft6x36.c
+++ b/lvgl_touch/ft6x36.c
@@ -23,18 +23,23 @@
 #else
 #include <lvgl/lvgl.h>
 #endif
-#include "ft6x36.h"
 
+#include "ft6x36.h"
 #include "lvgl_i2c/i2c_manager.h"
 
-ft6x36_status_t ft6x36_status;
-uint8_t current_dev_addr;       // set during init
+#define TAG "FT6X36"
+#define FT6X36_TOUCH_QUEUE_ELEMENTS 1
 
-esp_err_t ft6x06_i2c_read8(uint8_t slave_addr, uint8_t register_addr, uint8_t *data_buf) {
+static ft6x36_status_t ft6x36_status;
+/* Set during initialization */
+static uint8_t current_dev_addr;
+/* -1 coordinates to designate it was never touched */
+static ft6x36_touch_t touch_inputs = { -1, -1, LV_INDEV_STATE_REL };
+
+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.
@@ -79,8 +84,20 @@ void ft6x06_init(uint16_t dev_addr) {
     LV_LOG_INFO("\tFirmware ID: 0x%02x", data_buf);
 
     ft6x06_i2c_read8(dev_addr, FT6X36_RELEASECODE_REG, &data_buf);
+<<<<<<< HEAD
     LV_LOG_INFO("\tRelease code: 0x%02x", 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 );
+>>>>>>> bd445ea... Add touch input values to a FreeRTOS queue
 }
 
 /**
@@ -95,8 +112,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) {
@@ -105,29 +120,45 @@ 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
+<<<<<<< HEAD
     data->point.x = last_x;
     data->point.y = last_y;
     data->state = LV_INDEV_STATE_PR;
     LV_LOG_INFO("X=%u Y=%u", data->point.x, data->point.y);
+=======
+    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 );
+
+>>>>>>> bd445ea... Add touch input values to a FreeRTOS queue
     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 <stdint.h>
 #include <stdbool.h>
+#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).