forked from xuos/xiuos
fit touch postion for lvgl
This commit is contained in:
@@ -65,8 +65,8 @@ typedef enum _touch_event
|
||||
#define GTP_REG_VERSION 0x8140
|
||||
|
||||
#define LCD_SIZE 320
|
||||
#define TOUCH_WIDTH 1024
|
||||
#define TOUCH_HEIGHT 664
|
||||
#define TOUCH_WIDTH 1080
|
||||
#define TOUCH_HEIGHT 720
|
||||
|
||||
#define CFG_GROUP_LEN(p_cfg_grp) (sizeof(p_cfg_grp) / sizeof(p_cfg_grp[0]))
|
||||
|
||||
|
||||
@@ -77,7 +77,7 @@ static x_err_t ReadRegs(struct HardwareDev* dev, uint8 len, uint8* buf)
|
||||
// not used in polling mode
|
||||
static void touch_pin_irqhandler(void* arg)
|
||||
{
|
||||
// KPrintf("int hdr working.\n");
|
||||
KPrintf("int hdr working.\n");
|
||||
if (!SemReleaseFlag)
|
||||
{
|
||||
KSemaphoreAbandon(touch_sem);
|
||||
@@ -277,7 +277,7 @@ static uint32 TouchRead(void* dev, struct BusBlockReadParam* read_param)
|
||||
char status_reg = 0x80;
|
||||
|
||||
struct TouchDataStandard* data = (struct TouchDataStandard*)read_param->buffer;
|
||||
read_param->read_length = 0;
|
||||
|
||||
result = KSemaphoreObtain(touch_sem, 10);
|
||||
// if (EOK == result)
|
||||
// {
|
||||
@@ -292,15 +292,16 @@ static uint32 TouchRead(void* dev, struct BusBlockReadParam* read_param)
|
||||
{
|
||||
ts_event.fingers[i].x = ((((uint32_t)TOUCHRECDATA[(i * 4) + 5]) << 8) | (uint32_t)TOUCHRECDATA[(i * 4) + 4]) & 0x00000FFF; // 12 bits of X coord
|
||||
ts_event.fingers[i].y = ((((uint32_t)TOUCHRECDATA[(i * 4) + 7]) << 8) | (uint32_t)TOUCHRECDATA[(i * 4) + 6]) & 0x00000FFF;
|
||||
ts_event.fingers[i].x = 320 - ts_event.fingers[i].x *LCD_SIZE/TOUCH_WIDTH;
|
||||
ts_event.fingers[i].y = ts_event.fingers[i].y *LCD_SIZE/TOUCH_HEIGHT;
|
||||
uint32_t pos_y = 308 - ts_event.fingers[i].x *LCD_SIZE/TOUCH_WIDTH;
|
||||
ts_event.fingers[i].x = ts_event.fingers[i].y *LCD_SIZE/TOUCH_HEIGHT;
|
||||
ts_event.fingers[i].y = pos_y;
|
||||
ts_event.fingers[i].fingerID = (uint32_t)TOUCHRECDATA[(i * 4) + 7] >> 4; // finger that did the touch
|
||||
// printf("fingers[%d] x %d y %d id %d\n",i,ts_event.fingers[i].x,ts_event.fingers[i].y,ts_event.fingers[i].fingerID);
|
||||
}
|
||||
|
||||
data->x = ts_event.fingers[ts_event.NBfingers - 1].x;
|
||||
data->y = ts_event.fingers[ts_event.NBfingers - 1].y;
|
||||
|
||||
read_param->read_length = ts_event.NBfingers;
|
||||
SemReleaseFlag = 0;
|
||||
// }
|
||||
|
||||
|
||||
Reference in New Issue
Block a user