Skip to content

feat: Add waveshare 1.75 amoled #482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 6, 2025
Merged

feat: Add waveshare 1.75 amoled #482

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7371124
feat: Add waveshare 1.75 amoled
jniebuhr Nov 5, 2025
89274e7
fix: Fix code review feedback
jniebuhr Nov 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/display/core/Controller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
#include <display/plugins/WebUIPlugin.h>
#include <display/plugins/mDNSPlugin.h>
#ifndef GAGGIMATE_HEADLESS
#include <display/drivers/AmoledDisplayDriver.h>
#include <display/drivers/LilyGoDriver.h>
#include <display/drivers/LilyGoTDisplayDriver.h>
#include <display/drivers/WaveshareDriver.h>
#endif

Expand Down Expand Up @@ -112,8 +112,8 @@ void Controller::connect() {

#ifndef GAGGIMATE_HEADLESS
void Controller::setupPanel() {
if (LilyGoTDisplayDriver::getInstance()->isCompatible()) {
driver = LilyGoTDisplayDriver::getInstance();
if (AmoledDisplayDriver::getInstance()->isCompatible()) {
driver = AmoledDisplayDriver::getInstance();
} else if (LilyGoDriver::getInstance()->isCompatible()) {
driver = LilyGoDriver::getInstance();
} else if (WaveshareDriver::getInstance()->isCompatible()) {
Expand Down
142 changes: 77 additions & 65 deletions ...-T-Display-S3-DS/LilyGo_TDisplayPanel.cpp → ...ers/AmoledDisplay/Amoled_DisplayPanel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
#include "LilyGo_TDisplayPanel.h"
#include "Amoled_DisplayPanel.h"
#include "Arduino_GFX_Library.h"
#include "pin_config.h"
#include <esp_adc_cal.h>

LilyGo_TDisplayPanel::LilyGo_TDisplayPanel()
: displayBus(nullptr), display(nullptr), _touchDrv(nullptr), _wakeupMethod(LILYGO_T_DISPLAY_WAKEUP_FROM_NONE),
Amoled_DisplayPanel::Amoled_DisplayPanel(AmoledHwConfig hw_config)
: hwConfig(hw_config), displayBus(nullptr), display(nullptr), _touchDrv(nullptr), _wakeupMethod(WAKEUP_FROM_NONE),
_sleepTimeUs(0), currentBrightness(0) {
_rotation = 0;
}

LilyGo_TDisplayPanel::~LilyGo_TDisplayPanel() {
Amoled_DisplayPanel::~Amoled_DisplayPanel() {
uninstallSD();

if (_touchDrv) {
Expand All @@ -18,7 +18,7 @@ LilyGo_TDisplayPanel::~LilyGo_TDisplayPanel() {
}
if (display) {
display->setBrightness(0);
digitalWrite(LCD_EN, LOW);
digitalWrite(hwConfig.lcd_en, LOW);
delete display;
display = nullptr;
}
Expand All @@ -28,7 +28,7 @@ LilyGo_TDisplayPanel::~LilyGo_TDisplayPanel() {
}
}

bool LilyGo_TDisplayPanel::begin(LilyGo_TDisplayPanel_Color_Order order) {
bool Amoled_DisplayPanel::begin(Amoled_Display_Panel_Color_Order order) {
bool success = true;

success &= initTouch();
Expand All @@ -37,22 +37,22 @@ bool LilyGo_TDisplayPanel::begin(LilyGo_TDisplayPanel_Color_Order order) {
return success;
}

bool LilyGo_TDisplayPanel::installSD() {
pinMode(SD_CS, OUTPUT);
digitalWrite(SD_CS, HIGH);
bool Amoled_DisplayPanel::installSD() {
pinMode(hwConfig.sd_cs, OUTPUT);
digitalWrite(hwConfig.sd_cs, HIGH);

SD_MMC.setPins(SD_SCLK, SD_MOSI, SD_MISO);
SD_MMC.setPins(hwConfig.sd_sclk, hwConfig.sd_mosi, hwConfig.sd_miso);

return SD_MMC.begin("/sdcard", true, false);
}

void LilyGo_TDisplayPanel::uninstallSD() {
void Amoled_DisplayPanel::uninstallSD() {
SD_MMC.end();
digitalWrite(SD_CS, LOW);
pinMode(SD_CS, INPUT);
digitalWrite(hwConfig.sd_cs, LOW);
pinMode(hwConfig.sd_cs, INPUT);
}

void LilyGo_TDisplayPanel::setBrightness(uint8_t level) {
void Amoled_DisplayPanel::setBrightness(uint8_t level) {
uint16_t brightness = level * 16;

brightness = brightness > 255 ? 255 : brightness;
Expand All @@ -72,58 +72,58 @@ void LilyGo_TDisplayPanel::setBrightness(uint8_t level) {
this->currentBrightness = brightness;
}

uint8_t LilyGo_TDisplayPanel::getBrightness() { return (this->currentBrightness + 1) / 16; }
uint8_t Amoled_DisplayPanel::getBrightness() { return (this->currentBrightness + 1) / 16; }

LilyGo_TDisplayPanel_Type LilyGo_TDisplayPanel::getModel() { return panelType; }
Amoled_Display_Panel_Type Amoled_DisplayPanel::getModel() { return panelType; }

const char *LilyGo_TDisplayPanel::getTouchModelName() { return _touchDrv->getModelName(); }
const char *Amoled_DisplayPanel::getTouchModelName() { return _touchDrv->getModelName(); }

void LilyGo_TDisplayPanel::enableTouchWakeup() { _wakeupMethod = LILYGO_T_DISPLAY_WAKEUP_FROM_TOUCH; }
void Amoled_DisplayPanel::enableTouchWakeup() { _wakeupMethod = WAKEUP_FROM_TOUCH; }

void LilyGo_TDisplayPanel::enableButtonWakeup() { _wakeupMethod = LILYGO_T_DISPLAY_WAKEUP_FROM_BUTTON; }
void Amoled_DisplayPanel::enableButtonWakeup() { _wakeupMethod = WAKEUP_FROM_BUTTON; }

void LilyGo_TDisplayPanel::enableTimerWakeup(uint64_t time_in_us) {
_wakeupMethod = LILYGO_T_DISPLAY_WAKEUP_FROM_TIMER;
void Amoled_DisplayPanel::enableTimerWakeup(uint64_t time_in_us) {
_wakeupMethod = WAKEUP_FROM_TIMER;
_sleepTimeUs = time_in_us;
}

void LilyGo_TDisplayPanel::sleep() {
if (LILYGO_T_DISPLAY_WAKEUP_FROM_NONE == _wakeupMethod) {
void Amoled_DisplayPanel::sleep() {
if (WAKEUP_FROM_NONE == _wakeupMethod) {
return;
}

setBrightness(0);

if (LILYGO_T_DISPLAY_WAKEUP_FROM_TOUCH != _wakeupMethod) {
if (WAKEUP_FROM_TOUCH != _wakeupMethod) {
if (_touchDrv) {
pinMode(TP_INT, OUTPUT);
digitalWrite(TP_INT, LOW); // Before touch to set sleep, it is necessary to set INT to LOW
pinMode(hwConfig.tp_int, OUTPUT);
digitalWrite(hwConfig.tp_int, LOW); // Before touch to set sleep, it is necessary to set INT to LOW

_touchDrv->sleep();
}
}

switch (_wakeupMethod) {
case LILYGO_T_DISPLAY_WAKEUP_FROM_TOUCH: {
case WAKEUP_FROM_TOUCH: {
int16_t x_array[1];
int16_t y_array[1];
uint8_t get_point = 1;
pinMode(TP_INT, INPUT);
pinMode(hwConfig.tp_int, INPUT);

// Wait for the finger to be lifted from the screen
while (!digitalRead(TP_INT)) {
while (!digitalRead(hwConfig.tp_int)) {
delay(100);
// Clear touch buffer
getPoint(x_array, y_array, get_point);
}

delay(2000); // Wait for the interrupt level to stabilize
esp_sleep_enable_ext1_wakeup(_BV(TP_INT), ESP_EXT1_WAKEUP_ANY_LOW);
esp_sleep_enable_ext1_wakeup(_BV(hwConfig.tp_int), ESP_EXT1_WAKEUP_ANY_LOW);
} break;
case LILYGO_T_DISPLAY_WAKEUP_FROM_BUTTON:
case WAKEUP_FROM_BUTTON:
esp_sleep_enable_ext1_wakeup(_BV(0), ESP_EXT1_WAKEUP_ANY_LOW);
break;
case LILYGO_T_DISPLAY_WAKEUP_FROM_TIMER:
case WAKEUP_FROM_TIMER:
esp_sleep_enable_timer_wakeup(_sleepTimeUs);
break;
default:
Expand All @@ -134,25 +134,29 @@ void LilyGo_TDisplayPanel::sleep() {

Wire.end();

pinMode(IIC_SCL, OPEN_DRAIN);
pinMode(IIC_SDA, OPEN_DRAIN);
pinMode(hwConfig.i2c_scl, OPEN_DRAIN);
pinMode(hwConfig.i2c_sda, OPEN_DRAIN);

Serial.end();

esp_deep_sleep_start();
}
void LilyGo_TDisplayPanel::wakeup() {}
void Amoled_DisplayPanel::wakeup() {}

uint8_t Amoled_DisplayPanel::getPoint(int16_t *x_array, int16_t *y_array, uint8_t get_point) {
if (touchType == TOUCH_CST92XX) {
return _touchDrv->getPoint(x_array, y_array, _touchDrv->getSupportTouchPoint());
}

uint8_t LilyGo_TDisplayPanel::getPoint(int16_t *x_array, int16_t *y_array, uint8_t get_point) {
if (!_touchDrv || !_touchDrv->isPressed()) {
return 0;
}

uint8_t points = _touchDrv->getPoint(x_array, y_array, get_point);

for (uint8_t i = 0; i < points; i++) {
int16_t rawX = x_array[i] + LCD_GRAM_OFFSET_X;
int16_t rawY = y_array[i] + LCD_GRAM_OFFSET_Y;
int16_t rawX = x_array[i] + hwConfig.lcd_gram_offset_x;
int16_t rawY = y_array[i] + hwConfig.lcd_gram_offset_y;

switch (_rotation) {
case 1: // 90°
Expand All @@ -177,67 +181,74 @@ uint8_t LilyGo_TDisplayPanel::getPoint(int16_t *x_array, int16_t *y_array, uint8
return points;
}

bool LilyGo_TDisplayPanel::isPressed() {
bool Amoled_DisplayPanel::isPressed() {
if (_touchDrv) {
return _touchDrv->isPressed();
}
return 0;
}

uint16_t LilyGo_TDisplayPanel::getBattVoltage(void) {
uint16_t Amoled_DisplayPanel::getBattVoltage(void) {
if (hwConfig.battery_voltage_adc_data == -1) {
return 0;
}
esp_adc_cal_characteristics_t adc_chars;
esp_adc_cal_characterize(ADC_UNIT_1, ADC_ATTEN_DB_12, ADC_WIDTH_BIT_12, 1100, &adc_chars);

const int number_of_samples = 20;
uint32_t sum = 0;
for (int i = 0; i < number_of_samples; i++) {
sum += analogRead(BATTERY_VOLTAGE_ADC_DATA);
sum += analogRead(hwConfig.battery_voltage_adc_data);
delay(2);
}
sum = sum / number_of_samples;

return esp_adc_cal_raw_to_voltage(sum, &adc_chars) * 2;
}

void LilyGo_TDisplayPanel::pushColors(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint16_t *data) {
void Amoled_DisplayPanel::pushColors(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint16_t *data) {
if (displayBus && display) {
display->draw16bitRGBBitmap(x, y, data, width, height);
}
}

void LilyGo_TDisplayPanel::setRotation(uint8_t rotation) {
void Amoled_DisplayPanel::setRotation(uint8_t rotation) {
_rotation = rotation;

if (displayBus && display) {
display->setRotation(rotation);
}
}

bool LilyGo_TDisplayPanel::initTouch() {
bool Amoled_DisplayPanel::initTouch() {
TouchDrvCST92xx *tmp = new TouchDrvCST92xx();
tmp->setPins(TP_RST, TP_INT);
tmp->setPins(hwConfig.tp_rst, hwConfig.tp_int);

if (tmp->begin(Wire, CST92XX_DEVICE_ADDRESS, IIC_SDA, IIC_SCL)) {
if (tmp->begin(Wire, CST92XX_DEVICE_ADDRESS, hwConfig.i2c_sda, hwConfig.i2c_scl)) {
_touchDrv = tmp;
ESP_LOGI("LilyGo_TDisplayPanel", "Successfully initialized %s!\n", _touchDrv->getModelName());
tmp->setMaxCoordinates(466, 466);
if (hwConfig.mirror_touch) {
tmp->setMirrorXY(true, true);
}

touchType = LILYGO_T_DISPLAY_TOUCH_CST92XX;
panelType = LILYGO_T_DISPLAY_1_75_INCHES;
touchType = TOUCH_CST92XX;
panelType = DISPLAY_1_75_INCHES;
return true;
}
delete tmp;

TouchDrvFT6X36 *tmp2 = new TouchDrvFT6X36();
tmp2->setPins(TP_RST, TP_INT);
tmp2->setPins(hwConfig.tp_rst, hwConfig.tp_int);

if (tmp2->begin(Wire, FT3168_DEVICE_ADDRESS, IIC_SDA, IIC_SCL)) {
if (tmp2->begin(Wire, FT3168_DEVICE_ADDRESS, hwConfig.i2c_sda, hwConfig.i2c_scl)) {
tmp2->interruptTrigger();

_touchDrv = tmp2;
ESP_LOGI("LilyGo_TDisplayPanel", "Successfully initialized %s!\n", _touchDrv->getModelName());

touchType = LILYGO_T_DISPLAY_TOUCH_FT3168;
panelType = LILYGO_T_DISPLAY_1_43_INCHES;
touchType = TOUCH_FT3168;
panelType = DISPLAY_1_43_INCHES;
return true;
}
delete tmp2;
Expand All @@ -246,18 +257,19 @@ bool LilyGo_TDisplayPanel::initTouch() {
return false;
}

bool LilyGo_TDisplayPanel::initDisplay(LilyGo_TDisplayPanel_Color_Order colorOrder) {
bool Amoled_DisplayPanel::initDisplay(Amoled_Display_Panel_Color_Order colorOrder) {
if (displayBus == nullptr) {
displayBus = new Arduino_ESP32QSPI(LCD_CS /* CS */, LCD_SCLK /* SCK */, LCD_SDIO0 /* SDIO0 */, LCD_SDIO1 /* SDIO1 */,
LCD_SDIO2 /* SDIO2 */, LCD_SDIO3 /* SDIO3 */);
displayBus =
new Arduino_ESP32QSPI(hwConfig.lcd_cs /* CS */, hwConfig.lcd_sclk /* SCK */, hwConfig.lcd_sdio0 /* SDIO0 */,
hwConfig.lcd_sdio1 /* SDIO1 */, hwConfig.lcd_sdio2 /* SDIO2 */, hwConfig.lcd_sdio3 /* SDIO3 */);

display = new CO5300(displayBus, LCD_RST /* RST */, _rotation /* rotation */, false /* IPS */, LCD_WIDTH, LCD_HEIGHT,
LCD_GRAM_OFFSET_X /* col offset 1 */, 0 /* row offset 1 */, LCD_GRAM_OFFSET_Y /* col_offset2 */,
0 /* row_offset2 */, colorOrder);
display = new CO5300(displayBus, hwConfig.lcd_rst /* RST */, _rotation /* rotation */, false /* IPS */,
hwConfig.lcd_width, hwConfig.lcd_height, hwConfig.lcd_gram_offset_x /* col offset 1 */,
0 /* row offset 1 */, hwConfig.lcd_gram_offset_y /* col_offset2 */, 0 /* row_offset2 */, colorOrder);
}

pinMode(LCD_EN, OUTPUT);
digitalWrite(LCD_EN, HIGH);
pinMode(hwConfig.lcd_en, OUTPUT);
digitalWrite(hwConfig.lcd_en, HIGH);

bool success = display->begin(80000000);
if (!success) {
Expand All @@ -266,11 +278,11 @@ bool LilyGo_TDisplayPanel::initDisplay(LilyGo_TDisplayPanel_Color_Order colorOrd
}

switch (panelType) {
case LILYGO_T_DISPLAY_1_75_INCHES:
setRotation(2);
case DISPLAY_1_75_INCHES:
setRotation(hwConfig.rotation_175);
break;
case LILYGO_T_DISPLAY_1_43_INCHES:
case LILYGO_T_DISPLAY_UNKNOWN:
case DISPLAY_1_43_INCHES:
case DISPLAY_UNKNOWN:
default:
setRotation(0);
break;
Expand Down
Loading