Fix 3.5 KY-009: backlight GPIO27 and G on GPIO21.

Align cyd_35r with CYD_PROJECT_GUIDE (ST7796/GT911), export flashable firmware/cyd_35r. Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-25 11:33:47 +08:00
parent 9f8d8279f0
commit 39fa51c48e
18 changed files with 443 additions and 78 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -7,7 +7,7 @@
 #include "ui.h"

 static constexpr uint32_t DRAW_BUF_SIZE =
-    (SCREEN_WIDTH * SCREEN_HEIGHT / 10 * (LV_COLOR_DEPTH / 8));
+    (SCREEN_WIDTH * SCREEN_HEIGHT / DRAW_BUF_DIV * (LV_COLOR_DEPTH / 8));
 static uint32_t draw_buf[DRAW_BUF_SIZE / 4];

 void setup() {
--- a/src/touch.cpp
+++ b/src/touch.cpp
@@ -3,10 +3,13 @@

 #include <Arduino.h>

+#if defined(CYD_BOARD_3248S035)
+#include <Wire.h>
+#endif
+
 /**
- * SoftSPI XPT2046
- * BL↔TR 是矩形主对角线镜像（XY 对调），不是 180°（180° 会搞成 TL↔BR）。
- * 先按 rot2 得到旧 UI，再做对角修正，反变换喂给 LVGL 270。
+ * 2.8": dedicated SoftSPI + BL/TR diagonal fix.
+ * 3.5C (3248S035C): capacitive GT911 on I2C SDA33/SCL32/INT21/RST25.
 */

 int16_t g_dbg_phys_x = -1;
@@ -15,6 +18,174 @@ int16_t g_dbg_logic_x = -1;
 int16_t g_dbg_logic_y = -1;
 bool g_dbg_touch_down = false;

+static int16_t clampi(int32_t v, int32_t lo, int32_t hi) {
+  if (v < lo) {
+    return (int16_t)lo;
+  }
+  if (v > hi) {
+    return (int16_t)hi;
+  }
+  return (int16_t)v;
+}
+
+#if defined(CYD_BOARD_3248S035)
+
+/* Minimal GT911 — no config rewrite (TAMC setResolution can hang Wire). */
+static uint8_t s_gt_addr = 0x5D;
+static constexpr uint16_t GT_POINT_INFO = 0x814E;
+static constexpr uint16_t GT_POINT_1 = 0x814F;
+
+static bool gt_write8(uint16_t reg, uint8_t val) {
+  Wire.beginTransmission(s_gt_addr);
+  Wire.write((uint8_t)(reg >> 8));
+  Wire.write((uint8_t)(reg & 0xFF));
+  Wire.write(val);
+  return Wire.endTransmission() == 0;
+}
+
+static bool gt_read(uint16_t reg, uint8_t *buf, uint8_t len) {
+  Wire.beginTransmission(s_gt_addr);
+  Wire.write((uint8_t)(reg >> 8));
+  Wire.write((uint8_t)(reg & 0xFF));
+  if (Wire.endTransmission(false) != 0) {
+    return false;
+  }
+  const uint8_t n = Wire.requestFrom(s_gt_addr, len);
+  if (n != len) {
+    return false;
+  }
+  for (uint8_t i = 0; i < len; i++) {
+    buf[i] = Wire.read();
+  }
+  return true;
+}
+
+static bool gt_probe(uint8_t addr) {
+  Wire.beginTransmission(addr);
+  return Wire.endTransmission() == 0;
+}
+
+/* TAMC-compatible address select: INT low => 0x5D, INT high => 0x14 */
+static void gt_hw_reset(bool addr_0x14) {
+  pinMode(CYD_GT911_INT, OUTPUT);
+  pinMode(CYD_GT911_RST, OUTPUT);
+  digitalWrite(CYD_GT911_INT, LOW);
+  digitalWrite(CYD_GT911_RST, LOW);
+  delay(10);
+  digitalWrite(CYD_GT911_INT, addr_0x14 ? HIGH : LOW);
+  delay(1);
+  digitalWrite(CYD_GT911_RST, HIGH);
+  delay(5);
+  digitalWrite(CYD_GT911_INT, LOW);
+  delay(50);
+  /* Backlight is GPIO27 — leave INT as input for polling / optional IRQ.
+   * GPIO21 may also drive KY-009 G (PWM after lamp_init); GT911 uses I2C poll. */
+  pinMode(CYD_GT911_INT, INPUT);
+  delay(50);
+}
+
+static bool gt_find_addr() {
+  for (uint8_t a : {uint8_t(0x5D), uint8_t(0x14)}) {
+    if (gt_probe(a)) {
+      s_gt_addr = a;
+      return true;
+    }
+  }
+  return false;
+}
+
+void touch_init() {
+  Serial.println("Touch: GT911 I2C capacitive (3.5C) minimal");
+  Wire.begin(CYD_GT911_SDA, CYD_GT911_SCL);
+  Wire.setClock(100000);
+#if defined(WIRE_HAS_TIMEOUT) || defined(ESP32)
+  Wire.setTimeOut(50);
+#endif
+
+  if (!gt_find_addr()) {
+    Serial.println("GT911 not found — hw reset 0x5D");
+    gt_hw_reset(false);
+    if (!gt_find_addr()) {
+      Serial.println("GT911 not found — hw reset 0x14");
+      gt_hw_reset(true);
+      gt_find_addr();
+    }
+  }
+
+  Serial.printf("GT911 probe 0x5D=%s 0x14=%s using=0x%02X\n",
+                gt_probe(0x5D) ? "OK" : "no", gt_probe(0x14) ? "OK" : "no",
+                s_gt_addr);
+  Serial.printf("GT911 SDA=%d SCL=%d INT=%d RST=%d\n", CYD_GT911_SDA,
+                CYD_GT911_SCL, CYD_GT911_INT, CYD_GT911_RST);
+}
+
+void touch_read_cb(lv_indev_t * /*indev*/, lv_indev_data_t *data) {
+  uint8_t info = 0;
+  static uint32_t last_log = 0;
+  const bool do_log = (millis() - last_log > 200);
+
+  if (!gt_read(GT_POINT_INFO, &info, 1)) {
+    data->state = LV_INDEV_STATE_RELEASED;
+    g_dbg_touch_down = false;
+    if (do_log) {
+      last_log = millis();
+      Serial.println("TouchProbe GT911 I2C err");
+    }
+    return;
+  }
+
+  const uint8_t touches = info & 0x0F;
+  const bool buffered = (info & 0x80) != 0;
+
+  if (!buffered || touches == 0) {
+    if (buffered) {
+      gt_write8(GT_POINT_INFO, 0);
+    }
+    data->state = LV_INDEV_STATE_RELEASED;
+    g_dbg_touch_down = false;
+    return;
+  }
+
+  uint8_t pt[7];
+  if (!gt_read(GT_POINT_1, pt, 7)) {
+    gt_write8(GT_POINT_INFO, 0);
+    data->state = LV_INDEV_STATE_RELEASED;
+    g_dbg_touch_down = false;
+    return;
+  }
+  gt_write8(GT_POINT_INFO, 0);
+
+  const int16_t raw_x = (int16_t)(pt[1] | (pt[2] << 8));
+  const int16_t raw_y = (int16_t)(pt[3] | (pt[4] << 8));
+
+  /* Native 320x480 → LVGL 270. Mirror long axis so L/R matches UI
+   * (else preset 3 hits 10). Resulting UI ≈ (H-1-raw_y, raw_x). */
+  const int16_t nx = clampi(raw_x, 0, SCREEN_WIDTH - 1);
+  const int16_t ny = clampi(raw_y, 0, SCREEN_HEIGHT - 1);
+  const int16_t feed_x = (int16_t)((SCREEN_WIDTH - 1) - nx);
+  const int16_t feed_y = (int16_t)((SCREEN_HEIGHT - 1) - ny);
+  const int16_t ui_x = (int16_t)((SCREEN_HEIGHT - 1) - ny);
+  const int16_t ui_y = nx;
+
+  g_dbg_phys_x = raw_x;
+  g_dbg_phys_y = raw_y;
+  g_dbg_logic_x = ui_x;
+  g_dbg_logic_y = ui_y;
+  g_dbg_touch_down = true;
+
+  if (do_log) {
+    last_log = millis();
+    Serial.printf("Touch HIT GT911 raw(%d,%d) ~ui(%d,%d)\n", raw_x, raw_y,
+                  ui_x, ui_y);
+  }
+
+  data->point.x = feed_x;
+  data->point.y = feed_y;
+  data->state = LV_INDEV_STATE_PRESSED;
+}
+
+#else
+
 static void soft_write(uint8_t data) {
  for (int i = 7; i >= 0; --i) {
    digitalWrite(CYD_TOUCH_MOSI, (data >> i) & 1);
@@ -49,16 +220,6 @@ static uint16_t xpt_read(uint8_t cmd) {
  return v;
 }

-static int16_t clampi(int32_t v, int32_t lo, int32_t hi) {
-  if (v < lo) {
-    return (int16_t)lo;
-  }
-  if (v > hi) {
-    return (int16_t)hi;
-  }
-  return (int16_t)v;
-}
-
 void touch_init() {
  pinMode(CYD_TOUCH_CS, OUTPUT);
  pinMode(CYD_TOUCH_CLK, OUTPUT);
@@ -94,8 +255,6 @@ void touch_read_cb(lv_indev_t * /*indev*/, lv_indev_data_t *data) {
  x = clampi(x, 0, SCREEN_WIDTH - 1);
  y = clampi(y, 0, SCREEN_HEIGHT - 1);

-  // 旧 UI（LVGL270）：(y, 239-x) — 该空间里 BL↔TR，做主对角线镜像
-  // (ux,uy) -> (uy*(319/239), ux*(239/319))
  const int32_t old_ux = y;
  const int32_t old_uy = (SCREEN_WIDTH - 1) - x;
  int16_t ui_x = clampi((old_uy * (UI_HOR_RES - 1)) / (UI_VER_RES - 1), 0,
@@ -103,7 +262,6 @@ void touch_read_cb(lv_indev_t * /*indev*/, lv_indev_data_t *data) {
  int16_t ui_y = clampi((old_ux * (UI_VER_RES - 1)) / (UI_HOR_RES - 1), 0,
                        UI_VER_RES - 1);

-  // 反变换喂 LVGL，使最终落在 (ui_x, ui_y)
  const int16_t feed_x = (int16_t)((SCREEN_WIDTH - 1) - ui_y);
  const int16_t feed_y = ui_x;

@@ -123,3 +281,5 @@ void touch_read_cb(lv_indev_t * /*indev*/, lv_indev_data_t *data) {
  data->point.y = feed_y;
  data->state = LV_INDEV_STATE_PRESSED;
 }
+
+#endif
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -118,7 +118,7 @@ static lv_obj_t *make_color_btn(lv_obj_t *scr, const char *txt, int x,
                                lamp_color_t c, lv_obj_t **out_lbl) {
  lv_obj_t *btn = lv_button_create(scr);
  lv_obj_set_size(btn, UW(88), UH(40));
-  lv_obj_align(btn, LV_ALIGN_TOP_LEFT, x, 72);
+  lv_obj_align(btn, LV_ALIGN_TOP_LEFT, UX(x), UY(72));
  style_btn(btn, COL_BTN);
  lv_obj_add_event_cb(btn, on_color, LV_EVENT_CLICKED, (void *)(uintptr_t)c);
  lv_obj_t *lbl = lv_label_create(btn);