zener/lvgl_esp32_drivers
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove TAG from LVGL log API in touch drivers

Browse source 
The filename is appended at the beginning of the log output by default, we don't need to do it.
This commit is contained in:
C47D 2021-10-22 18:45:37 -05:00
parent a0e915eebc
commit ea37784f08
6 changed files with 37 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lvgl_touch/gt911.c
View file

@ -27,8 +27,6 @@
#include "lvgl_i2c/i2c_manager.h"
#define TAG "GT911: "
gt911_status_t gt911_status;
//TODO: handle multibyte read and refactor to just one read transaction
@ -52,9 +50,9 @@ void gt911_init(uint8_t dev_addr) {
uint8_t data_buf;
esp_err_t ret;
LV_LOG_INFO(TAG, "Checking for GT911 Touch Controller");
LV_LOG_INFO("Checking for GT911 Touch Controller");
if ((ret = gt911_i2c_read(dev_addr, GT911_PRODUCT_ID1, &data_buf, 1) != ESP_OK)) {
LV_LOG_ERROR(TAG, "Error reading from device: %s",
LV_LOG_ERROR("Error reading from device: %s",
esp_err_to_name(ret)); // Only show error the first time
return;
}
@ -63,22 +61,22 @@ void gt911_init(uint8_t dev_addr) {
for (int i = 0; i < GT911_PRODUCT_ID_LEN; i++) {
gt911_i2c_read(dev_addr, (GT911_PRODUCT_ID1 + i), (uint8_t *)&(gt911_status.product_id[i]), 1);
}
LV_LOG_INFO(TAG, "\tProduct ID: %s", gt911_status.product_id);
LV_LOG_INFO("\tProduct ID: %s", gt911_status.product_id);
gt911_i2c_read(dev_addr, GT911_VENDOR_ID, &data_buf, 1);
LV_LOG_INFO(TAG, "\tVendor ID: 0x%02x", data_buf);
LV_LOG_INFO("\tVendor ID: 0x%02x", data_buf);
gt911_i2c_read(dev_addr, GT911_X_COORD_RES_L, &data_buf, 1);
gt911_status.max_x_coord = data_buf;
gt911_i2c_read(dev_addr, GT911_X_COORD_RES_H, &data_buf, 1);
gt911_status.max_x_coord |= ((uint16_t)data_buf << 8);
LV_LOG_INFO(TAG, "\tX Resolution: %d", gt911_status.max_x_coord);
LV_LOG_INFO("\tX Resolution: %d", gt911_status.max_x_coord);
gt911_i2c_read(dev_addr, GT911_Y_COORD_RES_L, &data_buf, 1);
gt911_status.max_y_coord = data_buf;
gt911_i2c_read(dev_addr, GT911_Y_COORD_RES_H, &data_buf, 1);
gt911_status.max_y_coord |= ((uint16_t)data_buf << 8);
LV_LOG_INFO(TAG, "\tY Resolution: %d", gt911_status.max_y_coord);
LV_LOG_INFO("\tY Resolution: %d", gt911_status.max_y_coord);
gt911_status.inited = true;
}
}
@ -97,7 +95,7 @@ bool gt911_read(lv_indev_drv_t *drv, lv_indev_data_t *data) {
uint8_t status_reg;
gt911_i2c_read(gt911_status.i2c_dev_addr, GT911_STATUS_REG, &status_reg, 1);
// LV_LOG_INFO(TAG, "\tstatus: 0x%02x", status_reg);
// LV_LOG_INFO("\tstatus: 0x%02x", status_reg);
touch_pnt_cnt = status_reg & 0x0F;
if ((status_reg & 0x80) || (touch_pnt_cnt < 6)) {
//Reset Status Reg Value
@ -111,7 +109,7 @@ bool gt911_read(lv_indev_drv_t *drv, lv_indev_data_t *data) {
}
// gt911_i2c_read(gt911_status.i2c_dev_addr, GT911_TRACK_ID1, &data_buf, 1);
// LV_LOG_INFO(TAG, "\ttrack_id: %d", data_buf);
// LV_LOG_INFO("\ttrack_id: %d", data_buf);
gt911_i2c_read(gt911_status.i2c_dev_addr, GT911_PT1_X_COORD_L, &data_buf, 1);
last_x = data_buf;
@ -137,7 +135,7 @@ bool gt911_read(lv_indev_drv_t *drv, lv_indev_data_t *data) {
data->point.x = last_x;
data->point.y = last_y;
data->state = LV_INDEV_STATE_PR;
LV_LOG_INFO(TAG, "X=%u Y=%u", data->point.x, data->point.y);
LV_LOG_INFO(TAG, "X=%u Y=%u", data->point.x, data->point.y);
LV_LOG_INFO("X=%u Y=%u", data->point.x, data->point.y);
LV_LOG_INFO("X=%u Y=%u", data->point.x, data->point.y);
return false;
}