From 4dedb1eadd66405f65334ddb3d4bfedd43fa0601 Mon Sep 17 00:00:00 2001 From: Thomas Hooge Date: Mon, 21 Oct 2024 10:42:55 +0200 Subject: [PATCH] Fixed some typos --- lib/obp60task/PageBME280.cpp | 4 ++-- lib/obp60task/PageBattery.cpp | 6 +++--- lib/obp60task/PageBattery2.cpp | 6 +++--- lib/obp60task/PageClock.cpp | 2 +- lib/obp60task/PageDST810.cpp | 6 +++--- lib/obp60task/PageFourValues.cpp | 6 +++--- lib/obp60task/PageFourValues2.cpp | 6 +++--- lib/obp60task/PageThreeValues.cpp | 6 +++--- lib/obp60task/PageTwoValues.cpp | 6 +++--- lib/obp60task/PageVoltage.cpp | 4 ++-- 10 files changed, 26 insertions(+), 26 deletions(-) diff --git a/lib/obp60task/PageBME280.cpp b/lib/obp60task/PageBME280.cpp index 5c6b50e..7c17b73 100644 --- a/lib/obp60task/PageBME280.cpp +++ b/lib/obp60task/PageBME280.cpp @@ -8,8 +8,8 @@ class PageBME280 : public Page bool keylock = false; // Keylock public: - PageBME280(CommonData &comon){ - comon.logger->logDebug(GwLog::LOG,"Show PageThreeValue"); + PageBME280(CommonData &common){ + common.logger->logDebug(GwLog::LOG,"Show PageBME280"); } virtual int handleKey(int key){ diff --git a/lib/obp60task/PageBattery.cpp b/lib/obp60task/PageBattery.cpp index a27f88f..3cb3fc7 100644 --- a/lib/obp60task/PageBattery.cpp +++ b/lib/obp60task/PageBattery.cpp @@ -9,8 +9,8 @@ class PageBattery : public Page int average = 0; // Average type [0...3], 0=off, 1=10s, 2=60s, 3=300s public: - PageBattery(CommonData &comon){ - comon.logger->logDebug(GwLog::LOG,"Show PageThreeValue"); + PageBattery(CommonData &common){ + common.logger->logDebug(GwLog::LOG,"Show PageBattery"); } virtual int handleKey(int key){ @@ -348,4 +348,4 @@ PageDescription registerPageBattery( true // Show display header on/off ); -#endif \ No newline at end of file +#endif diff --git a/lib/obp60task/PageBattery2.cpp b/lib/obp60task/PageBattery2.cpp index 51891af..d2c3e47 100644 --- a/lib/obp60task/PageBattery2.cpp +++ b/lib/obp60task/PageBattery2.cpp @@ -201,7 +201,7 @@ public: getdisplay().setCursor(10, 65); getdisplay().print("Bat."); - // Show batery type + // Show battery type getdisplay().setTextColor(textcolor); getdisplay().setFont(&Ubuntu_Bold8pt7b); getdisplay().setCursor(90, 65); @@ -218,7 +218,7 @@ public: getdisplay().setFont(&Ubuntu_Bold16pt7b); getdisplay().print("V"); - // Show batery capacity + // Show battery capacity getdisplay().setTextColor(textcolor); getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b); getdisplay().setCursor(10, 200); @@ -392,4 +392,4 @@ PageDescription registerPageBattery2( true // Show display header on/off ); -#endif \ No newline at end of file +#endif diff --git a/lib/obp60task/PageClock.cpp b/lib/obp60task/PageClock.cpp index 3a56fe3..fc4e9ab 100644 --- a/lib/obp60task/PageClock.cpp +++ b/lib/obp60task/PageClock.cpp @@ -256,7 +256,7 @@ public: if (value1 < 0) {value1 = value1 + 86400;} hour = (value1 / 3600.0); if(hour > 12) hour = hour - 12.0; -// minute = (hour - int(hour)) * 3600.0 / 60.0; // Analog minute pointer smoth moving +// minute = (hour - int(hour)) * 3600.0 / 60.0; // Analog minute pointer smooth moving minute = int((hour - int(hour)) * 3600.0 / 60.0); // Jumping minute pointer from minute to minute LOG_DEBUG(GwLog::DEBUG,"... PageClock, value1: %f hour: %f minute:%f", value1, hour, minute); diff --git a/lib/obp60task/PageDST810.cpp b/lib/obp60task/PageDST810.cpp index 12c24bb..dff5ea3 100644 --- a/lib/obp60task/PageDST810.cpp +++ b/lib/obp60task/PageDST810.cpp @@ -8,8 +8,8 @@ class PageDST810 : public Page bool keylock = false; // Keylock public: - PageDST810(CommonData &comon){ - comon.logger->logDebug(GwLog::LOG,"Show PageDST810"); + PageDST810(CommonData &common){ + common.logger->logDebug(GwLog::LOG,"Show PageDST810"); } virtual int handleKey(int key){ @@ -305,4 +305,4 @@ PageDescription registerPageDST810( true // Show display header on/off ); -#endif \ No newline at end of file +#endif diff --git a/lib/obp60task/PageFourValues.cpp b/lib/obp60task/PageFourValues.cpp index 4b06300..546f903 100644 --- a/lib/obp60task/PageFourValues.cpp +++ b/lib/obp60task/PageFourValues.cpp @@ -8,8 +8,8 @@ class PageFourValues : public Page bool keylock = false; // Keylock public: - PageFourValues(CommonData &comon){ - comon.logger->logDebug(GwLog::LOG,"Show PageFourValues"); + PageFourValues(CommonData &common){ + common.logger->logDebug(GwLog::LOG,"Show PageFourValues"); } virtual int handleKey(int key){ @@ -344,4 +344,4 @@ PageDescription registerPageFourValues( true // Show display header on/off ); -#endif \ No newline at end of file +#endif diff --git a/lib/obp60task/PageFourValues2.cpp b/lib/obp60task/PageFourValues2.cpp index d61b754..8d05485 100644 --- a/lib/obp60task/PageFourValues2.cpp +++ b/lib/obp60task/PageFourValues2.cpp @@ -8,8 +8,8 @@ class PageFourValues2 : public Page bool keylock = false; // Keylock public: - PageFourValues2(CommonData &comon){ - comon.logger->logDebug(GwLog::LOG,"Show PageFourValues2"); + PageFourValues2(CommonData &common){ + common.logger->logDebug(GwLog::LOG,"Show PageFourValues2"); } virtual int handleKey(int key){ @@ -344,4 +344,4 @@ PageDescription registerPageFourValues2( true // Show display header on/off ); -#endif \ No newline at end of file +#endif diff --git a/lib/obp60task/PageThreeValues.cpp b/lib/obp60task/PageThreeValues.cpp index 8953c9b..8759570 100644 --- a/lib/obp60task/PageThreeValues.cpp +++ b/lib/obp60task/PageThreeValues.cpp @@ -8,8 +8,8 @@ class PageThreeValues : public Page bool keylock = false; // Keylock public: - PageThreeValues(CommonData &comon){ - comon.logger->logDebug(GwLog::LOG,"Show PageThreeValue"); + PageThreeValues(CommonData &common){ + common.logger->logDebug(GwLog::LOG,"Show PageThreeValue"); } virtual int handleKey(int key){ @@ -282,4 +282,4 @@ PageDescription registerPageThreeValues( true // Show display header on/off ); -#endif \ No newline at end of file +#endif diff --git a/lib/obp60task/PageTwoValues.cpp b/lib/obp60task/PageTwoValues.cpp index 506ded2..48e8210 100644 --- a/lib/obp60task/PageTwoValues.cpp +++ b/lib/obp60task/PageTwoValues.cpp @@ -8,8 +8,8 @@ class PageTwoValues : public Page bool keylock = false; // Keylock public: - PageTwoValues(CommonData &comon){ - comon.logger->logDebug(GwLog::LOG,"Show PageTwoValue"); + PageTwoValues(CommonData &common){ + common.logger->logDebug(GwLog::LOG,"Show PageTwoValue"); } virtual int handleKey(int key){ @@ -222,4 +222,4 @@ PageDescription registerPageTwoValues( true // Show display header on/off ); -#endif \ No newline at end of file +#endif diff --git a/lib/obp60task/PageVoltage.cpp b/lib/obp60task/PageVoltage.cpp index 8e280db..9a2cb76 100644 --- a/lib/obp60task/PageVoltage.cpp +++ b/lib/obp60task/PageVoltage.cpp @@ -162,7 +162,7 @@ public: getdisplay().setCursor(270, 100); getdisplay().print("V"); - // Show batery type + // Show battery type getdisplay().setTextColor(textcolor); getdisplay().setFont(&Ubuntu_Bold8pt7b); getdisplay().setCursor(295, 100); @@ -284,4 +284,4 @@ PageDescription registerPageVoltage( true // Show display header on/off ); -#endif \ No newline at end of file +#endif