dsx2016/bletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix 3.5C path: BL=27, GT911 capacitive touch, draw buffer /20.

Browse Source 
Align cyd_35r with CYD_PROJECT_GUIDE (ST7796+GT911, INT as INPUT after reset); export firmware and scale BLE UI with UX/UY.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
DESKTOP-PUHFO60\dsx2016
2026-10-25 19:19:01 +08:00
parent b65ec37fbe
commit cb647008fc
16 changed files with 473 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/ble_ui.cpp
View File

@@ -230,42 +230,43 @@ void ble_ui_create() {
lv_obj_set_style_text_font(hint, &lv_font_montserrat_14, 0);
lv_obj_set_pos(hint, UX(10), UY(134));
const int bw = 72;
const int bh = 36;
const int btn_y = UI_VER_RES - bh - 8;
const int log_y = 154;
const int log_h = btn_y - log_y - 6; // 不侵入底部按钮带
const int bw = UW(72);
const int bh = UH(36);
const int gap = UW(6);
const int btn_y = UI_VER_RES - bh - UY(8);
const int log_y = UY(154);
const int log_h = btn_y - log_y - UY(6); // 不侵入底部按钮带
lv_obj_t *log_box = lv_obj_create(scr);
lv_obj_set_pos(log_box, 8, log_y);
lv_obj_set_size(log_box, UI_HOR_RES - 16, log_h);
lv_obj_set_pos(log_box, UX(8), log_y);
lv_obj_set_size(log_box, UI_HOR_RES - UW(16), log_h);
lv_obj_set_style_bg_color(log_box, lv_color_hex(0x121A24), 0);
lv_obj_set_style_bg_opa(log_box, LV_OPA_COVER, 0);
lv_obj_set_style_border_width(log_box, 0, 0);
lv_obj_set_style_radius(log_box, 6, 0);
lv_obj_set_style_pad_all(log_box, 6, 0);
lv_obj_set_style_pad_all(log_box, UW(6), 0);
lv_obj_set_scroll_dir(log_box, LV_DIR_VER);
lv_obj_clear_flag(log_box, LV_OBJ_FLAG_SCROLL_ELASTIC);
lbl_log = lv_label_create(log_box);
lv_label_set_text(lbl_log, g_log);
lv_label_set_long_mode(lbl_log, LV_LABEL_LONG_WRAP);
lv_obj_set_width(lbl_log, UI_HOR_RES - 36);
lv_obj_set_width(lbl_log, UI_HOR_RES - UW(36));
lv_obj_set_style_text_color(lbl_log, lv_color_hex(COL_INK), 0);
lv_obj_set_style_text_font(lbl_log, &lv_font_montserrat_14, 0);
btn_adv = make_btn(scr, "Stop Adv", COL_BTN_ACC, on_adv, bw, bh);
lbl_adv = lv_obj_get_child(btn_adv, 0);
lv_obj_set_pos(btn_adv, 8, btn_y);
lv_obj_set_pos(btn_adv, UX(8), btn_y);
lv_obj_t *btn_echo = make_btn(scr, "Echo", COL_BTN, on_echo, bw, bh);
lv_obj_set_pos(btn_echo, 8 + bw + 6, btn_y);
lv_obj_set_pos(btn_echo, UX(8) + bw + gap, btn_y);
lv_obj_t *btn_ping = make_btn(scr, "Ping", COL_BTN_ACC, on_ping, bw, bh);
lv_obj_set_pos(btn_ping, 8 + 2 * (bw + 6), btn_y);
lv_obj_set_pos(btn_ping, UX(8) + 2 * (bw + gap), btn_y);
lv_obj_t *btn_clear = make_btn(scr, "Clear", COL_BTN_WARN, on_clear, bw, bh);
lv_obj_set_pos(btn_clear, 8 + 3 * (bw + 6), btn_y);
lv_obj_set_pos(btn_clear, UX(8) + 3 * (bw + gap), btn_y);
refresh_static();
refresh_state();

13
src/main.cpp
View File

@@ -1,4 +1,5 @@
#include <Arduino.h>
#include <esp_heap_caps.h>
#include <lvgl.h>
#include "ble_core.h"
@@ -7,8 +8,8 @@
#include "touch.h"
static constexpr uint32_t DRAW_BUF_SIZE =
(SCREEN_WIDTH * SCREEN_HEIGHT / 10 * (LV_COLOR_DEPTH / 8));
static uint32_t draw_buf[DRAW_BUF_SIZE / 4];
(SCREEN_WIDTH * SCREEN_HEIGHT / DRAW_BUF_DIV * (LV_COLOR_DEPTH / 8));
static uint32_t *draw_buf = nullptr;
void setup() {
Serial.begin(460800);
@@ -22,9 +23,15 @@ void setup() {
touch_init();
draw_buf = (uint32_t *)heap_caps_malloc(DRAW_BUF_SIZE, MALLOC_CAP_DMA | MALLOC_CAP_8BIT);
if (!draw_buf) {
Serial.println("FATAL: draw_buf alloc failed");
while (true) delay(1000);
}
lv_init();
lv_display_t *disp =
lv_tft_espi_create(SCREEN_WIDTH, SCREEN_HEIGHT, draw_buf, sizeof(draw_buf));
lv_tft_espi_create(SCREEN_WIDTH, SCREEN_HEIGHT, draw_buf, DRAW_BUF_SIZE);
lv_display_set_rotation(disp, LV_DISPLAY_ROTATION_270);
lv_indev_t *indev = lv_indev_create();

214
src/touch.cpp
View File

@@ -3,11 +3,188 @@
#include <Arduino.h>
#if defined(CYD_BOARD_3248S035)
#include <Wire.h>
#endif
/**
* SoftSPI XPT2046（与 tftest 相同校准）
* BL↔TR 主对角线镜像修正，配合 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;
int16_t g_dbg_phys_y = -1;
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. */
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);
@@ -42,16 +219,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);
@@ -60,6 +227,7 @@ void touch_init() {
pinMode(CYD_TOUCH_IRQ, INPUT);
digitalWrite(CYD_TOUCH_CS, HIGH);
digitalWrite(CYD_TOUCH_CLK, LOW);
Serial.println("Touch: SoftSPI + diagonal fix (BL/TR)");
}
void touch_read_cb(lv_indev_t * /*indev*/, lv_indev_data_t *data) {
@@ -74,6 +242,7 @@ void touch_read_cb(lv_indev_t * /*indev*/, lv_indev_data_t *data) {
if (!in_range || (!irq && (adc_x < 200 || adc_y < 200))) {
data->state = LV_INDEV_STATE_RELEASED;
g_dbg_touch_down = false;
return;
}
@@ -92,7 +261,24 @@ 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);
data->point.x = (int16_t)((SCREEN_WIDTH - 1) - ui_y);
data->point.y = ui_x;
const int16_t feed_x = (int16_t)((SCREEN_WIDTH - 1) - ui_y);
const int16_t feed_y = ui_x;
g_dbg_phys_x = x;
g_dbg_phys_y = y;
g_dbg_logic_x = ui_x;
g_dbg_logic_y = ui_y;
g_dbg_touch_down = true;
static uint32_t last_log = 0;
if (millis() - last_log > 80) {
last_log = millis();
Serial.printf("Touch UI(%d,%d)\n", ui_x, ui_y);
}
data->point.x = feed_x;
data->point.y = feed_y;
data->state = LV_INDEV_STATE_PRESSED;
}
#endif