From 7789f5547c470b53388fb0e5aa8fd997c000c417 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Wed, 2 Jun 2021 06:49:06 +0200
Subject: [PATCH] Added touch support for T18

Resolves #138
---
 radio/src/targets/horus/CMakeLists.txt |  1 +
 radio/src/targets/horus/hal.h          | 30 ++++++++++++++++++--------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/radio/src/targets/horus/CMakeLists.txt b/radio/src/targets/horus/CMakeLists.txt
index 1ff27544a..bfbb3153e 100644
--- a/radio/src/targets/horus/CMakeLists.txt
+++ b/radio/src/targets/horus/CMakeLists.txt
@@ -106,6 +106,7 @@ if (PCB STREQUAL X10)
     add_definitions(-DRADIO_FAMILY_T16)
     option(INTERNAL_MODULE_MULTI "Support for MULTI internal module" ON)
     option(BLUETOOTH "Support for bluetooth module" OFF)
+    set(HARDWARE_TOUCH YES)
     add_definitions(-DMANUFACTURER_JUMPER)
   else()
     set(FLAVOUR x10)
diff --git a/radio/src/targets/horus/hal.h b/radio/src/targets/horus/hal.h
index 82d6d8b2a..752ed29d4 100644
--- a/radio/src/targets/horus/hal.h
+++ b/radio/src/targets/horus/hal.h
@@ -707,15 +707,27 @@
 #endif
 
 // I2C Bus
-#define I2C_RCC_AHB1Periph              RCC_AHB1Periph_GPIOB
-#define I2C_RCC_APB1Periph              RCC_APB1Periph_I2C1
-#define I2C                             I2C1
-#define I2C_GPIO                        GPIOB
-#define I2C_SCL_GPIO_PIN                GPIO_Pin_8  // PB.08
-#define I2C_SDA_GPIO_PIN                GPIO_Pin_9  // PB.09
-#define I2C_GPIO_AF                     GPIO_AF_I2C1
-#define I2C_SCL_GPIO_PinSource          GPIO_PinSource8
-#define I2C_SDA_GPIO_PinSource          GPIO_PinSource9
+#if defined(RADIO_T18)
+  #define I2C_RCC_AHB1Periph              RCC_AHB1Periph_GPIOH
+  #define I2C_RCC_APB1Periph              RCC_APB1Periph_I2C3
+  #define I2C                             I2C3
+  #define I2C_GPIO                        GPIOH
+  #define I2C_SCL_GPIO_PIN                GPIO_Pin_7  // PH.07
+  #define I2C_SDA_GPIO_PIN                GPIO_Pin_8  // PH.08
+  #define I2C_GPIO_AF                     GPIO_AF_I2C3
+  #define I2C_SCL_GPIO_PinSource          GPIO_PinSource7
+  #define I2C_SDA_GPIO_PinSource          GPIO_PinSource8
+#else
+  #define I2C_RCC_AHB1Periph              RCC_AHB1Periph_GPIOB
+  #define I2C_RCC_APB1Periph              RCC_APB1Periph_I2C1
+  #define I2C                             I2C1
+  #define I2C_GPIO                        GPIOB
+  #define I2C_SCL_GPIO_PIN                GPIO_Pin_8  // PB.08
+  #define I2C_SDA_GPIO_PIN                GPIO_Pin_9  // PB.09
+  #define I2C_GPIO_AF                     GPIO_AF_I2C1
+  #define I2C_SCL_GPIO_PinSource          GPIO_PinSource8
+  #define I2C_SDA_GPIO_PinSource          GPIO_PinSource9
+#endif
 #define I2C_SPEED                       400000
 
 // Haptic