1
0
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git synced 2026-03-29 03:16:35 +02:00

Finalize switch to epd pointer instead if getdisplay()

This commit is contained in:
2025-08-05 08:52:45 +02:00
parent 7cff3e62e6
commit b8a31f2280
31 changed files with 1516 additions and 1513 deletions

View File

@@ -1,3 +1,4 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h"
@@ -46,85 +47,85 @@ public:
//***********************************************************
// Set display in partial refresh mode
getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
// current position
getdisplay().setFont(&Ubuntu_Bold8pt8b);
epd->setFont(&Ubuntu_Bold8pt8b);
GwApi::BoatValue *bv_lat = pageData.values[0];
String sv_lat = formatValue(bv_lat, *commonData).svalue;
//getdisplay().setCursor(300, 40);
//getdisplay().print(sv_lat);
//epd->setCursor(300, 40);
//epd->print(sv_lat);
GwApi::BoatValue *bv_lon = pageData.values[1];
String sv_lon = formatValue(bv_lon, *commonData).svalue;
//getdisplay().setCursor(300, 60);
//getdisplay().print(sv_lon);
//epd->setCursor(300, 60);
//epd->print(sv_lon);
GwApi::BoatValue *bv_hdop = pageData.values[2];
String sv_hdop = formatValue(bv_hdop, *commonData).svalue;
//getdisplay().setCursor(300, 80);
//getdisplay().print(sv_hdop);
//epd->setCursor(300, 80);
//epd->print(sv_hdop);
// sky view
Point c = {130, 148};
uint16_t r = 125;
uint16_t r1 = r / 2;
getdisplay().fillCircle(c.x, c.y, r, commonData->bgcolor);
getdisplay().drawCircle(c.x, c.y, r + 1, commonData->fgcolor);
getdisplay().drawCircle(c.x, c.y, r + 2, commonData->fgcolor);
getdisplay().drawCircle(c.x, c.y, r1, commonData->fgcolor);
epd->fillCircle(c.x, c.y, r, commonData->bgcolor);
epd->drawCircle(c.x, c.y, r + 1, commonData->fgcolor);
epd->drawCircle(c.x, c.y, r + 2, commonData->fgcolor);
epd->drawCircle(c.x, c.y, r1, commonData->fgcolor);
// separation lines
getdisplay().drawLine(c.x - r, c.y, c.x + r, c.y, commonData->fgcolor);
getdisplay().drawLine(c.x, c.y - r, c.x, c.y + r, commonData->fgcolor);
epd->drawLine(c.x - r, c.y, c.x + r, c.y, commonData->fgcolor);
epd->drawLine(c.x, c.y - r, c.x, c.y + r, commonData->fgcolor);
Point p = {c.x, c.y - r};
Point p1, p2;
p1 = rotatePoint(c, p, 45);
p2 = rotatePoint(c, p, 45 + 180);
getdisplay().drawLine(p1.x, p1.y, p2.x, p2.y, commonData->fgcolor);
epd->drawLine(p1.x, p1.y, p2.x, p2.y, commonData->fgcolor);
p1 = rotatePoint(c, p, -45);
p2 = rotatePoint(c, p, -45 + 180);
getdisplay().drawLine(p1.x, p1.y, p2.x, p2.y, commonData->fgcolor);
epd->drawLine(p1.x, p1.y, p2.x, p2.y, commonData->fgcolor);
// directions
int16_t x1, y1;
uint16_t w, h;
getdisplay().setFont(&Ubuntu_Bold12pt8b);
epd->setFont(&Ubuntu_Bold12pt8b);
getdisplay().getTextBounds("N", 0, 150, &x1, &y1, &w, &h);
getdisplay().setCursor(c.x - w / 2, c.y - r + h + 2);
getdisplay().print("N");
epd->getTextBounds("N", 0, 150, &x1, &y1, &w, &h);
epd->setCursor(c.x - w / 2, c.y - r + h + 2);
epd->print("N");
getdisplay().getTextBounds("S", 0, 150, &x1, &y1, &w, &h);
getdisplay().setCursor(c.x - w / 2, c.y + r - 2);
getdisplay().print("S");
epd->getTextBounds("S", 0, 150, &x1, &y1, &w, &h);
epd->setCursor(c.x - w / 2, c.y + r - 2);
epd->print("S");
getdisplay().getTextBounds("E", 0, 150, &x1, &y1, &w, &h);
getdisplay().setCursor(c.x + r - w - 2, c.y + h / 2);
getdisplay().print("E");
epd->getTextBounds("E", 0, 150, &x1, &y1, &w, &h);
epd->setCursor(c.x + r - w - 2, c.y + h / 2);
epd->print("E");
getdisplay().getTextBounds("W", 0, 150, &x1, &y1, &w, &h);
getdisplay().setCursor(c.x - r + 2 , c.y + h / 2);
getdisplay().print("W");
epd->getTextBounds("W", 0, 150, &x1, &y1, &w, &h);
epd->setCursor(c.x - r + 2 , c.y + h / 2);
epd->print("W");
// satellites
// Signal / Noise bars
getdisplay().setFont(&Ubuntu_Bold8pt8b);
getdisplay().setCursor(325, 34);
getdisplay().print("SNR");
getdisplay().drawRect(270, 20, 125, 257, commonData->fgcolor);
epd->setFont(&Ubuntu_Bold8pt8b);
epd->setCursor(325, 34);
epd->print("SNR");
epd->drawRect(270, 20, 125, 257, commonData->fgcolor);
for (int i = 0; i < 12; i++) {
uint16_t y = 29 + (i + 1) * 20;
getdisplay().setCursor(276, y);
epd->setCursor(276, y);
char buffer[3];
snprintf(buffer, 3, "%02d", i+1);
getdisplay().print(String(buffer));
getdisplay().drawRect(305, y-12, 85, 14, commonData->fgcolor);
epd->print(String(buffer));
epd->drawRect(305, y-12, 85, 14, commonData->fgcolor);
}
return PAGE_UPDATE;