adolforeyna/tactility
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tab5 ST7121 variant + fixes (#605)

Browse Source 
Added the newest variant to the tab5, St7121.
Fixed variant detection reliability
Fixed tab5 camera WHO_AM_I failing sometimes
Fixed tab5 keyboard live rotation on boot and after stopping/starting lvgl
This commit is contained in:
Shadowtrance
2026-08-02 04:50:55 +10:00
committed by GitHub
parent d72d5a0ef2
commit 85fe1a319a
31 changed files with 1531 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Devices/m5stack-tab5/Source/devices/detect.cpp
+34 -2
View File
@@ -21,6 +21,34 @@ void tab5_set_variant(Tab5Variant variant) {
detected_variant = variant;
}
// The ST7123 (V2) and ST7121 (V3) touch controllers share the same fixed I2C address, so presence
// alone doesn't distinguish them. Both expose a firmware-version byte at register 0x0000 (a 16-bit
// register address, per ESP_LCD_TOUCH_IO_I2C_ST7123_CONFIG's lcd_cmd_bits=16 - see the M5Tab5
// UserDemo's bsp_detect_display_type()): fw_version 1 means ST7121/V3, fw_version 3 means
// ST7123/V2. Returns false (leaving *out_variant untouched) if the register read fails or reports
// an unrecognized value, so the caller's outer attempt loop can retry rather than the touch IC's
// transient not-finished-booting state permanently misdetecting V3 hardware as V2.
static bool probe_st7123_or_st7121_variant(Device* i2c0, TickType_t timeout, Tab5Variant* out_variant) {
const uint8_t reg_addr[2] = {0x00, 0x00};
uint8_t fw_version = 0;
if (i2c_controller_write_read(i2c0, ESP_LCD_TOUCH_IO_I2C_ST7123_ADDRESS, reg_addr, sizeof(reg_addr), &fw_version, 1, timeout) != ERROR_NONE) {
LOG_W(TAG, "display_detect: failed to read touch FW version, retrying");
return false;
}
if (fw_version == 1) {
LOG_I(TAG, "display_detect: detected ST7121 touch (FW version 1) — using variant V3");
*out_variant = Tab5Variant::V3;
return true;
}
if (fw_version == 3) {
LOG_I(TAG, "display_detect: detected ST7123 touch (FW version 3) — using variant V2");
*out_variant = Tab5Variant::V2;
return true;
}
LOG_W(TAG, "display_detect: touch at ST7123 address reported unknown FW version %u, retrying", fw_version);
return false;
}
Tab5Variant tab5_probe_variant(Device* i2c0) {
// Allow time for the touch IC to fully boot after the reset pulse above: 100ms is enough for
// I2C ACK (probe) but cold power-on needs ~300ms before register reads succeed reliably.
@@ -36,8 +64,12 @@ Tab5Variant tab5_probe_variant(Device* i2c0) {
}
if (i2c_controller_has_device_at_address(i2c0, ESP_LCD_TOUCH_IO_I2C_ST7123_ADDRESS, PROBE_TIMEOUT) == ERROR_NONE) {
LOG_I(TAG, "display_detect: detected ST7123 touch — using variant V2");
return Tab5Variant::V2;
Tab5Variant variant;
if (probe_st7123_or_st7121_variant(i2c0, PROBE_TIMEOUT, &variant)) {
return variant;
}
// FW-version read failed/unrecognized - fall through to the retry delay below instead
// of giving up immediately, same as an address-probe miss.
}
vTaskDelay(pdMS_TO_TICKS(100));