rework effects to frametime

wled00/FX.cpp

@@ -947,18 +947,17 @@ uint16_t WS2812FX::mode_running_random(void) {
  * K.I.T.T.
  */
 uint16_t WS2812FX::mode_larson_scanner(void) {
+  uint16_t counter = now * (SEGMENT.speed >>3) +1;
+  uint16_t index = counter * SEGLEN * 2 >> 16;
+
   fade_out(SEGMENT.intensity);
 
-  uint16_t index = 0;
+  if (index >= SEGLEN) {
-  if(SEGENV.step < SEGLEN) {
+    index = SEGLEN - (index - SEGLEN + 1);
-    index = SEGMENT.start + SEGENV.step;
-  } else {
-    index = SEGMENT.start + ((SEGLEN * 2) - SEGENV.step) - 2;
   }
   setPixelColor(index, color_from_palette(index, true, PALETTE_SOLID_WRAP, 0));
 
-  SEGENV.step = (SEGENV.step + 1) % ((SEGLEN * 2) - 2);
+  return FRAMETIME;
-  return SPEED_FORMULA_L;
 }
 
 
@@ -966,13 +965,14 @@ uint16_t WS2812FX::mode_larson_scanner(void) {
  * Firing comets from one end.
  */
 uint16_t WS2812FX::mode_comet(void) {
+  uint16_t counter = now * (SEGMENT.speed >>3) +1;
+  uint16_t index = counter * SEGLEN >> 16;
+
   fade_out(SEGMENT.intensity);
 
-  uint16_t index = SEGMENT.start + SEGENV.step;
   setPixelColor(index, color_from_palette(index, true, PALETTE_SOLID_WRAP, 0));
 
-  SEGENV.step = (SEGENV.step + 1) % SEGLEN;
+  return FRAMETIME;
-  return SPEED_FORMULA_L;
 }
 
 
@@ -1074,7 +1074,7 @@ uint16_t WS2812FX::gradient_base(bool loading) {
     }
     per = val/brd;
     if (per >1.0) per = 1.0;
-    setPixelColor(SEGMENT.start + i, color_blend(SEGCOLOR(0), color_from_palette(SEGMENT.start + i, true, PALETTE_SOLID_WRAP, 1), per*255));
+    setPixelColor(i, color_blend(SEGCOLOR(0), color_from_palette(i, true, PALETTE_SOLID_WRAP, 1), per*255));
   }
 
   SEGENV.step++;
@@ -1330,19 +1330,13 @@ uint16_t WS2812FX::mode_multi_comet(void)
  * Custom mode by Keith Lord: https://github.com/kitesurfer1404/WS2812FX/blob/master/src/custom/DualLarson.h
  */
 uint16_t WS2812FX::mode_dual_larson_scanner(void){
-  if (SEGENV.aux0)
+  uint16_t counter = now * (SEGMENT.speed >>3) +1;
-  {
+  uint16_t index = counter * SEGLEN >> 16;
-    SEGENV.step--;
-  } else
-  {
-    SEGENV.step++;
-  }
 
   fade_out(SEGMENT.intensity);
 
-  uint16_t index = SEGMENT.start + SEGENV.step;
   setPixelColor(index, color_from_palette(index, true, PALETTE_SOLID_WRAP, 0));
-  index = SEGMENT.stop - SEGENV.step -1;
+  index = SEGMENT.stop - index -1;
   if (SEGCOLOR(2) != 0)
   {
     setPixelColor(index, SEGCOLOR(2));
@@ -1351,10 +1345,7 @@ uint16_t WS2812FX::mode_dual_larson_scanner(void){
     setPixelColor(index, color_from_palette(index, true, PALETTE_SOLID_WRAP, 0));
   }
 
-  if(SEGENV.step >= SEGLEN -1 || SEGENV.step <= 0)
+  return FRAMETIME;
-  SEGENV.aux0 = !SEGENV.aux0;
-  
-  return SPEED_FORMULA_L;
 }
 
 
@@ -1383,27 +1374,40 @@ typedef struct Oscillator {
   int8_t  size;
   int8_t  dir;
   int8_t  speed;
+  uint16_t timeref;
 } oscillator;
 
+/*
+/  Oscillating bars of color, updated with standard framerate
+*/
 uint16_t WS2812FX::mode_oscillate(void)
 {
-  static oscillator oscillators[2] = {
+  uint16_t counter;
-    {SEGLEN/4,   SEGLEN/8,  1, 1},
+  uint16_t index;
-    {SEGLEN/4*2, SEGLEN/8, -1, 1}
+
-    //{SEGLEN/4*3, SEGLEN/8,  1, 2}
+  static oscillator oscillators[NUM_COLORS] = {
+    {SEGLEN-1, SEGLEN/8,  -1, 4},
+    {0,        SEGLEN/8,   1, 3},
+    {SEGLEN-1, SEGLEN/8,  -1, 2}
   };
 
   for(int8_t i=0; i < sizeof(oscillators)/sizeof(oscillators[0]); i++) {
-    oscillators[i].pos += oscillators[i].dir * oscillators[i].speed;
+    oscillators[i].size = SEGLEN/(3+SEGMENT.intensity/8);
-    if((oscillators[i].dir == -1) && (oscillators[i].pos <= 0)) {
+    //calculate the change since last cycle
-      oscillators[i].pos = 0;
+    counter = (now - oscillators[i].timeref) * ((SEGMENT.speed >> oscillators[i].speed) +1);
-      oscillators[i].dir = 1;
+    index = (counter * SEGLEN) >> 16;
-      oscillators[i].speed = random8(1, 3);
+    
+    if (oscillators[i].dir == -1) {
+      oscillators[i].pos = SEGLEN - 1 - index;
+    } else  {
+      oscillators[i].pos = index;
     }
-    if((oscillators[i].dir == 1) && (oscillators[i].pos >= (SEGLEN - 1))) {
+
-      oscillators[i].pos = SEGLEN - 1;
+    if (index >= SEGLEN - 1) {
-      oscillators[i].dir = -1;
+      //switch direction once while at each end of cycle
-      oscillators[i].speed = random8(1, 3);
+      if (now - oscillators[i].timeref > 1000) oscillators[i].dir *= -1;
+      oscillators[i].timeref = now;
+      oscillators[i].speed = random8(2, 4);
     }
   }
  
@@ -1411,12 +1415,12 @@ uint16_t WS2812FX::mode_oscillate(void)
     uint32_t color = BLACK;
     for(int8_t j=0; j < sizeof(oscillators)/sizeof(oscillators[0]); j++) {
       if(i >= oscillators[j].pos - oscillators[j].size && i <= oscillators[j].pos + oscillators[j].size) {
-        color = (color == BLACK) ? SEGMENT.colors[j] : color_blend(color, SEGMENT.colors[j], 128);
+        color = (color == BLACK) ? SEGCOLOR(j) : color_blend(color, SEGCOLOR(j), 128);
       }
     }
     setPixelColor(SEGMENT.start + i, color);
   }
-  return 15 + (uint32_t)(255 - SEGMENT.speed);
+  return FRAMETIME;
 }
 
 
@@ -1501,7 +1505,7 @@ uint16_t WS2812FX::mode_pride_2015(void)
   }
   SEGENV.step = sPseudotime;
   SEGENV.aux0 = sHue16;
-  return 20;
+  return FRAMETIME;
 }