Merge branch 'master' of https://git.schle.nz/fabian/pitrix

include/effect_big_clock.h

@@ -10,7 +10,7 @@ private:
 	CRGB _color_seconds_moving_light = CRGB(0x666600);
     CRGB _color_seconds_moving_dark = CRGB(0x660000);
 
-    void _draw_seconds();
+    void _draw_seconds(uint8_t seconds);
     void _draw_border_pixel(accum88 pos, CRGB* color);
 
 public:

include/effect_clock.h

@@ -10,7 +10,7 @@ protected:
     Window* window = new Window(0, LED_HEIGHT - 6, LED_WIDTH, 6);
 
 public:
-    ~ClockEffect();
+    virtual ~ClockEffect();
     virtual void loop(uint16_t ms);
     String get_name() override { return "clock"; }
     void loop_with_invert(bool invert);
@@ -20,5 +20,6 @@ public:
 class NightClockEffect : public ClockEffect {
 public:
 	NightClockEffect();
+    ~NightClockEffect();
 	void loop(uint16_t ms) override;
 };

include/effect_matrix.h

@@ -48,6 +48,15 @@ public:
     RandomMatrixEffectColumn(Window* win, uint8_t dir, bool rnd=false) : MatrixEffectColumn(win, dir, rnd) {};
 };
 
+class ColumnMatrixEffectColumn : public MatrixEffectColumn {
+protected:
+    uint8_t _hue;
+    CRGB _getColor(uint8_t height) override;
+    void restart(bool completely_random) override;
+public:
+    ColumnMatrixEffectColumn(Window* win, uint8_t dir, bool rnd=false) : MatrixEffectColumn(win, dir, rnd) {};
+};
+
 class MatrixEffectBase : public Effect {
 protected:
     MatrixEffectColumn** _columns;
@@ -86,3 +95,11 @@ public:
 	RandomMatrixEffect();
 	String get_name() override { return "random_matrix"; }
 };
+
+class ColumnMatrixEffect : public MatrixEffectBase {
+protected:
+	void _create() override;
+public:
+	ColumnMatrixEffect();
+	String get_name() override { return "column_matrix"; }
+};

include/fonts.h

@@ -2,6 +2,7 @@
 #include "prototypes.h"
 
 extern Font font_numbers3x5;
+extern Font font_numbers3x3;
 extern Font font_numbers3x5_blocky;
 extern Font font_numbers4x7;
 extern Font font5x7;

include/ntp.h

@@ -1,9 +1,5 @@
 #pragma once
 
-#include <NTPClient.h>
-#include "my_wifi.h"
 #include "config.h"
-
-extern NTPClient ntpClient;
-void updateCallback(NTPClient* c);
+void time_changed();
 void ntp_setup();