diff --git a/radio/src/targets/pl18/CMakeLists.txt b/radio/src/targets/pl18/CMakeLists.txt
index 6f0989ab149..78b5806e436 100644
--- a/radio/src/targets/pl18/CMakeLists.txt
+++ b/radio/src/targets/pl18/CMakeLists.txt
@@ -19,8 +19,6 @@ set(HARDWARE_EXTERNAL_MODULE YES)
 set(WIRELESS_CHARGER YES)
 set(TARGET_DIR pl18)
 
-set(LINKER_SCRIPT targets/pl18/stm32f4_flash_bootloader.ld)  
-
 set(RTC_BACKUP_RAM YES)
 set(PPM_LIMITS_SYMETRICAL YES)
 # for size report script
@@ -100,10 +98,13 @@ set(SRC
 set(GVAR_SCREEN model_gvars.cpp)
 
 if(BOOTLOADER)
+  set(LINKER_SCRIPT targets/pl18/stm32f4_flash_bootloader.ld)
   set(FIRMWARE_TARGET_SRC
     ${FIRMWARE_TARGET_SRC}
     ../common/arm/loadboot.cpp
     )
+else()
+  set(LINKER_SCRIPT targets/pl18/stm32f4_flash.ld)
 endif()
 
 set(SRC
@@ -133,12 +134,12 @@ set(FIRMWARE_TARGET_SRC
 set(FIRMWARE_SRC
   ${FIRMWARE_SRC}
   hal/adc_driver.cpp
-  targets/common/arm/stm32/stm32_adc.cpp
+  targets/common/arm/stm32/stm32_exti_driver.cpp
   targets/common/arm/stm32/timers_driver.cpp
   targets/common/arm/stm32/stm32_pulse_driver.cpp
   targets/common/arm/stm32/stm32_usart_driver.cpp
-  targets/common/arm/stm32/trainer_driver.cpp
   targets/common/arm/stm32/pwr_driver.cpp
+  targets/common/arm/stm32/trainer_driver.cpp
   targets/common/arm/stm32/audio_dac_driver.cpp
   targets/common/arm/stm32/spi_flash.cpp
   targets/common/arm/stm32/diskio_spi_flash.cpp
diff --git a/radio/src/targets/pl18/hal.h b/radio/src/targets/pl18/hal.h
index 122cff3169c..85f1ba6db79 100644
--- a/radio/src/targets/pl18/hal.h
+++ b/radio/src/targets/pl18/hal.h
@@ -464,36 +464,29 @@
 #define AUDIO_TIMER                     TIM6
 #define AUDIO_DMA                       DMA1
 
-// I2C Bus - Touch
-#define I2C_B1_RCC_AHB1Periph           RCC_AHB1Periph_GPIOB
-#define I2C_B1_RCC_APB1Periph           RCC_APB1Periph_I2C1
+// I2C Bus
 #define I2C_B1                          I2C1
 #define I2C_B1_GPIO                     GPIOB
 #define I2C_B1_SDA_GPIO_PIN             LL_GPIO_PIN_7  // PB.07
 #define I2C_B1_SCL_GPIO_PIN             LL_GPIO_PIN_8  // PB.08
-#define I2C_B1_GPIO_AF                  GPIO_AF4_I2C1
-//#define I2C_B1_SDA_GPIO_PinSource       GPIO_PinSource7
-//#define I2C_B1_SCL_GPIO_PinSource       GPIO_PinSource8
-//#define I2C_B1_CLK_RATE                 100000
+#define I2C_B1_GPIO_AF                  LL_GPIO_AF_4
 
-#define TOUCH_I2C_BUS                 I2C_Bus_1
-#define TOUCH_I2C_CLK_RATE            400000
-
-
-#define TOUCH_RST_RCC_AHB1Periph        RCC_AHB1Periph_GPIOB
-#define TOUCH_RST_GPIO                  GPIOB
-#define TOUCH_RST_GPIO_PIN              LL_GPIO_PIN_12   // PB.12
-
-#define TOUCH_INT_RCC_AHB1Periph        RCC_AHB1Periph_GPIOB
+// Touch
+#define TOUCH_I2C_BUS                   I2C_Bus_1
+#define TOUCH_I2C_CLK_RATE              400000
 #define TOUCH_INT_GPIO                  GPIOB
 #define TOUCH_INT_GPIO_PIN              LL_GPIO_PIN_9    // PB.09
-#define TOUCH_INT_EXTI_LINE1            LL_EXTI_LINE_9
-
-#define TOUCH_INT_EXTI_Line           LL_EXTI_LINE_9
-#define TOUCH_INT_EXTI_Port           LL_SYSCFG_EXTI_PORTB
-#define TOUCH_INT_EXTI_SysCfgLine     LL_SYSCFG_EXTI_LINE9
-#define TOUCH_INT_EXTI_IRQn           EXTI9_5_IRQn
-#define TOUCH_INT_EXTI_IRQHandler     EXTI9_5_IRQHandler
+#define TOUCH_RST_GPIO                  GPIOB
+#define TOUCH_RST_GPIO_PIN              LL_GPIO_PIN_12   // PB.12
+#define TOUCH_INT_EXTI_Line             LL_EXTI_LINE_9
+#define TOUCH_INT_EXTI_Port             LL_SYSCFG_EXTI_PORTB
+#define TOUCH_INT_EXTI_SysCfgLine       LL_SYSCFG_EXTI_LINE9
+
+// TOUCH_INT_EXTI IRQ
+#if !defined(USE_EXTI9_5_IRQ)
+  #define USE_EXTI9_5_IRQ
+  #define EXTI9_5_IRQ_Priority  9
+#endif
 
 // Haptic: TIM1_CH1
 #define HAPTIC_PWM
diff --git a/radio/src/targets/pl18/tp_cst340.cpp b/radio/src/targets/pl18/tp_cst340.cpp
index a5ee1b74cbd..07a7ae5b575 100644
--- a/radio/src/targets/pl18/tp_cst340.cpp
+++ b/radio/src/targets/pl18/tp_cst340.cpp
@@ -21,26 +21,21 @@
 
 #include "stm32_hal_ll.h"
 #include "stm32_hal.h"
-#include "hal.h"
-
 #include "stm32_i2c_driver.h"
+#include "stm32_gpio_driver.h"
+#include "stm32_exti_driver.h"
+
+#include "hal.h"
 #include "timers_driver.h"
 #include "delays_driver.h"
 #include "tp_cst340.h"
 
 #include "debug.h"
 
-volatile static bool touchEventOccured;
-
-#define TOUCH_RCC_AHB1Periph              RCC_AHB1Periph_GPIOB
-#define TOUCH_RCC_APB1Periph              RCC_APB1Periph_I2C1
-#define TOUCH_GPIO                        I2C_B1_GPIO
-#define TOUCH_SCL_GPIO_PIN                I2C_B1_SCL_GPIO_PIN  // PB.08
-#define TOUCH_SDA_GPIO_PIN                I2C_B1_SDA_GPIO_PIN  // PB.09
-
 #define TOUCH_FT6236_I2C_ADDRESS          (0x70>>1)
 #define TOUCH_CST340_I2C_ADDRESS          0x1A
 
+volatile static bool touchEventOccured;
 enum TouchControllers {TC_NONE, TC_FT6236, TC_CST340};
 TouchControllers touchController = TC_NONE;
 
@@ -63,129 +58,69 @@ static const TouchControllerDescriptor *tc = nullptr;
 
 static TouchState internalTouchState = {};
 
-void I2C_FreeBus()
+static void _cst340_exti_isr(void)
 {
-  LL_GPIO_InitTypeDef gpioInit;
-  LL_GPIO_StructInit(&gpioInit);
-
-  // reset i2c bus by setting clk as output and sending manual clock pulses
-  gpioInit.Pin = TOUCH_SCL_GPIO_PIN;
-  gpioInit.Mode = LL_GPIO_MODE_OUTPUT;
-  gpioInit.OutputType = LL_GPIO_OUTPUT_PUSHPULL;
-  gpioInit.Pull = LL_GPIO_PULL_NO;
-  gpioInit.Speed = LL_GPIO_SPEED_FREQ_LOW;
-  LL_GPIO_Init(TOUCH_GPIO, &gpioInit);
-
-  gpioInit.Pin = TOUCH_SDA_GPIO_PIN;
-  gpioInit.Mode = LL_GPIO_MODE_INPUT;
-  gpioInit.OutputType = LL_GPIO_OUTPUT_OPENDRAIN;
-  gpioInit.Pull = LL_GPIO_PULL_UP;
-  gpioInit.Speed = LL_GPIO_SPEED_FREQ_LOW;
-  LL_GPIO_Init(TOUCH_GPIO, &gpioInit);
-
-  //send 100khz clock train for some 100ms
-  tmr10ms_t until = get_tmr10ms() + 11;
-  while (get_tmr10ms() < until) {
-    if (LL_GPIO_IsInputPinSet(TOUCH_GPIO, TOUCH_SDA_GPIO_PIN)) {
-      TRACE("touch: i2c free again\n");
-      break;
-    }
-    TRACE("FREEEEE");
-    LL_GPIO_ResetOutputPin(TOUCH_GPIO, TOUCH_SCL_GPIO_PIN);
-    delay_us(10);
-    LL_GPIO_SetOutputPin(TOUCH_GPIO, TOUCH_SCL_GPIO_PIN);
-    delay_us(10);
-  }
-
-  //send stop condition:
-  gpioInit.Pin = TOUCH_SDA_GPIO_PIN;
-  gpioInit.Mode = LL_GPIO_MODE_OUTPUT;
-  gpioInit.Speed = LL_GPIO_SPEED_FREQ_LOW;
-  LL_GPIO_Init(TOUCH_GPIO, &gpioInit);
-
-  //clock is low
-  LL_GPIO_ResetOutputPin(TOUCH_GPIO, TOUCH_SCL_GPIO_PIN);
-  delay_us(10);
-  //sda = lo
-  LL_GPIO_SetOutputPin(TOUCH_GPIO, TOUCH_SDA_GPIO_PIN);
-  delay_us(10);
-  //clock goes high
-  LL_GPIO_ResetOutputPin(TOUCH_GPIO, TOUCH_SCL_GPIO_PIN);
-  delay_us(10);
-  //sda = hi
-  LL_GPIO_SetOutputPin(TOUCH_GPIO, TOUCH_SDA_GPIO_PIN);
-  delay_us(10);
-  TRACE("FREE BUS");
+  touchEventOccured = true;
 }
 
-// void Touch_DeInit()
-// {
-//   I2C_DeInit(I2C_B1);
-//   __HAL_RCC_I2C1_FORCE_RESET();
-//   delay_ms(150);
-//   __HAL_RCC_I2C1_RELEASE_RESET();
-// }
-
-static int _enable_gpio_clock(GPIO_TypeDef *GPIOx)
+static void TOUCH_AF_ExtiStop(void)
 {
-  if (GPIOx == GPIOB)
-    __HAL_RCC_GPIOB_CLK_ENABLE();
-  else
-    return -1;
-
-  return 0;
+  stm32_exti_disable(TOUCH_INT_EXTI_Line);
 }
 
-void I2C_Init()
+static void TOUCH_AF_ExtiConfig(void)
 {
-  stm32_i2c_deinit(TOUCH_I2C_BUS);
-
-  __HAL_RCC_GPIOB_CLK_ENABLE();
   __HAL_RCC_SYSCFG_CLK_ENABLE();
+  LL_SYSCFG_SetEXTISource(TOUCH_INT_EXTI_Port, TOUCH_INT_EXTI_SysCfgLine);
 
-  __HAL_RCC_I2C1_CLK_ENABLE();
-  __HAL_RCC_I2C1_CLK_DISABLE();
-
-  I2C_FreeBus();
-
-  stm32_i2c_init(TOUCH_I2C_BUS, TOUCH_I2C_CLK_RATE);
+  stm32_exti_enable(TOUCH_INT_EXTI_Line,
+		    LL_EXTI_TRIGGER_FALLING,
+		    _cst340_exti_isr);
+}
 
+static void TOUCH_AF_GPIOConfig(void)
+{
   LL_GPIO_InitTypeDef gpioInit;
   LL_GPIO_StructInit(&gpioInit);
 
-  _enable_gpio_clock(TOUCH_RST_GPIO);
-  _enable_gpio_clock(TOUCH_INT_GPIO);
-
-  gpioInit.Pin = TOUCH_RST_GPIO_PIN;
+  stm32_gpio_enable_clock(TOUCH_RST_GPIO);
+  stm32_gpio_enable_clock(TOUCH_INT_GPIO);
+  
   gpioInit.Mode = LL_GPIO_MODE_OUTPUT;
   gpioInit.Speed = LL_GPIO_SPEED_FREQ_LOW;
   gpioInit.OutputType = LL_GPIO_OUTPUT_PUSHPULL;
-  gpioInit.Pull = LL_GPIO_PULL_UP;
+  gpioInit.Pull = LL_GPIO_PULL_NO;
+
+  gpioInit.Pin = TOUCH_RST_GPIO_PIN;
   LL_GPIO_Init(TOUCH_RST_GPIO, &gpioInit);
+  LL_GPIO_SetOutputPin(TOUCH_RST_GPIO, TOUCH_RST_GPIO_PIN);
 
-  //ext interupt
   gpioInit.Pin = TOUCH_INT_GPIO_PIN;
   gpioInit.Mode = LL_GPIO_MODE_INPUT;
   gpioInit.Pull = LL_GPIO_PULL_UP;
-  gpioInit.Speed = LL_GPIO_SPEED_FREQ_HIGH;
   gpioInit.OutputType = LL_GPIO_OUTPUT_OPENDRAIN;
   LL_GPIO_Init(TOUCH_INT_GPIO, &gpioInit);
+  LL_GPIO_SetOutputPin(TOUCH_INT_GPIO, TOUCH_INT_GPIO_PIN);
+}
 
-  LL_SYSCFG_SetEXTISource(TOUCH_INT_EXTI_Port, TOUCH_INT_EXTI_SysCfgLine);
-
-  LL_EXTI_InitTypeDef extiInit;
-  LL_EXTI_StructInit(&extiInit);
-
-  extiInit.Line_0_31 = TOUCH_INT_EXTI_Line;
-  extiInit.Mode = LL_EXTI_MODE_IT;
-  extiInit.Trigger = LL_EXTI_TRIGGER_FALLING;
-  extiInit.LineCommand = ENABLE;
-  LL_EXTI_Init(&extiInit);
+void I2C_Init_Radio(void)
+{
+  TRACE("CST340 I2C Init");
 
-  NVIC_SetPriority(TOUCH_INT_EXTI_IRQn, 8);
-  NVIC_EnableIRQ(TOUCH_INT_EXTI_IRQn);
+  if (stm32_i2c_init(TOUCH_I2C_BUS, TOUCH_I2C_CLK_RATE) < 0) {
+    TRACE("CST340 ERROR: stm32_i2c_init failed");
+    return;
+  }
 }
 
+// void Touch_DeInit()
+// {
+//   I2C_DeInit(I2C_B1);
+//   __HAL_RCC_I2C1_FORCE_RESET();
+//   delay_ms(150);
+//   __HAL_RCC_I2C1_RELEASE_RESET();
+// }
+
 #define I2C_TIMEOUT_MAX 5 // 5 ms
 
 bool touch_i2c_read(uint8_t addr, uint8_t reg, uint8_t * data, uint8_t len)
@@ -226,13 +161,14 @@ static void TS_IO_Write(uint8_t addr, uint8_t reg, uint8_t data)
 
 static uint8_t TS_IO_Read(uint8_t addr, uint8_t reg)
 {
-  uint8_t retult;
+  uint8_t result;
   uint8_t tryCount = 3;
-  while (!touch_i2c_read(addr, reg, &retult, 1)) {
+  while (!touch_i2c_read(addr, reg, &result, 1)) {
     if (--tryCount == 0) break;
-    I2C_Init();
+    I2C_Init_Radio();
+//    I2C_Init();
   }
-  return retult;
+  return result;
 }
 
 static uint16_t TS_IO_ReadMultiple(uint8_t addr, uint8_t reg, uint8_t * buffer, uint16_t length)
@@ -240,7 +176,8 @@ static uint16_t TS_IO_ReadMultiple(uint8_t addr, uint8_t reg, uint8_t * buffer,
   uint8_t tryCount = 3;
   while (!touch_i2c_read(addr, reg, buffer, length)) {
     if (--tryCount == 0) break;
-    I2C_Init();
+    I2C_Init_Radio();
+//    I2C_Init();
   }
   return 1;
 }
@@ -439,6 +376,9 @@ static uint8_t cst340_TS_DetectTouch()
 {
   uint8_t nbTouch;
   uint8_t reg = TS_IO_Read(TOUCH_CST340_I2C_ADDRESS, CST340_FINGER1_REG);
+#if defined(DEBUG)
+  TRACE("cst340_TS_DetectTouch: reg=%d", reg);
+#endif  
   if( reg == 0x06 )
     nbTouch = 1;
   else
@@ -487,9 +427,12 @@ void detectTouchController()
 
 void TouchInit()
 {
-  I2C_Init();
+  TOUCH_AF_GPIOConfig();  // SET RST=OUT INT=IN INT=HIGH
+  I2C_Init_Radio();
   TouchReset();
   detectTouchController();
+  TOUCH_AF_ExtiConfig();
+
   tc->printDebugInfo();
 }
 
@@ -500,6 +443,9 @@ void handleTouch()
   uint32_t tEvent = 0;
   tc->read(&touchX, &touchY, &tEvent);
 
+#if defined(DEBUG)
+  TRACE("handleTouch: touchX=%d, touchY=%d, tEvent=%d", touchX, touchY, tEvent);
+#endif  
   // touch sensor is rotated by 90 deg
   unsigned short tmp = touchY;
   touchY = 319 - touchX;
@@ -538,18 +484,6 @@ void handleTouch()
   }
 }
 
-#if !defined(TOUCH_INT_EXTI_IRQHandler)
-  #error "TOUCH_INT_EXTI_IRQHandler is not defined"
-#endif
-extern "C" void TOUCH_INT_EXTI_IRQHandler(void)
-{
-  if (LL_EXTI_IsEnabledIT_0_31(TOUCH_INT_EXTI_Line)  &&
-      LL_EXTI_IsActiveFlag_0_31(TOUCH_INT_EXTI_Line)) {
-    touchEventOccured = true;
-    LL_EXTI_ClearFlag_0_31(TOUCH_INT_EXTI_Line);
-  }
-}
-
 bool touchPanelEventOccured()
 {
   return touchEventOccured;
@@ -595,6 +529,11 @@ TouchState touchPanelRead()
   internalTouchState.deltaY = 0;
   if(internalTouchState.event == TE_UP || internalTouchState.event == TE_SLIDE_END)
     internalTouchState.event = TE_NONE;
+
+#if defined(DEBUG)
+  TRACE("%s: Event = %d", touchController == TC_CST340 ? "CST340" : "FT6236", ret.event);
+#endif
+
   return ret;
 }