arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-18 05:28:40 +00:00
Code Issues Releases Wiki Activity

trezorhal: fix bug in touch ignoring the first TOUCH_START event

Browse Source
This commit is contained in:
Pavol Rusnak 2017-06-07 17:12:07 +02:00
parent ecefb1c0ef
commit 59421d4b3a
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
micropython/trezorhal/touch.c
View File

@ -44,26 +44,32 @@ int touch_init(void) {
return 0; return 0;
} }
#define TOUCH_ADDRESS 56
#define TOUCH_PACKET_SIZE 16
uint32_t touch_read(void) { uint32_t touch_read(void) {
static uint8_t data[16], old_data[16]; static uint8_t data[TOUCH_PACKET_SIZE], old_data[TOUCH_PACKET_SIZE];
if (HAL_OK != HAL_I2C_Master_Receive(&i2c_handle, 56 << 1, data, 16, 1)) { if (HAL_OK != HAL_I2C_Master_Receive(&i2c_handle, TOUCH_ADDRESS << 1, data, TOUCH_PACKET_SIZE, 1)) {
return 0; // read failure return 0; // read failure
} }
if (0 == memcmp(data, old_data, 16)) { if (0 == memcmp(data, old_data, TOUCH_PACKET_SIZE)) {
return 0; // no new event return 0; // no new event
} }
uint32_t r = 0; memcpy(old_data, data, TOUCH_PACKET_SIZE);
if (old_data[2] == 0 && data[2] == 1) {
r = TOUCH_START | (data[4] << 8) | data[6]; // touch start if (data[0] == 0xff && data[1] == 0x00) {
} else if (data[2] == 0x01 && data[3] == 0x00) {
if (old_data[2] == 1 && data[2] == 1) { return TOUCH_START | (data[4] << 8) | data[6]; // touch start
r = TOUCH_MOVE | (data[4] << 8) | data[6]; // touch move } else
if (data[2] == 0x01 && data[3] == 0x80) {
return TOUCH_MOVE | (data[4] << 8) | data[6]; // touch move
} else
if (data[2] == 0x00 && data[3] == 0x40) {
return TOUCH_END | (data[4] << 8) | data[6]; // touch end
}
} }
if (old_data[2] == 1 && data[2] == 0) {
r = TOUCH_END | (data[4] << 8) | data[6]; // touch end return 0;
}
memcpy(old_data, data, 16);
return r;
} }
void I2C1_EV_IRQHandler(void) { void I2C1_EV_IRQHandler(void) {