thooge/esp32-nmea2000-obp60
1
0
Fork 0
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git synced 2026-09-11 19:55:14 +02:00
Code Releases Activity

Adjust layout of PageSixValue for 4-digit pressure and long names+units

Browse Source
This commit is contained in:
Ulrich Meine
2026-07-02 16:15:40 +02:00
parent 80800c32a3
commit fe05b734de
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/obp60task/PageSixValues.cpp
+11 -11
View File
@@ -6,7 +6,8 @@
const int SixValues_x1 = 5; const int SixValues_x1 = 5;
const int SixValues_DeltaX = 200; const int SixValues_DeltaX = 200;
const int SixValues_y1 = 23; // const int SixValues_y1 = 23;
const int SixValues_y1 = 22;
const int SixValues_DeltaY = 83; const int SixValues_DeltaY = 83;
const int HowManyValues = 6; const int HowManyValues = 6;
@@ -96,39 +97,38 @@ class PageSixValues : public Page
// Show unit // Show unit
getdisplay().setFont(&Ubuntu_Bold8pt8b); getdisplay().setFont(&Ubuntu_Bold8pt8b);
getdisplay().setCursor(x0, y0+72);
if(holdvalues == false){ if(holdvalues == false){
getdisplay().print(DataUnits[ValueIndex]); // Unit drawTextRalign(x0+187, y0+19, DataUnits[ValueIndex]); // Unit
} }
else{ else{
getdisplay().print(OldDataUnits[ValueIndex]); drawTextRalign(x0+187, y0+19, OldDataUnits[ValueIndex]);
} }
// Switch font if format for any values // Switch font depending on data type
if(DataFormat[ValueIndex] == "formatLatitude" || DataFormat[ValueIndex] == "formatLongitude"){ if(DataFormat[ValueIndex] == "formatLatitude" || DataFormat[ValueIndex] == "formatLongitude"){
getdisplay().setFont(&Ubuntu_Bold12pt8b); getdisplay().setFont(&Ubuntu_Bold12pt8b);
getdisplay().setCursor(x0+10, y0+60); getdisplay().setCursor(x0+21, y0+60);
} }
else if(DataFormat[ValueIndex] == "formatTime" || DataFormat[ValueIndex] == "formatDate"){ else if(DataFormat[ValueIndex] == "formatTime" || DataFormat[ValueIndex] == "formatDate"){
getdisplay().setFont(&Ubuntu_Bold16pt8b); getdisplay().setFont(&Ubuntu_Bold16pt8b);
getdisplay().setCursor(x0+20,y0+55); getdisplay().setCursor(x0+23,y0+55);
} }
// pressure in hPa // pressure in hPa
else if(DataFormat[ValueIndex] == "formatXdr:P:P"){ else if(DataFormat[ValueIndex] == "formatXdr:P:P"){
getdisplay().setFont(&DSEG7Classic_BoldItalic26pt7b); getdisplay().setFont(&DSEG7Classic_BoldItalic26pt7b);
getdisplay().setCursor(x0+5, y0+70); getdisplay().setCursor(x0+23, y0+79);
} }
// RPM // RPM
else if(DataFormat[ValueIndex] == "formatXdr:T:R"){ else if(DataFormat[ValueIndex] == "formatXdr:T:R"){
getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b); getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
getdisplay().setCursor(x0+25, y0+70); getdisplay().setCursor(x0+23, y0+79);
} }
else{ else{
getdisplay().setFont(&DSEG7Classic_BoldItalic26pt7b); getdisplay().setFont(&DSEG7Classic_BoldItalic26pt7b);
if ( DataText[ValueIndex][0] == '-' ) if ( DataText[ValueIndex][0] == '-' )
getdisplay().setCursor(x0+25, y0+70); getdisplay().setCursor(x0+23, y0+79);
else else
getdisplay().setCursor(x0+65, y0+70); getdisplay().setCursor(x0+65, y0+79);
} }
// Show bus data // Show bus data
lib/obp60task/platformio.ini
+1 -1
View File
@@ -170,5 +170,5 @@ build_flags=
${env.build_flags} ${env.build_flags}
upload_port = /dev/ttyUSB0 #OBP40 download via external USB/Serail converter upload_port = /dev/ttyUSB0 #OBP40 download via external USB/Serail converter
upload_protocol = esptool #firmware upload via USB OTG seriell, by first upload need to set the ESP32-S3 in the upload mode with shortcut GND to Pin27 upload_protocol = esptool #firmware upload via USB OTG seriell, by first upload need to set the ESP32-S3 in the upload mode with shortcut GND to Pin27
upload_speed = 230400 upload_speed = 921600
monitor_speed = 115200 monitor_speed = 115200