src/Display.cpp

@@ -43,13 +43,13 @@ const bool DOT7[][7][1] = {
     {XX},
   },
   {
-    {__},
     {__},
     {XX},
     {__},
-    {XX},
     {__},
     {__},
+    {XX},
+    {__},
   },
   {
     {__},
@@ -94,13 +94,13 @@ const bool NUM7[][7][4] = {
     {__, XX, XX, __},
   },
   {
-    {__, __, __, XX},
     {__, __, XX, XX},
     {__, XX, __, XX},
     {XX, __, __, XX},
     {__, __, __, XX},
     {__, __, __, XX},
     {__, __, __, XX},
+    {__, __, __, XX},
   },
   {
     {__, XX, XX, __},

src/Display.h

@@ -54,6 +54,7 @@ class Display {
   }
 
 public:
+
   explicit Display(): leds(8 * 32, GPIO_NUM_13,NEO_GRB + NEO_KHZ800) {
     //
   }
@@ -73,7 +74,7 @@ public:
         pixels[mapPixel(x, y)] = false;
       }
     }
-    setBrightness(64);
+    setBrightness(32);
     clear();
     show();
   }
@@ -85,11 +86,11 @@ public:
   }
 
   void setPixel(const int x, const int y, const Color &color) {
-    if (x >= 32 || y >= 8) {
+    const auto index = mapPixel(x, y);
-      Serial.printf("[ERROR] No pixel at (%d, %d) >= %d\n", x, y, 8 * 32);
+    if (index >= 8 * 32) {
+      Serial.printf("[ERROR] No pixel at (%d, %d) = %d >= %d\n", x, y, index, 8 * 32);
       return;
     }
-    const auto index = mapPixel(x, y);
 #if LEDS_ENABLED
     leds.setPixelColor(index, color.r, color.g, color.b);
 #endif
@@ -154,8 +155,7 @@ public:
   }
 
   template<int symbolHeight, int symbolWidth>
-  int printSymbol(const int x, const int y, const int index, const Color &color,
+  int printSymbol(const int x, const int y, const int index, const Color &color, const bool symbols[][symbolHeight][symbolWidth]) {
-                  const bool symbols[][symbolHeight][symbolWidth]) {
     for (int innerY = 0; innerY < symbolHeight; innerY++) {
       for (int innerX = 0; innerX < symbolWidth; innerX++) {
         if (symbols[index][innerY][innerX]) {

src/mode/ModeTimer.h

@@ -8,14 +8,6 @@
 #include "Rest.h"
 #include "Timer.h"
 
-#define DEC_MIL ( 100 )
-#define SEC_MIL ( 1000 )
-#define MIN_MIL ( 60 * SEC_MIL )
-#define HOU_MIL ( 60 * MIN_MIL )
-#define DAY_MIL ( 24 * HOU_MIL )
-
-#define ENABLE_DECIS  false
-
 enum Stage {
   FIRST_HALF, SECOND_HALF, LAST_MINUTE, FINALE
 };
@@ -77,6 +69,7 @@ class ModeTimer final : public Mode {
   Rest last{0};
 
 public:
+
   explicit ModeTimer()
     : Mode("Timer"),
       countdown("countdown", [this]() {
@@ -134,7 +127,6 @@ public:
     }
     if (!countdown.isRunning()) {
       init();
-      doBeep(1);
       countdown.start();
     } else {
       pause.toggle();
@@ -148,17 +140,7 @@ public:
   }
 
   void draw(Display &display) override {
-    if (countdown.getRestMillis() >= DAY_MIL) {
+    rest = Rest(countdown.getRestMillis());
-      rest = Rest(intCeilDiv(countdown.getRestMillis(), HOU_MIL) * HOU_MIL);
-    } else if (countdown.getRestMillis() >= MIN_MIL) {
-      rest = Rest(intCeilDiv(countdown.getRestMillis(), SEC_MIL) * SEC_MIL);
-    } else {
-#if ENABLE_DECIS
-      rest = Rest(intCeilDiv(countdown.getRestMillis(), DEC_MIL) * DEC_MIL);
-#else
-      rest = Rest(intCeilDiv(countdown.getRestMillis(), SEC_MIL) * SEC_MIL);
-#endif
-    }
 
     display.clear();
     if (flash.isRunning()) {
@@ -192,6 +174,7 @@ public:
   }
 
 private:
+
   void doBeep(const uint32_t count) {
     beepSet(true);
     beep.startCount(count * 2 - 1);
@@ -232,8 +215,7 @@ private:
       dirty |= rest.hourChanged(last);
       dirtyPrint = true;
     } else if (rest.hoursTotal > 0) {
-      display.print(16, 0, ALIGN_CENTER, FONT7, color, "%d:%02d:%02d", rest.hoursPart, rest.minutesPart,
+      display.print(16, 0, ALIGN_CENTER, FONT7, color, "%d:%02d:%02d", rest.hoursPart, rest.minutesPart, rest.secondsPart);
-                    rest.secondsPart);
       dirty |= rest.secondChanged(last);
       dirtyPrint = true;
     } else if (rest.minutesTotal > 0) {
@@ -241,15 +223,7 @@ private:
       dirty |= rest.secondChanged(last);
       dirtyPrint = true;
     } else {
-#if ENABLE_DECIS
       display.print(16, 0, ALIGN_CENTER, FONT7, color, "%d.%d", rest.secondsPart, rest.decisPart);
-#else
-      if (rest.secondsTotal > 9) {
-        display.print(16, 0, ALIGN_CENTER, FONT7, color, "%d", rest.secondsPart, rest.secondsPart);
-      } else {
-        display.print(16, 0, ALIGN_CENTER, FONT7, color, "%d  %d  %d", rest.secondsPart, rest.secondsPart, rest.secondsPart);
-      }
-#endif
       dirty |= rest.deciChanged(last);
       dirtyPrint |= rest.secondChanged(last);
     }

src/mode/Rest.h

@@ -1,13 +1,6 @@
 #ifndef REST_H
 #define REST_H
 
-inline uint32_t intCeilDiv(const uint32_t dividend, const uint32_t divisor) {
-  if (dividend == 0) {
-    return 0;
-  }
-  return (dividend + divisor - 1) / divisor;
-}
-
 struct Rest {
 
   uint64_t millisTotal;