Make T114 screen detection the default firmware and picker choice

This commit is contained in:
mikecarper committed 2026-10-18 16:20:27 -07:00
1 parent 864d0cacff
commit 1ce3f0cdd7
22 files changed
+1686 -124

No files matched your search

+66 -2
View File
@@ -2,6 +2,13 @@
#include "ST7789Display.h"
#if defined(HELTEC_T114) && defined(T114_DISPLAY_AUTODETECT) && T114_DISPLAY_AUTODETECT
#include "T114DisplayProbe.h"
extern const char meshcore_capability_display_autodetect_t114[];
const char meshcore_capability_display_autodetect_t114[] =
"meshcore.capability.display.autodetect.t114.v1";
#endif
// Native coordinates; controller RAM offsets are handled by ST7789Spi.
// Color scheme
@@ -16,18 +23,43 @@ ColorVal UIColor::popup_txt = OLEDDISPLAY_COLOR::WHITE;
ColorVal UIColor::corp_blue = OLEDDISPLAY_COLOR::WHITE;
bool ST7789Display::begin() {
#if defined(HELTEC_T114) && defined(T114_DISPLAY_AUTODETECT) && T114_DISPLAY_AUTODETECT
if (!_probeComplete) {
const volatile char* capability = meshcore_capability_display_autodetect_t114;
(void)*capability; // Anchor the capability in the executed detection path.
_probeComplete = true;
_present = mesh::ui::t114::probe();
}
if (!_present) return false;
#endif
if(!_isOn) {
pinMode(PIN_TFT_VDD_CTL, OUTPUT);
pinMode(PIN_TFT_LEDA_CTL, OUTPUT);
digitalWrite(PIN_TFT_VDD_CTL, LOW);
#if defined(HELTEC_T114) && defined(T114_DISPLAY_AUTODETECT) && T114_DISPLAY_AUTODETECT
#ifdef PIN_TFT_LEDA_CTL_ACTIVE
digitalWrite(PIN_TFT_LEDA_CTL, !PIN_TFT_LEDA_CTL_ACTIVE);
#else
digitalWrite(PIN_TFT_LEDA_CTL, HIGH);
#endif
#else
#ifdef PIN_TFT_LEDA_CTL_ACTIVE
digitalWrite(PIN_TFT_LEDA_CTL, PIN_TFT_LEDA_CTL_ACTIVE);
#else
digitalWrite(PIN_TFT_LEDA_CTL, LOW);
#endif
#endif
digitalWrite(PIN_TFT_RST, HIGH);
display.init();
if (!display.init()) {
#if defined(HELTEC_T114) && defined(T114_DISPLAY_AUTODETECT) && T114_DISPLAY_AUTODETECT
_present = false;
mesh::ui::t114::powerOff();
#else
turnOff();
#endif
return false;
}
display.landscapeScreen();
#ifdef DISPLAY_FLIP_VERTICALLY
display.flipScreenVertically();
@@ -36,18 +68,36 @@ bool ST7789Display::begin() {
setCursor(0,0);
_isOn = true;
#if defined(HELTEC_T114) && defined(T114_DISPLAY_AUTODETECT) && T114_DISPLAY_AUTODETECT
#ifdef PIN_TFT_LEDA_CTL_ACTIVE
digitalWrite(PIN_TFT_LEDA_CTL, PIN_TFT_LEDA_CTL_ACTIVE);
#else
digitalWrite(PIN_TFT_LEDA_CTL, LOW);
#endif
#endif
}
return true;
}
void ST7789Display::turnOn() {
#if defined(HELTEC_T114) && defined(T114_DISPLAY_AUTODETECT) && T114_DISPLAY_AUTODETECT
if (!_present) return;
#endif
if (!_isOn) {
// Restore power to the display but keep backlight off
digitalWrite(PIN_TFT_VDD_CTL, LOW);
digitalWrite(PIN_TFT_RST, HIGH);
// Re-initialize the same native landscape geometry after wake.
display.init();
if (!display.init()) {
#if defined(HELTEC_T114) && defined(T114_DISPLAY_AUTODETECT) && T114_DISPLAY_AUTODETECT
_present = false;
mesh::ui::t114::powerOff();
#else
turnOff();
#endif
return;
}
display.landscapeScreen();
display.displayOn();
#ifdef DISPLAY_FLIP_VERTICALLY
@@ -66,6 +116,9 @@ void ST7789Display::turnOn() {
}
void ST7789Display::turnOff() {
#if defined(HELTEC_T114) && defined(T114_DISPLAY_AUTODETECT) && T114_DISPLAY_AUTODETECT
if (!_present) return;
#endif
digitalWrite(PIN_TFT_VDD_CTL, HIGH);
#ifdef PIN_TFT_LEDA_CTL_ACTIVE
digitalWrite(PIN_TFT_LEDA_CTL, !PIN_TFT_LEDA_CTL_ACTIVE);
@@ -77,16 +130,19 @@ void ST7789Display::turnOff() {
}
void ST7789Display::clear() {
if (!canDraw()) return;
display.clear();
}
void ST7789Display::startFrame(ColorVal bkg) {
if (!canDraw()) return;
display.clear(); // TODO: use bkg
setColor(UIColor::primary_txt);
setTextSize(1);
}
void ST7789Display::setTextSize(int sz) {
if (!canDraw()) return;
_line_height = sz == 2 ? 26 : 18;
switch(sz) {
case 1 :
@@ -101,6 +157,7 @@ void ST7789Display::setTextSize(int sz) {
}
void ST7789Display::setColor(ColorVal c) {
if (!canDraw()) return;
_color = c;
display.setColor((OLEDDISPLAY_COLOR)_color);
display.setRGB(_color == OLEDDISPLAY_COLOR::WHITE ? ST77XX_WHITE : ST77XX_BLACK);
@@ -112,22 +169,27 @@ void ST7789Display::setCursor(int x, int y) {
}
void ST7789Display::print(const char* str) {
if (!canDraw()) return;
display.drawString(_x, _y, str);
}
void ST7789Display::printWordWrap(const char* str, int max_width) {
if (!canDraw()) return;
display.drawStringMaxWidth(_x, _y, max_width, str);
}
void ST7789Display::fillRect(int x, int y, int w, int h) {
if (!canDraw()) return;
display.fillRect(x, y, w, h);
}
void ST7789Display::drawRect(int x, int y, int w, int h) {
if (!canDraw()) return;
display.drawRect(x, y, w, h);
}
void ST7789Display::drawXbm(int x, int y, const uint8_t* bits, int w, int h) {
if (!canDraw()) return;
if (!bits || w <= 0 || h <= 0) return;
const int stride = (w + 7) / 8;
for (int row = 0; row < h; ++row)
@@ -137,10 +199,12 @@ void ST7789Display::drawXbm(int x, int y, const uint8_t* bits, int w, int h) {
}
uint16_t ST7789Display::getTextWidth(const char* str) {
if (!canDraw()) return 0;
return display.getStringWidth(str);
}
void ST7789Display::endFrame() {
if (!canDraw()) return;
display.display();
}
+12
View File
@@ -13,6 +13,18 @@ class ST7789Display : public DisplayDriver {
int _x=0, _y=0;
int _line_height = 18;
#if defined(HELTEC_T114) && defined(T114_DISPLAY_AUTODETECT) && T114_DISPLAY_AUTODETECT
bool _probeComplete = false;
bool _present = false;
#endif
bool canDraw() const {
#if defined(HELTEC_T114) && defined(T114_DISPLAY_AUTODETECT) && T114_DISPLAY_AUTODETECT
return _isOn;
#else
return true;
#endif
}
bool i2c_probe(TwoWire& wire, uint8_t addr);
public:
#if defined(HELTEC_VISION_MASTER_T190)
+5
View File
@@ -145,6 +145,11 @@ class ST7789Spi : public OLEDDisplay {
digitalWrite(_rst, LOW);
delay(10);
digitalWrite(_rst, HIGH);
#if defined(HELTEC_T114) && defined(T114_DISPLAY_AUTODETECT) && T114_DISPLAY_AUTODETECT
// Reset reloads the panel's NVM. Allow commands after >=5 ms and
// Sleep Out after >=120 ms, including reinitialization after wake.
delay(120);
#endif
_spi->begin ();
//digitalWrite(_ledA, LED_A_ON);
return true;
+100
View File
@@ -0,0 +1,100 @@
#pragma once
#include <Arduino.h>
namespace mesh { namespace ui { namespace t114 {
// The stock ST7789V2 shares command/output data on SDA; SPI1's MISO is not
// connected to the panel. Read before starting SPI1 or allocating its buffers.
inline uint32_t readDisplayId(uint8_t bias) {
digitalWrite(PIN_TFT_CS, LOW);
digitalWrite(PIN_TFT_DC, LOW);
pinMode(PIN_TFT_SDA, OUTPUT);
for (uint8_t mask = 0x80; mask; mask >>= 1) {
digitalWrite(PIN_TFT_SDA, (0x04 & mask) ? HIGH : LOW); // RDDID
delayMicroseconds(5);
digitalWrite(PIN_TFT_SCL, HIGH);
delayMicroseconds(5);
// The panel may drive SDA on the last command bit's falling edge.
// Release our output after that bit was latched, before lowering SCL.
if (mask == 1) pinMode(PIN_TFT_SDA, bias);
digitalWrite(PIN_TFT_SCL, LOW);
}
digitalWrite(PIN_TFT_DC, HIGH);
// RDDID has one turnaround/dummy clock before its three ID bytes.
delayMicroseconds(5);
digitalWrite(PIN_TFT_SCL, HIGH);
delayMicroseconds(5);
digitalWrite(PIN_TFT_SCL, LOW);
uint32_t id = 0;
for (uint8_t bit = 0; bit < 24; ++bit) {
delayMicroseconds(5);
id = (id << 1) | (digitalRead(PIN_TFT_SDA) ? 1u : 0u);
digitalWrite(PIN_TFT_SCL, HIGH);
delayMicroseconds(5);
digitalWrite(PIN_TFT_SCL, LOW);
}
digitalWrite(PIN_TFT_CS, HIGH);
return id;
}
inline void powerOff() {
#ifdef PIN_TFT_LEDA_CTL_ACTIVE
digitalWrite(PIN_TFT_LEDA_CTL, !PIN_TFT_LEDA_CTL_ACTIVE);
#else
digitalWrite(PIN_TFT_LEDA_CTL, HIGH);
#endif
digitalWrite(PIN_TFT_RST, LOW);
digitalWrite(PIN_TFT_VDD_CTL, HIGH);
// Avoid feeding an unpowered/absent panel through its bus pins.
pinMode(PIN_TFT_CS, INPUT);
pinMode(PIN_TFT_DC, INPUT);
pinMode(PIN_TFT_SDA, INPUT);
pinMode(PIN_TFT_SCL, INPUT);
}
inline bool probe() {
#ifdef PIN_TFT_LEDA_CTL_ACTIVE
digitalWrite(PIN_TFT_LEDA_CTL, !PIN_TFT_LEDA_CTL_ACTIVE);
#else
digitalWrite(PIN_TFT_LEDA_CTL, HIGH);
#endif
pinMode(PIN_TFT_LEDA_CTL, OUTPUT);
digitalWrite(PIN_TFT_VDD_CTL, HIGH);
pinMode(PIN_TFT_VDD_CTL, OUTPUT);
digitalWrite(PIN_TFT_CS, HIGH);
pinMode(PIN_TFT_CS, OUTPUT);
digitalWrite(PIN_TFT_SCL, LOW);
pinMode(PIN_TFT_SCL, OUTPUT);
pinMode(PIN_TFT_DC, OUTPUT);
digitalWrite(PIN_TFT_RST, LOW);
pinMode(PIN_TFT_RST, OUTPUT);
digitalWrite(PIN_TFT_VDD_CTL, LOW);
for (uint8_t attempt = 0; attempt < 2; ++attempt) {
digitalWrite(PIN_TFT_RST, LOW);
delay(10);
digitalWrite(PIN_TFT_RST, HIGH);
// NVM ID loading needs >=5 ms after reset; 120 ms also covers Sleep Out.
delay(120);
uint32_t ids[2];
bool stable = true;
for (uint8_t bias = 0; bias < 2; ++bias) {
const uint8_t mode = bias == 0 ? INPUT_PULLUP : INPUT_PULLDOWN;
(void)readDisplayId(mode); // The stock panel needs an initial read.
ids[bias] = readDisplayId(mode);
stable = (readDisplayId(mode) == ids[bias]) && stable;
}
// IDs are factory-programmable. Check driven, stable data instead of a
// single magic value; opposite pulls expose a floating/absent SDA line.
if (stable && ids[0] == ids[1] && ids[0] != 0 && ids[0] != 0xFFFFFFu) {
pinMode(PIN_TFT_SDA, INPUT);
return true;
}
}
powerOff();
return false;
}
}}} // namespace mesh::ui::t114