Merge pull request #119 from lvgl/fix/ft6x36_coordinates

FT6X36: Fix coordinates inversion and swap
This commit is contained in:
Carlos Diaz 2021-09-28 20:52:38 -05:00 committed by GitHub
commit 4d3f23a3e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -118,16 +118,16 @@ bool ft6x36_read(lv_indev_drv_t *drv, lv_indev_data_t *data) {
last_x = ((data_buf[1] & FT6X36_MSB_MASK) << 8) | (data_buf[2] & FT6X36_LSB_MASK); 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); 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;
#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;