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

Merge pull request #84 from ropg/fix_ft6x36

Browse source 
FT6X36 touch: fixed axis-swap, Kconfig defaults.
This commit is contained in:
Carlos Diaz 2021-07-07 15:47:07 -05:00 committed by GitHub
parent 557679a6ee f32a6f57fc
commit 8f1370d1c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lvgl_touch/Kconfig
View file

@ -239,20 +239,20 @@ menu "LVGL Touch controller"
menu "Touchpanel Configuration (FT6X06)" menu "Touchpanel Configuration (FT6X06)"
depends on LV_TOUCH_CONTROLLER_FT6X06 depends on LV_TOUCH_CONTROLLER_FT6X06
config LV_FT6X36_SWAPXY config LV_FT6X36_SWAPXY
bool bool
prompt "Swap X with Y coordinate." prompt "Swap X with Y coordinate."
default y default n
config LV_FT6X36_INVERT_X config LV_FT6X36_INVERT_X
bool bool
prompt "Invert X coordinate value." prompt "Invert X coordinate value."
default n default n
config LV_FT6X36_INVERT_Y config LV_FT6X36_INVERT_Y
bool bool
prompt "Invert Y coordinate value." prompt "Invert Y coordinate value."
default y default n
endmenu endmenu

12
lvgl_touch/ft6x36.c
View file

@ -182,20 +182,20 @@ bool ft6x36_read(lv_indev_drv_t *drv, lv_indev_data_t *data) {
last_x = ((data_xy[0] & FT6X36_MSB_MASK) << 8) | (data_xy[1] & FT6X36_LSB_MASK); last_x = ((data_xy[0] & FT6X36_MSB_MASK) << 8) | (data_xy[1] & FT6X36_LSB_MASK);
last_y = ((data_xy[2] & FT6X36_MSB_MASK) << 8) | (data_xy[3] & FT6X36_LSB_MASK); last_y = ((data_xy[2] & FT6X36_MSB_MASK) << 8) | (data_xy[3] & FT6X36_LSB_MASK);
#if CONFIG_LV_FT6X36_SWAPXY
int16_t swap_buf = last_x;
last_x = last_y;
last_y = swap_buf;
#endif
#if CONFIG_LV_FT6X36_INVERT_X #if CONFIG_LV_FT6X36_INVERT_X
last_x = LV_HOR_RES - last_x; last_x = LV_HOR_RES - last_x;
#endif #endif
#if CONFIG_LV_FT6X36_INVERT_Y #if CONFIG_LV_FT6X36_INVERT_Y
last_y = LV_VER_RES - last_y; last_y = LV_VER_RES - last_y;
#endif
#if CONFIG_LV_FT6X36_SWAPXY
int16_t swap_buf = last_x;
last_x = last_y;
last_y = swap_buf;
#endif #endif
data->point.x = last_x; data->point.x = last_x;
data->point.y = last_y; data->point.y = last_y;
data->state = LV_INDEV_STATE_PR; data->state = LV_INDEV_STATE_PR;
ESP_LOGV(TAG, "X=%u Y=%u", data->point.x, data->point.y); ESP_LOGD(TAG, "X=%u Y=%u", data->point.x, data->point.y);
return false; return false;
} }