From fe05b734de4c5d35a4d33650f95c88b4e8cd2bb9 Mon Sep 17 00:00:00 2001
From: Ulrich Meine <145987006+Scorgan01@users.noreply.github.com>
Date: Thu, 2 Jul 2026 16:15:40 +0200
Subject: [PATCH 1/2] Adjust layout of PageSixValue for 4-digit pressure and
 long names+units

---
 lib/obp60task/PageSixValues.cpp | 22 +++++++++++-----------
 lib/obp60task/platformio.ini    |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/obp60task/PageSixValues.cpp b/lib/obp60task/PageSixValues.cpp
index 8d89167..fd409dc 100644
--- a/lib/obp60task/PageSixValues.cpp
+++ b/lib/obp60task/PageSixValues.cpp
@@ -6,7 +6,8 @@
 const int SixValues_x1 = 5;
 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 HowManyValues = 6;
@@ -96,39 +97,38 @@ class PageSixValues : public Page
     
             // Show unit
                     getdisplay().setFont(&Ubuntu_Bold8pt8b);
-                    getdisplay().setCursor(x0, y0+72);
                     if(holdvalues == false){
-                        getdisplay().print(DataUnits[ValueIndex]);                       // Unit
+                        drawTextRalign(x0+187, y0+19, DataUnits[ValueIndex]);          // Unit
                         }
                     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"){
                         getdisplay().setFont(&Ubuntu_Bold12pt8b);
-                        getdisplay().setCursor(x0+10, y0+60);
+                        getdisplay().setCursor(x0+21, y0+60);
                         }
                     else if(DataFormat[ValueIndex] == "formatTime" || DataFormat[ValueIndex] == "formatDate"){
                         getdisplay().setFont(&Ubuntu_Bold16pt8b);
-                        getdisplay().setCursor(x0+20,y0+55);
+                        getdisplay().setCursor(x0+23,y0+55);
                         } 
             // pressure in hPa          
                     else if(DataFormat[ValueIndex] == "formatXdr:P:P"){
                         getdisplay().setFont(&DSEG7Classic_BoldItalic26pt7b);
-                        getdisplay().setCursor(x0+5, y0+70);
+                        getdisplay().setCursor(x0+23, y0+79);
                      }
             // RPM
                      else if(DataFormat[ValueIndex] == "formatXdr:T:R"){
                         getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
-                        getdisplay().setCursor(x0+25, y0+70);
+                        getdisplay().setCursor(x0+23, y0+79);
                      }
                     else{
                         getdisplay().setFont(&DSEG7Classic_BoldItalic26pt7b);
                         if ( DataText[ValueIndex][0] == '-' )
-                            getdisplay().setCursor(x0+25, y0+70);
+                            getdisplay().setCursor(x0+23, y0+79);
                         else
-                            getdisplay().setCursor(x0+65, y0+70);
+                            getdisplay().setCursor(x0+65, y0+79);
                         }
     
             // Show bus data
diff --git a/lib/obp60task/platformio.ini b/lib/obp60task/platformio.ini
index c149f68..ee8b42e 100644
--- a/lib/obp60task/platformio.ini
+++ b/lib/obp60task/platformio.ini
@@ -170,5 +170,5 @@ build_flags=
     ${env.build_flags}
 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_speed = 230400
+upload_speed = 921600
 monitor_speed = 115200

From 2e7b0435b2a7aa8ab8fd485aabf7e2319538db75 Mon Sep 17 00:00:00 2001
From: Ulrich Meine <145987006+Scorgan01@users.noreply.github.com>
Date: Thu, 2 Jul 2026 18:44:40 +0200
Subject: [PATCH 2/2] Revert upload_speed change in platformio.ini

---
 lib/obp60task/platformio.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/obp60task/platformio.ini b/lib/obp60task/platformio.ini
index ee8b42e..c149f68 100644
--- a/lib/obp60task/platformio.ini
+++ b/lib/obp60task/platformio.ini
@@ -170,5 +170,5 @@ build_flags=
     ${env.build_flags}
 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_speed = 921600
+upload_speed = 230400
 monitor_speed = 115200