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

Compare commits

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

2 Commits
ae997ef802 ... d76e088c37

Author SHA1 Message Date
Fabian Schlenz
d76e088c37 Remove left-over merge stuff in efects/big_clock.h
Some checks reported errors
continuous-integration/drone Build was killed
Details
2020-11-06 23:42:04 +01:00
Fabian Schlenz
c9825c8f9b Give path in effects/animation.h to also work on case-insensitive file systems. 2020-11-06 23:41:38 +01:00
2 changed files with 2 additions and 11 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:

9
include/effects/big_clock.h
View File

@ -19,12 +19,3 @@ 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