diff options
| author | lonkaars <loek@pipeframe.xyz> | 2021-11-30 15:29:34 +0100 |
|---|---|---|
| committer | lonkaars <loek@pipeframe.xyz> | 2021-11-30 15:29:34 +0100 |
| commit | 687673761e6f8542f8436fb2f0fb633a59978f48 (patch) | |
| tree | 72670a20953bcd477a8c6a93b9ae3f7fcc9c834f /software/effects.ino | |
| parent | c3c3b5d5ff5de2276e9766c90b7b1c3858a71695 (diff) | |
animation 2 working
Diffstat (limited to 'software/effects.ino')
| -rw-r--r-- | software/effects.ino | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/software/effects.ino b/software/effects.ino index ed4a0b1..b320e8e 100644 --- a/software/effects.ino +++ b/software/effects.ino @@ -2,11 +2,10 @@ #include "effects.h" #include "animation.h" -// #define FX_LEN_ROUNDABOUT (unsigned long) 5e3 -#define FX_LEN_ROUNDABOUT (unsigned long) 0 +#define FX_LEN_ROUNDABOUT (unsigned long) 5e3 void fx_roundabout (unsigned long relative_time) { memset(led_state, 0, sizeof(led_state)); - unsigned long tick = relative_time / 300; + unsigned long tick = relative_time / 100; unsigned int roundabout_coordinates[12] = { 0x0, 0x1, 0x2, 0x3, 0x7, 0xb, 0xf, 0xe, 0xd, 0xc, 0x8, 0x4 @@ -20,21 +19,19 @@ void fx_roundabout (unsigned long relative_time) { return; } -#define FX_LEN_WIPEXYZ (unsigned long) 6e3 +#define FX_LEN_WIPEXYZ (unsigned long) 7e3 void fx_wipexyz (unsigned long relative_time) { memset(led_state, 0, sizeof(led_state)); unsigned long tick = relative_time / 200; - unsigned int direction = (tick / 6) % 3; + unsigned int direction = (tick / 7) % 3; - fill_plane(direction, zigzag(4, tick)); - // fill_plane(0, 2); + fill_plane(direction, zigzag(4, tick % 7)); return; } -// #define FX_LEN_RAINFALL (unsigned long) 7e3 -#define FX_LEN_RAINFALL (unsigned long) 0 -#define FX_FPS_RAINFALL (double) 10 +#define FX_LEN_RAINFALL (unsigned long) 8e3 +#define FX_FPS_RAINFALL (double) 15 unsigned long last_frame; void fx_rainfall (unsigned long relative_time) { unsigned long frame = get_frame(relative_time, FX_FPS_RAINFALL); |