Moved all individual effects into a subfolder {src,include}/effects/

include/effects.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "Effect.h"
-#include "effect_clock.h"
+#include "effects/clock.h"
-#include "effect_timer.h"
+#include "effects/timer.h"
 
 struct EffectEntry {
 	const char* name;

src/effects.cpp

@@ -1,30 +1,30 @@
 #include "effects.h"
 #include "config.h"
 #include "my_fastled.h"
-#include "effect_bell.h"
+#include "effects/bell.h"
-#include "effect_sinematrix3.h"
+#include "effects/sinematrix3.h"
-#include "effect_big_clock.h"
+#include "effects/big_clock.h"
-#include "effect_clock.h"
+#include "effects/clock.h"
-#include "effect_static.h"
+#include "effects/static.h"
-#include "effect_animation.h"
+#include "effects/animation.h"
-#include "effect_dynamic.h"
+#include "effects/dynamic.h"
-#include "effect_matrix.h"
+#include "effects/matrix.h"
-#include "effect_twirl.h"
+#include "effects/twirl.h"
-#include "effect_cycle.h"
+#include "effects/cycle.h"
-#include "effect_snake.h"
+#include "effects/snake.h"
-#include "effect_fire.h"
+#include "effects/fire.h"
-#include "effect_firework.h"
+#include "effects/firework.h"
-#include "effect_gol.h"
+#include "effects/gol.h"
-#include "effect_pixelclock.h"
+#include "effects/pixelclock.h"
-#include "effect_dvd.h"
+#include "effects/dvd.h"
-#include "effect_analogclock.h"
+#include "effects/analogclock.h"
-#include "effect_sines.h"
+#include "effects/sines.h"
-#include "effect_marquee.h"
+#include "effects/marquee.h"
-#include "effect_blur2d.h"
+#include "effects/blur2d.h"
-#include "effect_tv_static.h"
+#include "effects/tv_static.h"
-#include "effect_lightspeed.h"
+#include "effects/lightspeed.h"
-#include "effect_diamond.h"
+#include "effects/diamond.h"
-#include "effect_tpm2_net.h"
+#include "effects/tpm2_net.h"
 #include "SimpleEffect.h"
 #include "effects/night_clock.h"
 

src/effects/analogclock.cpp

@@ -1,4 +1,4 @@
-#include "effect_analogclock.h"
+#include "effects/analogclock.h"
 #include "my_fastled.h"
 #include "ntp.h"
 #include <time.h>

src/effects/animation.cpp

@@ -1,4 +1,4 @@
-#include "effect_animation.h"
+#include "effects/animation.h"
 #include "functions.h"
 
 AnimationEffect::AnimationEffect(const char* name, uint32_t bg, int x, int y) {

src/effects/bell.cpp

@@ -1,6 +1,6 @@
 #include "Effect.h"
 #include "functions.h"
-#include "effect_bell.h"
+#include "effects/bell.h"
 #include "sprites.h"
 
 void BellEffect::loop(uint16_t ms) {

src/effects/big_clock.cpp

@@ -1,5 +1,5 @@
 #include "Effect.h"
-#include "effect_big_clock.h"
+#include "effects/big_clock.h"
 #include "fonts.h"
 #include <time.h>
 #include "settings.h"

src/effects/blur2d.cpp

@@ -1,4 +1,4 @@
-#include "effect_blur2d.h"
+#include "effects/blur2d.h"
 Blur2DBlob::Blur2DBlob() {
 	_x_freq = random16(6<<8, 15<<8);
 	_y_freq = random16(6<<8, 15<<8);

src/effects/clock.cpp

@@ -1,4 +1,4 @@
-#include "effect_clock.h"
+#include "effects/clock.h"
 #include <FastLED.h>
 #include "functions.h"
 #include "fonts.h"

src/effects/cycle.cpp

@@ -1,4 +1,4 @@
-#include "effect_cycle.h"
+#include "effects/cycle.h"
 #include "effects.h"
 
 CycleEffect::CycleEffect() {

src/effects/diamond.cpp

@@ -1,4 +1,4 @@
-#include "effect_diamond.h"
+#include "effects/diamond.h"
 #include "my_fastled.h"
 
 void DiamondEffect::loop(uint16_t ms) {

src/effects/dvd.cpp

@@ -1,4 +1,4 @@
-#include "effect_dvd.h"
+#include "effects/dvd.h"
 #include "my_fastled.h"
 
 void DvdEffect::loop(uint16_t ms) {

src/effects/dynamic.cpp

@@ -1,4 +1,4 @@
-#include "effect_dynamic.h"
+#include "effects/dynamic.h"
 #include "functions.h"
 #include "config.h"
 

src/effects/fire.cpp

@@ -1,4 +1,4 @@
-#include "effect_fire.h"
+#include "effects/fire.h"
 #include "my_color_palettes.h"
 #include "config.h"
 #include "my_fastled.h"

src/effects/firework.cpp

@@ -1,5 +1,5 @@
 // Based on https://gist.github.com/kriegsman/68929cbd1d6de4535b20
-#include "effect_firework.h"
+#include "effects/firework.h"
 
 FireworkEffectDot::FireworkEffectDot(Window* w, FireworkEffect* e) {
 	_window = w;

src/effects/gol.cpp

@@ -1,4 +1,4 @@
-#include "effect_gol.h"
+#include "effects/gol.h"
 #include "my_fastled.h"
 
 GolEffect::GolEffect() {

src/effects/lightspeed.cpp

@@ -1,4 +1,4 @@
-#include "effect_lightspeed.h"
+#include "effects/lightspeed.h"
 #include "config.h"
 #include "functions.h"
 #include "prototypes.h"

src/effects/marquee.cpp

@@ -1,4 +1,4 @@
-#include "effect_marquee.h"
+#include "effects/marquee.h"
 #include "fonts.h"
 
 boolean MarqueeEffect::can_be_shown_with_clock() {

src/effects/matrix.cpp

@@ -1,4 +1,4 @@
-#include "effect_matrix.h"
+#include "effects/matrix.h"
 #include "my_color_palettes.h"
 #include "functions.h"
 

src/effects/pixelclock.cpp

@@ -1,4 +1,4 @@
-#include "effect_pixelclock.h"
+#include "effects/pixelclock.h"
 #include "ntp.h"
 
 PixelClockEffect::PixelClockEffect() {

src/effects/sinematrix3.cpp

@@ -1,4 +1,4 @@
-#include "effect_sinematrix3.h"
+#include "effects/sinematrix3.h"
 #include "prototypes.h"
 #include "functions.h"
 #include "Effect.h"

src/effects/sines.cpp

@@ -1,4 +1,4 @@
-#include "effect_sines.h"
+#include "effects/sines.h"
 
 SinesEffectSinus::SinesEffectSinus(Window* w) {
 	_window = w;

src/effects/snake.cpp

@@ -1,4 +1,4 @@
-#include "effect_snake.h"
+#include "effects/snake.h"
 #include "functions.h"
 
 SnakeEffect::SnakeEffect() {

src/effects/static.cpp

@@ -1,4 +1,4 @@
-#include "effect_static.h"
+#include "effects/static.h"
 #include "functions.h"
 #include "my_fastled.h"
 

src/effects/timer.cpp

@@ -1,4 +1,4 @@
-#include "effect_timer.h"
+#include "effects/timer.h"
 #include <FastLED.h>
 #include "functions.h"
 #include "fonts.h"

src/effects/tpm2_net.cpp

@@ -1,4 +1,4 @@
-#include "effect_tpm2_net.h"
+#include "effects/tpm2_net.h"
 #include "my_fastled.h"
 
 void Tpm2NetEffect::loop(uint16_t ms) {

src/effects/tv_static.cpp

@@ -1,4 +1,4 @@
-#include "effect_tv_static.h"
+#include "effects/tv_static.h"
 
 void TvStaticEffect::loop(uint16_t ms) {
 	//uint8_t dark_position = (millis() % settings.effects.tv_static.black_bar_speed) * _window->width / settings.effects.tv_static.black_bar_speed;

src/effects/twirl.cpp

@@ -1,4 +1,4 @@
-#include "effect_twirl.h"
+#include "effects/twirl.h"
 #include "functions.h"
 
 boolean TwirlEffect::can_be_shown_with_clock() { return true; };