Adolfo Reyna
e7fb5fb38f
- RLCD device.properties: DefaultDark (focus UI visible), fontSize 18
(+28% vs 14: small 10->14, default 14->18, large 18->24, icons 16->20/36->48)
- ST7305 driver: honor invertColor config (was ignored), call
esp_lcd_panel_invert_color after init
- DisplayDevice: add supportsInvertColor + set/get, and
supportsMonochromeThreshold/set/get (ST7305 only)
- EspLcdDisplay: implement invert via panelHandle, and mono threshold via
global g_mono_threshold shared with esp_lvgl_port
- DisplaySettings: new fields invertColor (default true to preserve current
inverted look) and monochromeThreshold (default 60 best for DefaultDark per
user testing, range 20-230)
- Lvgl.cpp: apply invert + threshold at boot from settings
- Display app: add Invert colors switch (if supportsInvertColor) + Mono
threshold slider with live preview and persistence
- esp_lvgl_port_disp.c (components override for hash mismatch): fix B/W
conversion
BEFORE: blue >16 only -> crushed colors, no gray handling
AFTER: proper luminance Y=0.299R+0.587G+0.114B with adjustable threshold
(default 60), no Bayer dithering dots. Crisp text on reflective
- Launcher/button/list wrappers reverted to stock DefaultDark (no white
focus hacks) per user request - focus UI now uses default outline which
survives luminance threshold
Verified on waveshare-esp32-s3-rlcd /dev/cu.usbmodem1101:
- Build 2877200 bytes, flash hash verified
- Invert toggle works, threshold slider live (60 best per test)
- Font bump visible, focus UI visible for button navigation
- No dithering dots
Docs: LVGL mono https://docs.lvgl.io/9.2/porting/display.html#monochrome-displays
Themes: https://docs.lvgl.io/9.2/details/common-widget-features/styles/themes.html
Co-authored-by: Hermes Agent <hermes@noreply>
102 lines
3.3 KiB
C++
102 lines
3.3 KiB
C++
#pragma once
|
|
|
|
#include <EspLcdDisplay.h>
|
|
#include <Tactility/hal/display/DisplayDevice.h>
|
|
|
|
#include <driver/gpio.h>
|
|
#include <driver/spi_common.h>
|
|
#include <esp_lcd_panel_io.h>
|
|
#include <esp_lcd_types.h>
|
|
#include <functional>
|
|
#include <lvgl.h>
|
|
|
|
class St7305Display final : public EspLcdDisplay {
|
|
|
|
public:
|
|
|
|
class Configuration {
|
|
|
|
public:
|
|
|
|
Configuration(
|
|
spi_host_device_t spiHostDevice,
|
|
gpio_num_t csPin,
|
|
gpio_num_t dcPin,
|
|
unsigned int horizontalResolution,
|
|
unsigned int verticalResolution,
|
|
std::shared_ptr<tt::hal::touch::TouchDevice> touch = nullptr,
|
|
bool swapXY = false,
|
|
bool mirrorX = false,
|
|
bool mirrorY = false,
|
|
bool invertColor = false,
|
|
uint32_t bufferSize = 0
|
|
) : spiHostDevice(spiHostDevice),
|
|
csPin(csPin),
|
|
dcPin(dcPin),
|
|
horizontalResolution(horizontalResolution),
|
|
verticalResolution(verticalResolution),
|
|
swapXY(swapXY),
|
|
mirrorX(mirrorX),
|
|
mirrorY(mirrorY),
|
|
invertColor(invertColor),
|
|
bufferSize(bufferSize),
|
|
touch(std::move(touch))
|
|
{
|
|
if (this->bufferSize == 0) {
|
|
// For monochrome display, full pixel count is expected for buffer size
|
|
this->bufferSize = horizontalResolution * verticalResolution;
|
|
}
|
|
}
|
|
|
|
spi_host_device_t spiHostDevice;
|
|
gpio_num_t csPin;
|
|
gpio_num_t dcPin;
|
|
gpio_num_t resetPin = GPIO_NUM_NC;
|
|
unsigned int pixelClockFrequency = 10'000'000; // 10MHz SPI clock for ST7305
|
|
size_t transactionQueueDepth = 10;
|
|
unsigned int horizontalResolution;
|
|
unsigned int verticalResolution;
|
|
bool swapXY = false;
|
|
bool mirrorX = false;
|
|
bool mirrorY = false;
|
|
bool invertColor = false;
|
|
uint32_t bufferSize = 0;
|
|
std::shared_ptr<tt::hal::touch::TouchDevice> touch;
|
|
std::function<void(uint8_t)> _Nullable backlightDutyFunction = nullptr;
|
|
};
|
|
|
|
private:
|
|
|
|
std::unique_ptr<Configuration> configuration;
|
|
|
|
bool createIoHandle(esp_lcd_panel_io_handle_t& ioHandle) override;
|
|
|
|
bool createPanelHandle(esp_lcd_panel_io_handle_t ioHandle, esp_lcd_panel_handle_t& panelHandle) override;
|
|
|
|
lvgl_port_display_cfg_t getLvglPortDisplayConfig(esp_lcd_panel_io_handle_t ioHandle, esp_lcd_panel_handle_t panelHandle) override;
|
|
|
|
public:
|
|
|
|
explicit St7305Display(std::unique_ptr<Configuration> inConfiguration) :
|
|
configuration(std::move(inConfiguration))
|
|
{}
|
|
|
|
std::string getName() const override { return "ST7305"; }
|
|
|
|
std::string getDescription() const override { return "ST7305 monochrome reflective LCD display"; }
|
|
|
|
std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable getTouchDevice() override { return configuration->touch; }
|
|
|
|
void setBacklightDuty(uint8_t backlightDuty) override {
|
|
if (configuration->backlightDutyFunction != nullptr) {
|
|
configuration->backlightDutyFunction(backlightDuty);
|
|
}
|
|
}
|
|
|
|
bool supportsBacklightDuty() const override { return configuration->backlightDutyFunction != nullptr; }
|
|
|
|
bool supportsMonochromeThreshold() const override { return true; }
|
|
};
|
|
|
|
std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();
|