From f73ccfbe5c9fcb3133bd7721b1d180af6f2e2ff0 Mon Sep 17 00:00:00 2001 From: norbert-walter Date: Thu, 10 Mar 2022 21:14:40 +0100 Subject: [PATCH] Page info in footer line --- lib/obp60task/PageApparentWind.cpp | 4 ++-- lib/obp60task/PageBME280.cpp | 4 ++-- lib/obp60task/PageClock.cpp | 4 ++-- lib/obp60task/PageDST810.cpp | 4 ++-- lib/obp60task/PageForValues.cpp | 4 ++-- lib/obp60task/PageForValues2.cpp | 4 ++-- lib/obp60task/PageOneValue.cpp | 4 ++-- lib/obp60task/PageThreeValues.cpp | 4 ++-- lib/obp60task/PageTwoValues.cpp | 4 ++-- lib/obp60task/PageVoltage.cpp | 4 ++-- lib/obp60task/PageWindRose.cpp | 4 ++-- lib/obp60task/Pagedata.h | 2 ++ lib/obp60task/obp60task.cpp | 6 ++++++ 13 files changed, 30 insertions(+), 22 deletions(-) diff --git a/lib/obp60task/PageApparentWind.cpp b/lib/obp60task/PageApparentWind.cpp index f765531..5f46f99 100644 --- a/lib/obp60task/PageApparentWind.cpp +++ b/lib/obp60task/PageApparentWind.cpp @@ -165,9 +165,9 @@ public: // Key Layout display.setTextColor(textcolor); display.setFont(&Ubuntu_Bold8pt7b); - display.setCursor(115, 290); + display.setCursor(130, 290); if(keylock == false){ - display.print(" [ <<<<<< >>>>>> ]"); + display.print("[ <<<< " + String(commonData.data.actpage) + "/" + String(commonData.data.maxpage) + " >>>> ]"); if(String(backlightMode) == "Control by Key"){ // Key for illumination display.setCursor(343, 290); display.print("[ILUM]"); diff --git a/lib/obp60task/PageBME280.cpp b/lib/obp60task/PageBME280.cpp index f5a86d8..40b8b64 100644 --- a/lib/obp60task/PageBME280.cpp +++ b/lib/obp60task/PageBME280.cpp @@ -194,9 +194,9 @@ class PageBME280 : public Page // Key Layout display.setTextColor(textcolor); display.setFont(&Ubuntu_Bold8pt7b); - display.setCursor(115, 290); + display.setCursor(130, 290); if(keylock == false){ - display.print(" [ <<<<<< >>>>>> ]"); + display.print("[ <<<< " + String(commonData.data.actpage) + "/" + String(commonData.data.maxpage) + " >>>> ]"); if(String(backlightMode) == "Control by Key"){ // Key for illumination display.setCursor(343, 290); display.print("[ILUM]"); diff --git a/lib/obp60task/PageClock.cpp b/lib/obp60task/PageClock.cpp index b35061c..b8f6c8b 100644 --- a/lib/obp60task/PageClock.cpp +++ b/lib/obp60task/PageClock.cpp @@ -320,9 +320,9 @@ public: // Key Layout display.setTextColor(textcolor); display.setFont(&Ubuntu_Bold8pt7b); - display.setCursor(115, 290); + display.setCursor(130, 290); if(keylock == false){ - display.print(" [ <<<<<< >>>>>> ]"); + display.print("[ <<<< " + String(commonData.data.actpage) + "/" + String(commonData.data.maxpage) + " >>>> ]"); if(String(backlightMode) == "Control by Key"){ // Key for illumination display.setCursor(343, 290); display.print("[ILUM]"); diff --git a/lib/obp60task/PageDST810.cpp b/lib/obp60task/PageDST810.cpp index beb8f4e..24037a6 100644 --- a/lib/obp60task/PageDST810.cpp +++ b/lib/obp60task/PageDST810.cpp @@ -267,9 +267,9 @@ class PageDST810 : public Page // Key Layout display.setTextColor(textcolor); display.setFont(&Ubuntu_Bold8pt7b); - display.setCursor(115, 290); + display.setCursor(130, 290); if(keylock == false){ - display.print(" [ <<<<<< >>>>>> ]"); + display.print("[ <<<< " + String(commonData.data.actpage) + "/" + String(commonData.data.maxpage) + " >>>> ]"); if(String(backlightMode) == "Control by Key"){ // Key for illumination display.setCursor(343, 290); display.print("[ILUM]"); diff --git a/lib/obp60task/PageForValues.cpp b/lib/obp60task/PageForValues.cpp index 693fd2a..32abb1a 100644 --- a/lib/obp60task/PageForValues.cpp +++ b/lib/obp60task/PageForValues.cpp @@ -307,9 +307,9 @@ class PageForValues : public Page // Key Layout display.setTextColor(textcolor); display.setFont(&Ubuntu_Bold8pt7b); - display.setCursor(115, 290); + display.setCursor(130, 290); if(keylock == false){ - display.print(" [ <<<<<< >>>>>> ]"); + display.print("[ <<<< " + String(commonData.data.actpage) + "/" + String(commonData.data.maxpage) + " >>>> ]"); if(String(backlightMode) == "Control by Key"){ // Key for illumination display.setCursor(343, 290); display.print("[ILUM]"); diff --git a/lib/obp60task/PageForValues2.cpp b/lib/obp60task/PageForValues2.cpp index 9247bb2..eddaa9f 100644 --- a/lib/obp60task/PageForValues2.cpp +++ b/lib/obp60task/PageForValues2.cpp @@ -307,9 +307,9 @@ class PageForValues2 : public Page // Key Layout display.setTextColor(textcolor); display.setFont(&Ubuntu_Bold8pt7b); - display.setCursor(115, 290); + display.setCursor(130, 290); if(keylock == false){ - display.print(" [ <<<<<< >>>>>> ]"); + display.print("[ <<<< " + String(commonData.data.actpage) + "/" + String(commonData.data.maxpage) + " >>>> ]"); if(String(backlightMode) == "Control by Key"){ // Key for illumination display.setCursor(343, 290); display.print("[ILUM]"); diff --git a/lib/obp60task/PageOneValue.cpp b/lib/obp60task/PageOneValue.cpp index 5a86020..8a3bf1c 100644 --- a/lib/obp60task/PageOneValue.cpp +++ b/lib/obp60task/PageOneValue.cpp @@ -117,9 +117,9 @@ class PageOneValue : public Page{ // Key Layout display.setTextColor(textcolor); display.setFont(&Ubuntu_Bold8pt7b); - display.setCursor(115, 290); + display.setCursor(130, 290); if(keylock == false){ - display.print(" [ <<<<<< >>>>>> ]"); + display.print("[ <<<< " + String(commonData.data.actpage) + "/" + String(commonData.data.maxpage) + " >>>> ]"); if(String(backlightMode) == "Control by Key"){ // Key for illumination display.setCursor(343, 290); display.print("[ILUM]"); diff --git a/lib/obp60task/PageThreeValues.cpp b/lib/obp60task/PageThreeValues.cpp index 674a01b..724601d 100644 --- a/lib/obp60task/PageThreeValues.cpp +++ b/lib/obp60task/PageThreeValues.cpp @@ -246,9 +246,9 @@ class PageThreeValues : public Page // Key Layout display.setTextColor(textcolor); display.setFont(&Ubuntu_Bold8pt7b); - display.setCursor(115, 290); + display.setCursor(130, 290); if(keylock == false){ - display.print(" [ <<<<<< >>>>>> ]"); + display.print("[ <<<< " + String(commonData.data.actpage) + "/" + String(commonData.data.maxpage) + " >>>> ]"); if(String(backlightMode) == "Control by Key"){ // Key for illumination display.setCursor(343, 290); display.print("[ILUM]"); diff --git a/lib/obp60task/PageTwoValues.cpp b/lib/obp60task/PageTwoValues.cpp index 5b76d81..470dd68 100644 --- a/lib/obp60task/PageTwoValues.cpp +++ b/lib/obp60task/PageTwoValues.cpp @@ -184,9 +184,9 @@ class PageTwoValues : public Page // Key Layout display.setTextColor(textcolor); display.setFont(&Ubuntu_Bold8pt7b); - display.setCursor(115, 290); + display.setCursor(130, 290); if(keylock == false){ - display.print(" [ <<<<<< >>>>>> ]"); + display.print("[ <<<< " + String(commonData.data.actpage) + "/" + String(commonData.data.maxpage) + " >>>> ]"); if(String(backlightMode) == "Control by Key"){ // Key for illumination display.setCursor(343, 290); display.print("[ILUM]"); diff --git a/lib/obp60task/PageVoltage.cpp b/lib/obp60task/PageVoltage.cpp index f4a035e..04b655e 100644 --- a/lib/obp60task/PageVoltage.cpp +++ b/lib/obp60task/PageVoltage.cpp @@ -149,9 +149,9 @@ public: // Key Layout display.setTextColor(textcolor); display.setFont(&Ubuntu_Bold8pt7b); - display.setCursor(115, 290); + display.setCursor(130, 290); if(keylock == false){ - display.print(" [ <<<<<< >>>>>> ]"); + display.print("[ <<<< " + String(commonData.data.actpage) + "/" + String(commonData.data.maxpage) + " >>>> ]"); if(String(backlightMode) == "Control by Key"){ // Key for illumination display.setCursor(343, 290); display.print("[ILUM]"); diff --git a/lib/obp60task/PageWindRose.cpp b/lib/obp60task/PageWindRose.cpp index 11f489f..a0665ab 100644 --- a/lib/obp60task/PageWindRose.cpp +++ b/lib/obp60task/PageWindRose.cpp @@ -339,9 +339,9 @@ public: // Key Layout display.setTextColor(textcolor); display.setFont(&Ubuntu_Bold8pt7b); - display.setCursor(115, 290); + display.setCursor(130, 290); if(keylock == false){ - display.print(" [ <<<<<< >>>>>> ]"); + display.print("[ <<<< " + String(commonData.data.actpage) + "/" + String(commonData.data.maxpage) + " >>>> ]"); if(String(backlightMode) == "Control by Key"){ // Key for illumination display.setCursor(343, 290); display.print("[ILUM]"); diff --git a/lib/obp60task/Pagedata.h b/lib/obp60task/Pagedata.h index ae6c8a6..17b9ae7 100644 --- a/lib/obp60task/Pagedata.h +++ b/lib/obp60task/Pagedata.h @@ -13,6 +13,8 @@ typedef struct{ } PageData; typedef struct{ + int actpage = 0; + int maxpage = 0; double batteryVoltage = 0; double batteryCurrent = 0; double batteryPower = 0; diff --git a/lib/obp60task/obp60task.cpp b/lib/obp60task/obp60task.cpp index fe93fd8..021fae0 100644 --- a/lib/obp60task/obp60task.cpp +++ b/lib/obp60task/obp60task.cpp @@ -502,6 +502,8 @@ void OBP60Task(GwApi *api){ LOG_DEBUG(GwLog::LOG,"obp60task: start mainloop"); int pageNumber=0; int lastPage=pageNumber; + commonData.data.actpage = pageNumber + 1; + commonData.data.maxpage = numPages; bool delayedDisplayUpdate = false; // If select a new pages then make a delayed full display update long firststart = millis(); // First start long starttime0 = millis(); // Mainloop @@ -562,6 +564,8 @@ void OBP60Task(GwApi *api){ if (pageNumber >= numPages){ pageNumber = 0; } + commonData.data.actpage = pageNumber + 1; + commonData.data.maxpage = numPages; } // #10 Swipe left if (keyboardMessage == 10) @@ -570,6 +574,8 @@ void OBP60Task(GwApi *api){ if (pageNumber < 0){ pageNumber = numPages - 1; } + commonData.data.actpage = pageNumber + 1; + commonData.data.maxpage = numPages; } /* // #9 or #10 Refresh display befor start a new page if reshresh is enabled