Merge branch 'master' of https://git.schle.nz/fabian/pitrix
This commit is contained in:
commit
ae997ef802
@ -19,3 +19,12 @@ public:
|
|||||||
virtual void loop(uint16_t ms);
|
virtual void loop(uint16_t ms);
|
||||||
String get_name() override { return "big_clock"; }
|
String get_name() override { return "big_clock"; }
|
||||||
};
|
};
|
||||||
|
<<<<<<< HEAD:include/effects/big_clock.h
|
||||||
|
=======
|
||||||
|
|
||||||
|
class NightClockEffect : public BigClockEffect {
|
||||||
|
private:
|
||||||
|
void _draw_border_pixel(accum88 pos, CRGB* color) { };
|
||||||
|
CRGB _get_color_font() { return CRGB(0x220000); }
|
||||||
|
};
|
||||||
|
>>>>>>> ecf5998510bf1f8230d070cebccb4c89f95ce856:include/effect_big_clock.h
|
||||||
|
Loading…
Reference in New Issue
Block a user