From b2bc8aa75ece7447ed816ad8dfa22cb880959158 Mon Sep 17 00:00:00 2001
From: Fabian Schlenz <mail@fabianonline.de>
Date: Mon, 3 Jun 2019 06:43:50 +0200
Subject: [PATCH] Experiment in getting the differing delays in
 Single/MultiDynamic effects to work. Unsuccessful, for now.

---
 include/effect_multi_dynamic.h  |  3 +--
 include/effect_single_dynamic.h |  3 ++-
 src/effect_multi_dynamic.cpp    |  6 +++++-
 src/effect_single_dynamic.cpp   | 22 +++++++++++++++++-----
 4 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/include/effect_multi_dynamic.h b/include/effect_multi_dynamic.h
index 6518ff7..92d247d 100644
--- a/include/effect_multi_dynamic.h
+++ b/include/effect_multi_dynamic.h
@@ -4,9 +4,8 @@
 #include "effect_single_dynamic.h"
 
 class MultiDynamicEffect : public SingleDynamicEffect {
-  protected:
-    int getLoopTime();
   public:
+    MultiDynamicEffect();
     void update();
 };
 
diff --git a/include/effect_single_dynamic.h b/include/effect_single_dynamic.h
index 21ed51e..8356c84 100644
--- a/include/effect_single_dynamic.h
+++ b/include/effect_single_dynamic.h
@@ -8,12 +8,13 @@ class SingleDynamicEffect : public Effect {
   protected:
     static const int factor = 2;
     static const int tile_count = LED_WIDTH/factor * LED_HEIGHT/factor;
-    virtual int getLoopTime();
+    int loopTime = 200;
     CRGB tiles[tile_count];
     CRGB old_tiles[tile_count];
     uint8_t blend = 0;
   public:
     SingleDynamicEffect();
+    void init();
     virtual void update();
     boolean can_be_shown_with_clock();
     virtual void loop();
diff --git a/src/effect_multi_dynamic.cpp b/src/effect_multi_dynamic.cpp
index 954a6bb..3c93a93 100644
--- a/src/effect_multi_dynamic.cpp
+++ b/src/effect_multi_dynamic.cpp
@@ -2,7 +2,11 @@
 #include "effect_single_dynamic.h"
 #include "config.h"
 
-int MultiDynamicEffect::getLoopTime() { return EFFECT_MULTI_DYNAMIC_LOOP_TIME; }
+MultiDynamicEffect::MultiDynamicEffect() {
+    init();
+    loopTime = EFFECT_MULTI_DYNAMIC_LOOP_TIME;
+}
+
 void MultiDynamicEffect::update() {
   for (int i=0; i<tile_count; i++) tiles[i] = CHSV(baseHue + random8(64), 180, 255);
 }
diff --git a/src/effect_single_dynamic.cpp b/src/effect_single_dynamic.cpp
index d3238a8..fcc50ca 100644
--- a/src/effect_single_dynamic.cpp
+++ b/src/effect_single_dynamic.cpp
@@ -2,17 +2,22 @@
 #include "functions.h"
 
 SingleDynamicEffect::SingleDynamicEffect() {
+  init();
+  loopTime = EFFECT_SINGLE_DYNAMIC_LOOP_TIME;
+}
+
+void SingleDynamicEffect::init() {
   for (int i=0; i<tile_count; i++) tiles[i] = CHSV(baseHue + random8(64), 180, 255);
 }
-int SingleDynamicEffect::getLoopTime() {
-    return EFFECT_SINGLE_DYNAMIC_LOOP_TIME;
-}
+
 void SingleDynamicEffect::update() {
   tiles[random8(tile_count)] = CHSV(baseHue + random8(64), 180, 255);
 }
+
 boolean SingleDynamicEffect::can_be_shown_with_clock() { return true; }
+
 void SingleDynamicEffect::loop() {
-  EVERY_N_MILLISECONDS(getLoopTime()) {
+  /*EVERY_N_MILLISECONDS(loopTime) {
     memcpy(old_tiles, tiles, tile_count*sizeof(CRGB));
     blend = 0;
     update();
@@ -22,5 +27,12 @@ void SingleDynamicEffect::loop() {
     int index = y/2 * window.w/2 + x/2;
     setPixel(window, x, y, nblend(old_tiles[index], tiles[index], blend));
   }
-  if (blend < 255) blend+=20;
+  if (blend < 255) blend+=20;*/
+  EVERY_N_MILLISECONDS(loopTime) {
+      update();
+  }
+  for (int x=0; x<window.w; x++) for (int y=0; y<window.h; y++) {
+    int index = y/2 * window.w/2 + x/2;
+    setPixel(window, x, y, tiles[index]);
+  }
 }