fabian/pitrix
1
0
Fork 0
Code Issues 8 Releases Activity

Compare commits

base: fabian:d76e088c37479393d32c12118d5f6e454bd40f70
Branches Tags
fabian:master
..
compare: fabian:ae997ef8020419f6323d61a02213d76b21be4d53
Branches Tags
fabian:master

No commits in common. "d76e088c37479393d32c12118d5f6e454bd40f70" and "ae997ef8020419f6323d61a02213d76b21be4d53" have entirely different histories.
d76e088c37 ... ae997ef802

2 changed files with 11 additions and 2 deletions
Show Stats Expand all files Collapse all files

2
include/effects/animation.h
View File

@ -3,7 +3,7 @@
#include "Effect.h" #include "Effect.h"
#include "prototypes.h" #include "prototypes.h"
#include "my_fastled.h" #include "my_fastled.h"
#include "../Animation.h" #include "Animation.h"
class AnimationEffect : public Effect { class AnimationEffect : public Effect {
private: private:

11
include/effects/big_clock.h
View File

@ -18,4 +18,13 @@ protected:
public: 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