From dea58d21165a648b026274d440f9d99ea33863b8 Mon Sep 17 00:00:00 2001
From: Ken Van Hoeylandt <git@kenvanhoeylandt.net>
Date: Tue, 9 Jun 2026 23:46:10 +0200
Subject: [PATCH] Fix for CoreS3 touch

The FT6 driver does a hardware ID check, which fails on the CoreS3 but
not on Stackchan for some reason. FT5 works on Stackchan, so we'll use
that for all devices, just like M5GFX does.
---
 Devices/m5stack-cores3/CMakeLists.txt             |  2 +-
 Devices/m5stack-cores3/Source/devices/Display.cpp | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/Devices/m5stack-cores3/CMakeLists.txt b/Devices/m5stack-cores3/CMakeLists.txt
index cacfe7fd4..b2553f94b 100644
--- a/Devices/m5stack-cores3/CMakeLists.txt
+++ b/Devices/m5stack-cores3/CMakeLists.txt
@@ -3,5 +3,5 @@ file(GLOB_RECURSE SOURCE_FILES Source/*.c*)
 idf_component_register(
     SRCS ${SOURCE_FILES}
     INCLUDE_DIRS "Source"
-    REQUIRES Tactility esp_lvgl_port ILI934x FT6x36 AXP2101 AW9523 driver vfs fatfs
+    REQUIRES Tactility esp_lvgl_port ILI934x FT5x06 AXP2101 AW9523 driver vfs fatfs
 )
diff --git a/Devices/m5stack-cores3/Source/devices/Display.cpp b/Devices/m5stack-cores3/Source/devices/Display.cpp
index 1da65d856..0c03dea8a 100644
--- a/Devices/m5stack-cores3/Source/devices/Display.cpp
+++ b/Devices/m5stack-cores3/Source/devices/Display.cpp
@@ -1,7 +1,7 @@
 #include "Display.h"
 
 #include <Axp2101.h>
-#include <Ft6x36Touch.h>
+#include <Ft5x06Touch.h>
 #include <Ili934xDisplay.h>
 #include <Tactility/Logger.h>
 #include <Tactility/hal/i2c/I2c.h>
@@ -17,16 +17,13 @@ static void setBacklightDuty(uint8_t backlightDuty) {
 }
 
 static std::shared_ptr<tt::hal::touch::TouchDevice> createTouch() {
-    auto configuration = std::make_unique<Ft6x36Touch::Configuration>(
+    auto configuration = std::make_unique<Ft5x06Touch::Configuration>(
         I2C_NUM_0,
         319,//LCD_HORIZONTAL_RESOLUTION,
-        239,//LCD_VERTICAL_RESOLUTION,
-        false,
-        false,
-        false
+        239//LCD_VERTICAL_RESOLUTION,
     );
 
-    return std::make_shared<Ft6x36Touch>(std::move(configuration));
+    return std::make_shared<Ft5x06Touch>(std::move(configuration));
 }
 
 std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {