mirror of
https://github.com/MarekZegare4/MeshCore-Solo.git
synced 2026-09-26 20:56:37 +00:00
* fixed for mono ST7789 display driver
This commit is contained in:
@@ -27,15 +27,15 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Color scheme
|
// Color scheme
|
||||||
ColorVal UIColor::window_bkg = ST77XX_WHITE;
|
ColorVal UIColor::window_bkg = OLEDDISPLAY_COLOR::WHITE;
|
||||||
ColorVal UIColor::title_bkg = ST77XX_BLUE;
|
ColorVal UIColor::title_bkg = OLEDDISPLAY_COLOR::WHITE;
|
||||||
ColorVal UIColor::title_txt = ST77XX_WHITE;
|
ColorVal UIColor::title_txt = OLEDDISPLAY_COLOR::BLACK;
|
||||||
ColorVal UIColor::primary_txt = ST77XX_BLACK;
|
ColorVal UIColor::primary_txt = OLEDDISPLAY_COLOR::BLACK;
|
||||||
ColorVal UIColor::secondary_txt = (18 << 11) | (36 << 5) | 18; // mid-gray
|
ColorVal UIColor::secondary_txt = OLEDDISPLAY_COLOR::BLACK;
|
||||||
ColorVal UIColor::warning_txt = ST77XX_ORANGE;
|
ColorVal UIColor::warning_txt = OLEDDISPLAY_COLOR::BLACK;
|
||||||
ColorVal UIColor::popup_bkg = ST77XX_CYAN;
|
ColorVal UIColor::popup_bkg = OLEDDISPLAY_COLOR::WHITE;
|
||||||
ColorVal UIColor::popup_txt = ST77XX_BLACK;
|
ColorVal UIColor::popup_txt = OLEDDISPLAY_COLOR::BLACK;
|
||||||
ColorVal UIColor::corp_blue = 0x001A;
|
ColorVal UIColor::corp_blue = OLEDDISPLAY_COLOR::BLACK;
|
||||||
|
|
||||||
bool ST7789Display::begin() {
|
bool ST7789Display::begin() {
|
||||||
if(!_isOn) {
|
if(!_isOn) {
|
||||||
@@ -102,9 +102,8 @@ void ST7789Display::clear() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void ST7789Display::startFrame(ColorVal bkg) {
|
void ST7789Display::startFrame(ColorVal bkg) {
|
||||||
display.fillRect(0, 0, display.width(), display.height());
|
display.clear(); // TODO: use bkg
|
||||||
_color = UIColor::primary_txt;
|
setColor(UIColor::primary_txt);
|
||||||
display.setRGB(_color);
|
|
||||||
display.setFont(ArialMT_Plain_16);
|
display.setFont(ArialMT_Plain_16);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -122,7 +121,9 @@ void ST7789Display::setTextSize(int sz) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void ST7789Display::setColor(ColorVal c) {
|
void ST7789Display::setColor(ColorVal c) {
|
||||||
display.setRGB(_color = c);
|
_color = c;
|
||||||
|
display.setColor((OLEDDISPLAY_COLOR)_color);
|
||||||
|
display.setRGB(_color == OLEDDISPLAY_COLOR::WHITE ? ST77XX_WHITE : ST77XX_BLACK);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ST7789Display::setCursor(int x, int y) {
|
void ST7789Display::setCursor(int x, int y) {
|
||||||
|
|||||||
Reference in New Issue
Block a user