Emil 5. Geburtstag + Creeper

src/display/Display.cpp

@@ -134,6 +134,41 @@ bool SYMBOLS[SYMBOL_COUNT][DISPLAY_CHAR_WIDTH * DISPLAY_CHAR_HEIGHT] = {
     X, _, _,
     X, X, X,
   },
+  {
+    X, _, X,
+    X, _, X,
+    X, X, X,
+    X, _, X,
+    X, _, X,
+  },
+  {
+    X, X, _,
+    X, _, X,
+    X, X, _,
+    X, X, _,
+    X, _, X,
+  },
+  {
+    X, _, _,
+    X, _, _,
+    X, _, _,
+    X, _, _,
+    X, _, _,
+  },
+  {
+    X, _, _,
+    X, _, _,
+    X, _, _,
+    X, _, _,
+    X, X, X,
+  },
+  {
+    _, _, _,
+    _, _, _,
+    _, _, _,
+    _, _, _,
+    _, _, _,
+  },
   // this must always be the last symbol (fallback)
   {
     X, X, X,

src/display/Display.h

@@ -5,15 +5,21 @@
 #include "Adafruit_NeoPixel.h"
 #include "Vector.h"
 
-#define SYMBOL_COUNT          20
+#define SYMBOL_COUNT          26
 
+#define SYMBOL_J              11
+#define SYMBOL_X              12
 #define SYMBOL_DASH           13
 #define SYMBOL_PERCENT        14
-
 #define SYMBOL_T              15
 #define SYMBOL_A              16
 #define SYMBOL_G              17
 #define SYMBOL_E              18
+#define SYMBOL_H              19
+#define SYMBOL_R              20
+#define SYMBOL_I              21
+#define SYMBOL_L              22
+#define SYMBOL_SPACE          23
 
 #define DISPLAY_CHAR_WIDTH    3
 #define DISPLAY_CHAR_HEIGHT   5
@@ -48,8 +54,7 @@ private:
 
 public:
 
-  Display(uint8_t width, uint8_t height) :
+  Display(uint8_t width, uint8_t height) : width(width), height(height),
-      width(width), height(height),
                                            pixelCount(width * height),
                                            pixelByteCount(pixelCount * sizeof(Color)),
                                            leds(pixelCount, GPIO_NUM_13) {
@@ -130,15 +135,15 @@ public:
     }
 
     bool showIfZero = false;
-//      Serial.printf("x=%d, y=%d, value=%d, align=%s, digitCount=%d, divider=%d\n", x, y, value, align == LEFT ? "LEFT" : "RIGHT", digitCount, divider);
+    //      Serial.printf("x=%d, y=%d, value=%d, align=%s, digitCount=%d, divider=%d\n", x, y, value, align == LEFT ? "LEFT" : "RIGHT", digitCount, divider);
     for (int digitPos = 0; digitPos < digitCount; ++digitPos) {
       const int digitVal = value / divider % 10;
       showIfZero |= digitVal != 0 || (digitPos == digitCount - 1);
       x += print(x, y, digitVal, color, showIfZero) + 1;
-//        Serial.printf("  digitPos=%d, x=%d, y=%d, digitVal=%d, showIfZero=%s, divider=%d\n", digitPos, x, y, digitVal, showIfZero ? "true" : "false", divider);
+      //        Serial.printf("  digitPos=%d, x=%d, y=%d, digitVal=%d, showIfZero=%s, divider=%d\n", digitPos, x, y, digitVal, showIfZero ? "true" : "false", divider);
       divider /= 10;
     }
-//      Serial.println();
+    //      Serial.println();
 
     return x;
   }
@@ -164,6 +169,57 @@ public:
     return DISPLAY_CHAR_WIDTH;
   }
 
+  // TODO REMOVE QUICK & DIRTY
+  uint8_t printM(uint8_t xPos, uint8_t yPos, Color color) {
+    bool sym[5][5] = {
+      {X,_,_,_,X},
+      {X,X,_,X,X},
+      {X,_,X,_,X},
+      {X,_,_,_,X},
+      {X,_,_,_,X},
+    };
+    for (int y = 0; y < countof(sym); ++y) {
+      for (int x = 0; x < countof(sym[0]); ++x) {
+        if (sym[y][x]) {
+          set(xPos + x, yPos + y, color);
+        } else {
+          set(xPos + x, yPos + y, BLACK);
+        }
+      }
+    }
+    return countof(sym[0]);
+  }
+
+  // TODO REMOVE QUICK & DIRTY
+  uint8_t printCreeper(uint8_t xPos, uint8_t yPos) {
+    Color G = GREEN;
+    Color I = {128, 255, 128};
+    Color O = BLACK;
+    Color sym[7][7] = {
+      {G, G, G, G, G, G, G},
+      {G, I, I, I, I, I, G},
+      {G, I, O, I, O, I, G},
+      {G, I, I, I, I, I, G},
+      {G, I, O, O, O, I, G},
+      {G, I, O, I, O, I, G},
+      {G, G, G, G, G, G, G},
+    };
+    for (int y = 0; y < countof(sym); ++y) {
+      for (int x = 0; x < countof(sym[0]); ++x) {
+        set(xPos + x, yPos + y, sym[y][x]);
+      }
+    }
+    return countof(sym[0]);
+  }
+
+  // TODO REMOVE QUICK & DIRTY
+  uint8_t printI(uint8_t xPos, uint8_t yPos, Color color) {
+    for (int y = 0; y < 5; ++y) {
+      set(xPos, yPos + y, color);
+    }
+    return 1;
+  }
+
   void set(Vector pos, Color color) {
     set((uint8_t) round(pos.x), (uint8_t) round(pos.y), color);
   }

src/mode/CountDown/CountDown.h

@@ -1,7 +1,7 @@
 #ifndef MODE_COUNT_DOWN_H
 #define MODE_COUNT_DOWN_H
 
-#define MAX_FIREWORKS                 5
+#define MAX_FIREWORKS                 6
 
 #include "mode/Mode.h"
 #include "CountDownFirework.h"
@@ -28,9 +28,8 @@ private:
 
 public:
 
-    CountDown(Display &display, bool bars, bool plus1DayForSleepingCount) :
+  CountDown(Display& display, bool bars, bool plus1DayForSleepingCount) : Mode(display), bars(bars), plus1DayForSleepingCount(plus1DayForSleepingCount) {
-        Mode(display), bars(bars), plus1DayForSleepingCount(plus1DayForSleepingCount) {
+    for (auto& firework: fireworks) {
-      for (auto &firework: fireworks) {
       firework.init(display);
     }
   }
@@ -52,7 +51,7 @@ protected:
     }
     if (dateReached()) {
       setMode(FIREWORK);
-        for (auto &firework: fireworks) {
+      for (auto& firework: fireworks) {
         firework.step(microseconds);
       }
       markDirty();
@@ -72,11 +71,11 @@ protected:
     hours = (int) floor(diffSeconds / (60 * 60)) % 24;
     minutes = (int) floor(diffSeconds / 60) % 60;
     seconds = (int) diffSeconds % 60;
-//      Serial.printf("now=%4d.%02d.%02d (%ld), conf=%4d.%02d.%02d (%ld), diff=%f, %dd %2d:%02d:%02d\n",
+    //      Serial.printf("now=%4d.%02d.%02d (%ld), conf=%4d.%02d.%02d (%ld), diff=%f, %dd %2d:%02d:%02d\n",
-//                    now.tm_year, now.tm_mon, now.tm_mday, nowEpochSeconds,
+    //                    now.tm_year, now.tm_mon, now.tm_mday, nowEpochSeconds,
-//                    config.date.tm_year, config.date.tm_mon, config.date.tm_mday, dateEpochSeconds,
+    //                    config.date.tm_year, config.date.tm_mon, config.date.tm_mday, dateEpochSeconds,
-//                    diffSeconds,
+    //                    diffSeconds,
-//                    days, hours, minutes, seconds);
+    //                    days, hours, minutes, seconds);
     setMode(COUNTDOWN);
     if (days == 0) {
       loopLastDay();
@@ -103,12 +102,12 @@ protected:
     return now.tm_year == config.date.tm_year && now.tm_mon == config.date.tm_mon && now.tm_mday == config.date.tm_mday;
   }
 
-    void draw(Display &display) override {
+  void draw(Display& display) override {
     display.clear();
     if (!realtimeOK) {
       drawNoTime(display);
     } else if (dateReached()) {
-        for (auto &firework: fireworks) {
+      for (auto& firework: fireworks) {
         firework.draw(display);
       }
       drawYear(display, now.tm_year);
@@ -134,7 +133,7 @@ private:
     }
   }
 
-    void drawCountdown(Display &display) {
+  void drawCountdown(Display& display) {
     if (plus1DayForSleepingCount) {
       drawSleepingCount(display);
     } else if (days <= 0 && bars) {
@@ -144,7 +143,7 @@ private:
     }
   }
 
-    void drawSleepingCount(Display &display) const {
+  void drawSleepingCount(Display& display) const {
     int sleepCount = days + 1;
     int y = 1;
     uint8_t x = display.print2(3 * (DISPLAY_CHAR_WIDTH + 1), y, sleepCount, WHITE);
@@ -157,13 +156,13 @@ private:
     }
   }
 
-    void drawCountdownBars(Display &display) const {
+  void drawCountdownBars(Display& display) const {
     drawBar(display, 0, 24, 1, 24, hours, RED, MAGENTA, 0);
     drawBar(display, 2, 30, 2, 60, minutes, BLUE, VIOLET, 5);
     drawBar(display, 5, 30, 2, 60, seconds, GREEN, YELLOW, 5);
   }
 
-    static void drawBar(Display &display, uint8_t _y, uint8_t _w, uint8_t _h, uint8_t max, uint8_t value, const Color &color, const Color &tickColor, uint8_t ticks) {
+  static void drawBar(Display& display, uint8_t _y, uint8_t _w, uint8_t _h, uint8_t max, uint8_t value, const Color& color, const Color& tickColor, uint8_t ticks) {
     auto totalOnCount = (uint8_t) round((double) value / max * _w * _h);
     uint8_t doneOnCount = 0;
     for (uint8_t y = 0; y < _h; y++) {
@@ -183,7 +182,7 @@ private:
     }
   }
 
-    void drawCountdownNumbers(Display &display) const {
+  void drawCountdownNumbers(Display& display) const {
     uint8_t x = 0;
     if (days > 0) {
       drawDay(display, days, &x);
@@ -203,7 +202,7 @@ private:
     }
   }
 
-    static void drawNoTime(Display &display) {
+  static void drawNoTime(Display& display) {
     uint8_t x = 2;
     x += display.print(x, 1, SYMBOL_DASH, WHITE, true);
     x++;
@@ -218,7 +217,7 @@ private:
     display.print(x, 1, SYMBOL_DASH, WHITE, true);
   }
 
-    static void drawDay(Display &display, int days, uint8_t *x) {
+  static void drawDay(Display& display, int days, uint8_t *x) {
     if (days >= 100) {
       *x += display.print(*x, 1, days / 100, WHITE, true) + 1;
     } else {
@@ -234,7 +233,7 @@ private:
     *x += display.print(*x, 1, days % 10, WHITE, true);
   }
 
-    static void drawHour(Display &display, int days, int hours, uint8_t *x) {
+  static void drawHour(Display& display, int days, int hours, uint8_t *x) {
     if (days > 0 || hours >= 10) {
       *x += display.print(*x, 1, hours / 10, WHITE, true) + 1;
     } else {
@@ -243,12 +242,12 @@ private:
     *x += display.print(*x, 1, hours % 10, WHITE, true);
   }
 
-    static void draw2Digit(Display &display, int value, uint8_t *x) {
+  static void draw2Digit(Display& display, int value, uint8_t *x) {
     *x += display.print(*x, 1, value / 10, WHITE, true) + 1;
     *x += display.print(*x, 1, value % 10, WHITE, true);
   }
 
-    static void drawSecondsBar(Display &display, int seconds) {
+  static void drawSecondsBar(Display& display, int seconds) {
     for (int pos = 0; pos < 30; pos++) {
       if (pos <= seconds - 30) {
         display.set(pos + 1, 7, GREEN);
@@ -258,7 +257,7 @@ private:
     }
   }
 
-    void drawSubSecondsBar(Display &display) const {
+  void drawSubSecondsBar(Display& display) const {
     for (int pos = 0; pos < 32; pos++) {
       if (pos < 32 - level) {
         display.set(pos, 7, GREEN);
@@ -266,13 +265,32 @@ private:
     }
   }
 
-    static void drawYear(Display &display, int year) {
+  // ReSharper disable CppDFAUnusedValue
+
+  void drawYear(Display& display, int year) const {
+    if (plus1DayForSleepingCount) {
+      uint8_t x = 0;
+      x += display.print(x, 1,SYMBOL_E, WHITE, true);
+      x += 1;
+      x += display.printM(x, 1, WHITE);
+      x += 1;
+      x += display.printI(x, 1, WHITE);
+      x += 1;
+      x += display.print(x, 1,SYMBOL_L, WHITE, true);
+      x += 4;
+      x += display.print(x, 1, 5, WHITE, true);
+      x += 2;
+      display.printCreeper(x, 0);
+    } else {
       uint8_t x = 8;
       x += display.print(x, 1, year / 1000 % 10, WHITE, true) + 1;
       x += display.print(x, 1, year / 100 % 10, WHITE, true) + 1;
       x += display.print(x, 1, year / 10 % 10, WHITE, true) + 1;
-      display.print(x, 1, year / 1 % 10, WHITE, true);
+      x += display.print(x, 1, year / 1 % 10, WHITE, true);
     }
+  }
+
+  // ReSharper restore CppDFAUnusedValue
 
 };