From 17961bad6d42531d87615b5e24ab0b44cd59d660 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Ha=C3=9Fel?= Date: Sat, 25 Jan 2025 22:59:16 +0100 Subject: [PATCH] print Align LEFT, CENTER, RIGHT --- src/mode/Clock/Clock.h | 2 +- src/mode/CountDown/CountDown.h | 14 +++++++------- src/mode/Energy/Energy.h | 12 ++++++------ src/mode/Pong/Pong.h | 12 ++++++------ src/mode/Power/Power.h | 4 ++-- src/mode/Timer/Timer.h | 10 +++++----- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/mode/Clock/Clock.h b/src/mode/Clock/Clock.h index e0d0a51..8626687 100644 --- a/src/mode/Clock/Clock.h +++ b/src/mode/Clock/Clock.h @@ -27,7 +27,7 @@ protected: void draw(Display& display) override { display.clear(); - display.printf(2, 1, White, "%2d:%02d:%02d", now.tm_hour, now.tm_min, now.tm_sec); + display.printf(16, 1, CENTER, White, "%2d:%02d:%02d", now.tm_hour, now.tm_min, now.tm_sec); } }; diff --git a/src/mode/CountDown/CountDown.h b/src/mode/CountDown/CountDown.h index dc10f9f..938d9a6 100644 --- a/src/mode/CountDown/CountDown.h +++ b/src/mode/CountDown/CountDown.h @@ -141,7 +141,7 @@ private: void drawSleepingCount(Display& display) const { const auto sleepCount = days + 1; - display.printf(1, 1, White, "%3d %s", sleepCount, sleepCount == 1 ? "TAG" : "TAGE"); + display.printf(30, 1, RIGHT, White, "%d %s", sleepCount, sleepCount == 1 ? "TAG" : "TAGE"); } void drawCountdownBars(Display& display) const { @@ -152,13 +152,13 @@ private: void drawCountdownNumbers(Display& display) const { if (days >= 10) { - display.printf(1, 1, White, "%3d TAGE", days); + display.printf(30, 1, RIGHT, White, "%d TAGE", days); drawSecondsBar(display, seconds); } else if (days > 0) { - display.printf(1, 1, White, "%d %2d:%02d", days, hours, minutes); + display.printf(30, 1, RIGHT, White, "%d %2d:%02d", days, hours, minutes); drawSecondsBar(display, seconds); } else { - display.printf(1, 1, White, "%d:%02d:%02d", hours, minutes, seconds); + display.printf(30, 1, RIGHT, White, "%d:%02d:%02d", hours, minutes, seconds); drawSubSecondsBar(display); } } @@ -184,7 +184,7 @@ private: } static void drawNoTime(Display& display) { - display.print(1, 1, Red, "--:--:--"); + display.print(1, 1, LEFT, Red, "--:--:--"); } static void drawSecondsBar(Display& display, const int seconds) { @@ -207,9 +207,9 @@ private: void drawYear(Display& display, const int year) const { if (plus1DayForSleepingCount) { - display.printf(1, 1, White, "EMIL 5"); + display.printf(1, 1, LEFT, White, "EMIL 5"); } else { - display.printf(1, 1, White, "%5d", year); + display.printf(1, 1, LEFT, White, "%5d", year); } } diff --git a/src/mode/Energy/Energy.h b/src/mode/Energy/Energy.h index 16a37c4..4a748df 100644 --- a/src/mode/Energy/Energy.h +++ b/src/mode/Energy/Energy.h @@ -73,14 +73,14 @@ protected: display.clear(); if (page == 0) { - display.printf(0, 1, Green, "%3.0f€", costSaved); - display.printf(16, 1, White, "%3.0f%%", amortisationPercent); + display.printf(1, 1, LEFT, Green, "%3.0f€", costSaved); + display.printf(30, 1, RIGHT, White, "%.0f%%", amortisationPercent); } else if (page == 1) { - display.printf(0, 1, Blue, "%3.0f", photovoltaicEnergyKWh); - display.printf(16, 1, Green, "%3.0f", selfConsumedKWh); + display.printf(1, 1, LEFT, Blue, "%3.0f", photovoltaicEnergyKWh); + display.printf(30, 1, RIGHT, Green, "%.0f", selfConsumedKWh); } else { - display.printf(0, 1, Orange, "%4.0f", gridImportKWh); - display.printf(16, 1, Magenta, "%3.0f", gridExportKWh); + display.printf(1, 1, LEFT, Orange, "%4.0f", gridImportKWh); + display.printf(30, 1, RIGHT, Magenta, "%.0f", gridExportKWh); } } diff --git a/src/mode/Pong/Pong.h b/src/mode/Pong/Pong.h index db8ac0f..7b768d8 100644 --- a/src/mode/Pong/Pong.h +++ b/src/mode/Pong/Pong.h @@ -94,8 +94,8 @@ protected: display.clear(); switch (status) { case SCORE: - display.printf(1, 1, Green, "%d", player0.score); - display.printf(28, 1, Red, "%d", player1.score); + display.printf(1, 1, LEFT, Green, "%d", player0.score); + display.printf(30, 1, RIGHT, Red, "%d", player1.score); break; case PLAY: for (auto i = 0; i < player0.size; ++i) { @@ -108,11 +108,11 @@ protected: break; case OVER: if (player0.score > player1.score) { - display.printf(1, 1, Green, "W", player0.score); - display.printf(28, 1, Red, "L", player1.score); + display.printf(1, 1, LEFT, Green, "W", player0.score); + display.printf(30, 1, RIGHT, Red, "L", player1.score); } else if (player0.score < player1.score) { - display.printf(1, 1, Red, "L", player0.score); - display.printf(26, 1, Green, "W", player1.score); + display.printf(1, 1, LEFT, Red, "L", player0.score); + display.printf(30, 1, RIGHT, Green, "W", player1.score); } break; } diff --git a/src/mode/Power/Power.h b/src/mode/Power/Power.h index 0cbb612..136ea1a 100644 --- a/src/mode/Power/Power.h +++ b/src/mode/Power/Power.h @@ -59,10 +59,10 @@ protected: display.clear(); const auto pvColor = photovoltaicPowerW >= 100 ? Green : photovoltaicPowerW >= 20 ? Yellow : Red; - display.printf(0, 1, pvColor, "%3.0f", photovoltaicPowerW); + display.printf(1, 1, LEFT, pvColor, "%3.0f", photovoltaicPowerW); const auto gridColor = gridPowerW >= 20 ? Orange : gridPowerW >= -20 ? Green : Magenta; - display.printf(16, 1, gridColor, "%4.0f", gridPowerW); + display.printf(30, 1, RIGHT, gridColor, "%.0f", gridPowerW); } }; diff --git a/src/mode/Timer/Timer.h b/src/mode/Timer/Timer.h index 99a0038..dae5ee0 100644 --- a/src/mode/Timer/Timer.h +++ b/src/mode/Timer/Timer.h @@ -67,15 +67,15 @@ protected: void draw(Display& display) override { display.clear(); if (days > 10) { - display.printf(1, 1, White, "%3d TAGE", days); + display.printf(30, 1, RIGHT, White, "%d TAGE", days); } else if (days > 0) { - display.printf(1, 1, White, "%d %2d:%02d", days, hours, minutes); + display.printf(30, 1, RIGHT, White, "%d %2d:%02d", days, hours, minutes); } else if (hours > 0) { - display.printf(1, 1, White, "%2d:%02d:%02d", hours, minutes, seconds); + display.printf(30, 1, RIGHT, White, "%d:%02d:%02d", hours, minutes, seconds); } else if (minutes > 0) { - display.printf(1, 1, White, "%2d:%02d", minutes, seconds); + display.printf(30, 1, RIGHT, White, "%d:%02d", minutes, seconds); } else { - display.printf(1, 1, Orange, "%2d", seconds); + display.printf(30, 1, RIGHT, Orange, "%d", seconds); } }