From 638ebbc0df97e6afb22629823293dc2e7d1f67cd Mon Sep 17 00:00:00 2001
From: tychovrahe <brunam@seznam.cz>
Date: Fri, 2 Jun 2023 14:59:37 +0200
Subject: [PATCH] fix(core): improve robustness of touch driver

[no changelog]
---
 core/embed/trezorhal/touch/ft6x36.c | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/core/embed/trezorhal/touch/ft6x36.c b/core/embed/trezorhal/touch/ft6x36.c
index 319963fc0a..e776f7135f 100644
--- a/core/embed/trezorhal/touch/ft6x36.c
+++ b/core/embed/trezorhal/touch/ft6x36.c
@@ -98,9 +98,15 @@ void touch_set_mode(void) {
   // set register 0xA4 G_MODE to interrupt trigger mode (0x01). basically, CTPM
   // generates a pulse when new data is available
   uint8_t touch_panel_config[] = {0xA4, 0x01};
-  ensure(sectrue * (HAL_OK == i2c_transmit(TOUCH_ADDRESS, touch_panel_config,
-                                           sizeof(touch_panel_config), 10)),
-         "Touch screen panel was not loaded properly.");
+  for (int i = 0; i < 3; i++) {
+    if (HAL_OK == i2c_transmit(TOUCH_ADDRESS, touch_panel_config,
+                               sizeof(touch_panel_config), 10)) {
+      return;
+    }
+    i2c_cycle();
+  }
+
+  ensure(secfalse, "Touch screen panel was not loaded properly.");
 }
 
 void touch_power_on(void) {
@@ -135,9 +141,15 @@ void touch_init(void) {
 void touch_sensitivity(uint8_t value) {
   // set panel threshold (TH_GROUP) - default value is 0x12
   uint8_t touch_panel_threshold[] = {0x80, value};
-  ensure(sectrue * (HAL_OK == i2c_transmit(TOUCH_ADDRESS, touch_panel_threshold,
-                                           sizeof(touch_panel_threshold), 10)),
-         NULL);
+  for (int i = 0; i < 3; i++) {
+    if (HAL_OK == i2c_transmit(TOUCH_ADDRESS, touch_panel_threshold,
+                               sizeof(touch_panel_threshold), 10)) {
+      return;
+    }
+    i2c_cycle();
+  }
+
+  ensure(secfalse, "Touch screen panel was not loaded properly.");
 }
 
 uint32_t touch_is_detected(void) {