From 5192e77faba2be82c1ed276125a9db99abed4851 Mon Sep 17 00:00:00 2001 From: Thomas Hooge Date: Tue, 4 Mar 2025 19:24:08 +0100 Subject: [PATCH] Changed 20pt Ubuntu font to 8bit in value pages --- lib/obp60task/PageFourValues2.cpp | 4 ++-- lib/obp60task/PageOneValue.cpp | 4 ++-- lib/obp60task/PageThreeValues.cpp | 18 +++++++++--------- lib/obp60task/PageTwoValues.cpp | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/obp60task/PageFourValues2.cpp b/lib/obp60task/PageFourValues2.cpp index 27dd6eb..61a5f6f 100644 --- a/lib/obp60task/PageFourValues2.cpp +++ b/lib/obp60task/PageFourValues2.cpp @@ -98,7 +98,7 @@ class PageFourValues2 : public Page // ############### Value 1 ################ // Show name - getdisplay().setFont(&Ubuntu_Bold20pt7b); + getdisplay().setFont(&Ubuntu_Bold20pt8b); getdisplay().setCursor(20, 55); getdisplay().print(name1); // Page name @@ -146,7 +146,7 @@ class PageFourValues2 : public Page // ############### Value 2 ################ // Show name - getdisplay().setFont(&Ubuntu_Bold20pt7b); + getdisplay().setFont(&Ubuntu_Bold20pt8b); getdisplay().setCursor(20, 145); getdisplay().print(name2); // Page name diff --git a/lib/obp60task/PageOneValue.cpp b/lib/obp60task/PageOneValue.cpp index 3e7b007..0d2a879 100644 --- a/lib/obp60task/PageOneValue.cpp +++ b/lib/obp60task/PageOneValue.cpp @@ -67,7 +67,7 @@ class PageOneValue : public Page getdisplay().print(name1); // Page name // Show unit - getdisplay().setFont(&Ubuntu_Bold20pt7b); + getdisplay().setFont(&Ubuntu_Bold20pt8b); getdisplay().setCursor(270, 100); if(holdvalues == false){ getdisplay().print(unit1); // Unit @@ -78,7 +78,7 @@ class PageOneValue : public Page // Switch font if format for any values if(bvalue1->getFormat() == "formatLatitude" || bvalue1->getFormat() == "formatLongitude"){ - getdisplay().setFont(&Ubuntu_Bold20pt7b); + getdisplay().setFont(&Ubuntu_Bold20pt8b); getdisplay().setCursor(20, 180); } else if(bvalue1->getFormat() == "formatTime" || bvalue1->getFormat() == "formatDate"){ diff --git a/lib/obp60task/PageThreeValues.cpp b/lib/obp60task/PageThreeValues.cpp index 5e9dc0a..71e1df1 100644 --- a/lib/obp60task/PageThreeValues.cpp +++ b/lib/obp60task/PageThreeValues.cpp @@ -86,7 +86,7 @@ class PageThreeValues : public Page // Show name getdisplay().setTextColor(commonData->fgcolor); - getdisplay().setFont(&Ubuntu_Bold20pt7b); + getdisplay().setFont(&Ubuntu_Bold20pt8b); getdisplay().setCursor(20, 55); getdisplay().print(name1); // Page name @@ -102,11 +102,11 @@ class PageThreeValues : public Page // Switch font if format for any values if(bvalue1->getFormat() == "formatLatitude" || bvalue1->getFormat() == "formatLongitude"){ - getdisplay().setFont(&Ubuntu_Bold20pt7b); + getdisplay().setFont(&Ubuntu_Bold20pt8b); getdisplay().setCursor(50, 90); } else if(bvalue1->getFormat() == "formatTime" || bvalue1->getFormat() == "formatDate"){ - getdisplay().setFont(&Ubuntu_Bold20pt7b); + getdisplay().setFont(&Ubuntu_Bold20pt8b); getdisplay().setCursor(170, 68); } else{ @@ -134,7 +134,7 @@ class PageThreeValues : public Page // ############### Value 2 ################ // Show name - getdisplay().setFont(&Ubuntu_Bold20pt7b); + getdisplay().setFont(&Ubuntu_Bold20pt8b); getdisplay().setCursor(20, 145); getdisplay().print(name2); // Page name @@ -150,11 +150,11 @@ class PageThreeValues : public Page // Switch font if format for any values if(bvalue2->getFormat() == "formatLatitude" || bvalue2->getFormat() == "formatLongitude"){ - getdisplay().setFont(&Ubuntu_Bold20pt7b); + getdisplay().setFont(&Ubuntu_Bold20pt8b); getdisplay().setCursor(50, 180); } else if(bvalue2->getFormat() == "formatTime" || bvalue2->getFormat() == "formatDate"){ - getdisplay().setFont(&Ubuntu_Bold20pt7b); + getdisplay().setFont(&Ubuntu_Bold20pt8b); getdisplay().setCursor(170, 158); } else{ @@ -182,7 +182,7 @@ class PageThreeValues : public Page // ############### Value 3 ################ // Show name - getdisplay().setFont(&Ubuntu_Bold20pt7b); + getdisplay().setFont(&Ubuntu_Bold20pt8b); getdisplay().setCursor(20, 235); getdisplay().print(name3); // Page name @@ -198,11 +198,11 @@ class PageThreeValues : public Page // Switch font if format for any values if(bvalue3->getFormat() == "formatLatitude" || bvalue3->getFormat() == "formatLongitude"){ - getdisplay().setFont(&Ubuntu_Bold20pt7b); + getdisplay().setFont(&Ubuntu_Bold20pt8b); getdisplay().setCursor(50, 270); } else if(bvalue3->getFormat() == "formatTime" || bvalue3->getFormat() == "formatDate"){ - getdisplay().setFont(&Ubuntu_Bold20pt7b); + getdisplay().setFont(&Ubuntu_Bold20pt8b); getdisplay().setCursor(170, 248); } else{ diff --git a/lib/obp60task/PageTwoValues.cpp b/lib/obp60task/PageTwoValues.cpp index 9a33f16..673ab8f 100644 --- a/lib/obp60task/PageTwoValues.cpp +++ b/lib/obp60task/PageTwoValues.cpp @@ -123,7 +123,7 @@ class PageTwoValues : public Page // ############### Value 2 ################ // Show name - getdisplay().setFont(&Ubuntu_Bold20pt7b); + getdisplay().setFont(&Ubuntu_Bold20pt8b); getdisplay().setCursor(20, 190); getdisplay().print(name2); // Page name @@ -143,7 +143,7 @@ class PageTwoValues : public Page getdisplay().setCursor(50, 240); } else if(bvalue2->getFormat() == "formatTime" || bvalue2->getFormat() == "formatDate"){ - getdisplay().setFont(&Ubuntu_Bold20pt7b); + getdisplay().setFont(&Ubuntu_Bold20pt8b); getdisplay().setCursor(170, 215); } else{