patrick/RGBMatrixDisplay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

print Align LEFT, CENTER, RIGHT

Browse Source
This commit is contained in:
Patrick Haßel 2025-01-25 22:59:16 +01:00
parent 687e6cf70d
commit 17961bad6d
6 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mode/Clock/Clock.h
View File

@ -27,7 +27,7 @@ protected:
void draw(Display& display) override { void draw(Display& display) override {
display.clear(); 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);
} }
}; };

14
src/mode/CountDown/CountDown.h
View File

@ -141,7 +141,7 @@ private:
void drawSleepingCount(Display& display) const { void drawSleepingCount(Display& display) const {
const auto sleepCount = days + 1; 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 { void drawCountdownBars(Display& display) const {
@ -152,13 +152,13 @@ private:
void drawCountdownNumbers(Display& display) const { void drawCountdownNumbers(Display& display) const {
if (days >= 10) { if (days >= 10) {
display.printf(1, 1, White, "%3d TAGE", days); display.printf(30, 1, RIGHT, White, "%d TAGE", days);
drawSecondsBar(display, seconds); drawSecondsBar(display, seconds);
} else if (days > 0) { } 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); drawSecondsBar(display, seconds);
} else { } 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); drawSubSecondsBar(display);
} }
} }
@ -184,7 +184,7 @@ private:
} }
static void drawNoTime(Display& display) { static void drawNoTime(Display& display) {
display.print(1, 1, Red, "--:--:--"); display.print(1, 1, LEFT, Red, "--:--:--");
} }
static void drawSecondsBar(Display& display, const int seconds) { static void drawSecondsBar(Display& display, const int seconds) {
@ -207,9 +207,9 @@ private:
void drawYear(Display& display, const int year) const { void drawYear(Display& display, const int year) const {
if (plus1DayForSleepingCount) { if (plus1DayForSleepingCount) {
display.printf(1, 1, White, "EMIL 5"); display.printf(1, 1, LEFT, White, "EMIL 5");
} else { } else {
display.printf(1, 1, White, "%5d", year); display.printf(1, 1, LEFT, White, "%5d", year);
} }
} }

12
src/mode/Energy/Energy.h
View File

@ -73,14 +73,14 @@ protected:
display.clear(); display.clear();
if (page == 0) { if (page == 0) {
display.printf(0, 1, Green, "%3.0f€", costSaved); display.printf(1, 1, LEFT, Green, "%3.0f€", costSaved);
display.printf(16, 1, White, "%3.0f%%", amortisationPercent); display.printf(30, 1, RIGHT, White, "%.0f%%", amortisationPercent);
} else if (page == 1) { } else if (page == 1) {
display.printf(0, 1, Blue, "%3.0f", photovoltaicEnergyKWh); display.printf(1, 1, LEFT, Blue, "%3.0f", photovoltaicEnergyKWh);
display.printf(16, 1, Green, "%3.0f", selfConsumedKWh); display.printf(30, 1, RIGHT, Green, "%.0f", selfConsumedKWh);
} else { } else {
display.printf(0, 1, Orange, "%4.0f", gridImportKWh); display.printf(1, 1, LEFT, Orange, "%4.0f", gridImportKWh);
display.printf(16, 1, Magenta, "%3.0f", gridExportKWh); display.printf(30, 1, RIGHT, Magenta, "%.0f", gridExportKWh);
} }
} }

12
src/mode/Pong/Pong.h
View File

@ -94,8 +94,8 @@ protected:
display.clear(); display.clear();
switch (status) { switch (status) {
case SCORE: case SCORE:
display.printf(1, 1, Green, "%d", player0.score); display.printf(1, 1, LEFT, Green, "%d", player0.score);
display.printf(28, 1, Red, "%d", player1.score); display.printf(30, 1, RIGHT, Red, "%d", player1.score);
break; break;
case PLAY: case PLAY:
for (auto i = 0; i < player0.size; ++i) { for (auto i = 0; i < player0.size; ++i) {
@ -108,11 +108,11 @@ protected:
break; break;
case OVER: case OVER:
if (player0.score > player1.score) { if (player0.score > player1.score) {
display.printf(1, 1, Green, "W", player0.score); display.printf(1, 1, LEFT, Green, "W", player0.score);
display.printf(28, 1, Red, "L", player1.score); display.printf(30, 1, RIGHT, Red, "L", player1.score);
} else if (player0.score < player1.score) { } else if (player0.score < player1.score) {
display.printf(1, 1, Red, "L", player0.score); display.printf(1, 1, LEFT, Red, "L", player0.score);
display.printf(26, 1, Green, "W", player1.score); display.printf(30, 1, RIGHT, Green, "W", player1.score);
} }
break; break;
} }

4
src/mode/Power/Power.h
View File

@ -59,10 +59,10 @@ protected:
display.clear(); display.clear();
const auto pvColor = photovoltaicPowerW >= 100 ? Green : photovoltaicPowerW >= 20 ? Yellow : Red; 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; 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);
} }
}; };

10
src/mode/Timer/Timer.h
View File

@ -67,15 +67,15 @@ protected:
void draw(Display& display) override { void draw(Display& display) override {
display.clear(); display.clear();
if (days > 10) { if (days > 10) {
display.printf(1, 1, White, "%3d TAGE", days); display.printf(30, 1, RIGHT, White, "%d TAGE", days);
} else if (days > 0) { } 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) { } 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) { } else if (minutes > 0) {
display.printf(1, 1, White, "%2d:%02d", minutes, seconds); display.printf(30, 1, RIGHT, White, "%d:%02d", minutes, seconds);
} else { } else {
display.printf(1, 1, Orange, "%2d", seconds); display.printf(30, 1, RIGHT, Orange, "%d", seconds);
} }
} }