From 383254a9378a113f920c3f46c40c30ba2b98469a Mon Sep 17 00:00:00 2001 From: klemek Date: Thu, 26 Aug 2021 14:32:27 +0200 Subject: [PATCH] indicate max digits for better computation --- watchfaces/tetris-2.0/Watchy_Tetris.cpp | 17 ++++++++--------- watchfaces/tetris-2.0/Watchy_Tetris.h | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/watchfaces/tetris-2.0/Watchy_Tetris.cpp b/watchfaces/tetris-2.0/Watchy_Tetris.cpp index 78b616c..6b21368 100644 --- a/watchfaces/tetris-2.0/Watchy_Tetris.cpp +++ b/watchfaces/tetris-2.0/Watchy_Tetris.cpp @@ -30,7 +30,7 @@ void WatchyTetris::drawWatchFace() sensor.resetStepCounter(); } uint32_t stepCount = sensor.getCounter(); - drawNumber(191, 41, stepCount); + drawNumber(191, 41, stepCount, 7); //Voltage float VBAT = getBatteryVoltage(); @@ -39,19 +39,18 @@ void WatchyTetris::drawWatchFace() percent = 0; if (percent > 100) percent = 100; - drawNumber(181, 81, percent); + drawNumber(181, 81, percent, 3); //Date - drawNumber(181, 111, currentTime.Month * 100 + currentTime.Day); + drawNumber(181, 111, currentTime.Month * 100 + currentTime.Day, 4); } -void WatchyTetris::drawNumber(uint32_t x, uint32_t y, uint32_t v) +void WatchyTetris::drawNumber(uint32_t x, uint32_t y, uint32_t value, uint32_t max_digits) { - for(int8_t i = 0; i < 8; i++){ - display.drawBitmap(x - i * 10, y, tetris_small_nums[v % 10], 8, 8, GxEPD_BLACK); - v /= 10; - if (v == 0) { + for(int8_t i = 0; i <= max_digits; i++){ + display.drawBitmap(x - i * 10, y, tetris_small_nums[value % 10], 8, 8, GxEPD_BLACK); + value /= 10; + if (value == 0) break; - } } } \ No newline at end of file diff --git a/watchfaces/tetris-2.0/Watchy_Tetris.h b/watchfaces/tetris-2.0/Watchy_Tetris.h index 3d9c3c1..4f82f30 100644 --- a/watchfaces/tetris-2.0/Watchy_Tetris.h +++ b/watchfaces/tetris-2.0/Watchy_Tetris.h @@ -9,7 +9,7 @@ class WatchyTetris : public Watchy public: WatchyTetris(); void drawWatchFace(); - void drawNumber(uint32_t x, uint32_t y, uint32_t v); + void drawNumber(uint32_t x, uint32_t y, uint32_t value, uint32_t max_digits); }; #endif \ No newline at end of file