Combine rainbow(glitter), AudioRingsEffect tweak, Octopus offset to %

Author: ewowi

src/MoonLight/Layers/PhysicalLayer.h

@@ -56,7 +56,7 @@ struct LightsHeader {
   uint8_t offsetRGB3 = UINT8_MAX;
   uint8_t offsetBrightness2 = UINT8_MAX;  // 31
   uint16_t nrOfChannels;                  // 32,  so we can deal with exceptional cases e.g. RGB2040 make sure it starts at even position!!! for alignment!!!
-  uint8_t lightPreset = UINT8_MAX;        // 34, so we can deal with exceptional cases e.g. RGB2040
+  uint8_t lightPreset = 2;                // 34, so we can deal with exceptional cases e.g. RGB2040. default 2 / GRB
   // =============
   // 35 bytes total
   uint8_t fill[5];  // padding to align struct to 40 bytes total. lightsControl will send 37 bytes (prime number)!!! so Monitor.svelte can recognize this

src/MoonLight/Modules/ModuleEffects.h

@@ -90,7 +90,6 @@ class ModuleEffects : public NodeManager {
     addControlValue(control, getNameAndTags<FreqSawsEffect>());
     addControlValue(control, getNameAndTags<MarioTestEffect>());
     addControlValue(control, getNameAndTags<PixelMapEffect>());
-    addControlValue(control, getNameAndTags<RainbowEffect>());
     addControlValue(control, getNameAndTags<RandomEffect>());
     addControlValue(control, getNameAndTags<RingRandomFlowEffect>());
     addControlValue(control, getNameAndTags<RipplesEffect>());
@@ -132,7 +131,7 @@ class ModuleEffects : public NodeManager {
     addControlValue(control, getNameAndTags<WaverlyEffect>());
 
     // FastLED effects
-    addControlValue(control, getNameAndTags<RainbowWithGlitterEffect>());
+    addControlValue(control, getNameAndTags<RainbowEffect>());
 
     // Moving head effects, alphabetically
     addControlValue(control, getNameAndTags<AmbientMoveEffect>());
@@ -270,8 +269,6 @@ class ModuleEffects : public NodeManager {
     // FastLED
     else if (equalAZaz09(name, RainbowEffect::name()))
       node = allocMBObject<RainbowEffect>();
-    else if (equalAZaz09(name, RainbowWithGlitterEffect::name()))
-      node = allocMBObject<RainbowWithGlitterEffect>();
 
     // Moving head effects, alphabetically
 

src/MoonLight/Nodes/Effects/E_FastLED.h

@@ -17,50 +17,24 @@ class RainbowEffect : public Node {
   static uint8_t dim() { return _1D; }
   static const char* tags() { return "🔥⚡️"; }
 
-  uint8_t deltaHue = 7;
   uint8_t speed = 8;  // default 8*32 = 256 / 256 = 1 = hue++
+  uint8_t deltaHue = 7;
+  uint8_t chanceOfGlitter = 80;
 
   void setup() {
     addControl(speed, "speed", "slider", 0, 32);
     addControl(deltaHue, "deltaHue", "slider", 0, 32);
+    addControl(chanceOfGlitter, "chanceOfGlitter", "slider", 0, 100);
   }
 
   uint16_t hue = 0;
 
   void loop() override {
     layer->fill_rainbow((hue += speed * 32) >> 8, deltaHue);  // hue back to uint8_t
-  }
-};
-
-class RainbowWithGlitterEffect : public Node {
- public:
-  static const char* name() { return "Rainbow with glitter"; }
-  static uint8_t dim() { return _1D; }
-  static const char* tags() { return "🔥⚡️"; }  // ⚡️ means FastLED origin
-
-  bool glitter = false;
-  uint8_t chance = 80;
-
-  void setup() override {
-    // no palette control is created
-    addControl(glitter, "glitter", "checkbox");
-    addControl(chance, "chance", "slider");
-  }
-
-  void loop() override {
-    // built-in FastLED rainbow, plus some random sparkly glitter
-    // FastLED's built-in rainbow generator
-    layer->fill_rainbow(millis() / 50, 7);
-
-    if (glitter) addGlitter(chance);
-  }
-
-  void addGlitter(fract8 chanceOfGlitter) {
-    if (random8() < chanceOfGlitter) {
+    if (chanceOfGlitter && random8() < chanceOfGlitter) {
       layer->setRGB(random16(layer->size.x), CRGB::White);
     }
   }
 };
 
-
 #endif

src/MoonLight/Nodes/Effects/E_MoonLight.h

@@ -1574,11 +1574,7 @@ class RingRandomFlowEffect : public RingEffect {
 
   uint8_t* hue = nullptr;
 
-  ~RingRandomFlowEffect() {
-    freeMB(hue);
-
-    Node::~Node();
-  }
+  ~RingRandomFlowEffect() { freeMB(hue); }
 
   void onSizeChanged(const Coord3D& prevSize) override {
     freeMB(hue);
@@ -1636,8 +1632,8 @@ class AudioRingsEffect : public RingEffect {
       //        setRingFromFtt((i * 2), i);
     }
 
-    setRingFromFtt(2, 7);  // set outer ring to bass
-    setRingFromFtt(0, 8);  // set outer ring to bass
+    if (nrOfRings >= 2) setRingFromFtt(2, nrOfRings - 2);  // set outer rings to bass
+    if (nrOfRings >= 1) setRingFromFtt(0, nrOfRings - 1);  // set outer rings to bass
   }
   void setRingFromFtt(int index, int ring) {
     byte val = sharedData.bands[index];

src/MoonLight/Nodes/Effects/E_WLED.h

@@ -333,8 +333,6 @@ class GEQEffect : public Node {
 
   ~GEQEffect() {
     freeMB(previousBarHeight);
-
-    Node::~Node();
   }
 
   void onSizeChanged(const Coord3D& prevSize) override {
@@ -763,13 +761,13 @@ class OctopusEffect : public Node {
   };
 
   uint8_t speed = 16;
-  Coord3D offset = {128, 128, 1};
+  Coord3D offset = {50, 50, 50};
   uint8_t legs = 4;
   bool radialWave = false;
 
   void setup() override {
     addControl(speed, "speed", "slider", 1, 32);
-    addControl(offset, "offset", "coord3D", 0, 255, false);
+    addControl(offset, "offset", "coord3D", 0, 100, false); // 0..100%
     addControl(legs, "legs", "slider", 1, 8);
 
     addControl(radialWave, "radialWave", "checkbox");
@@ -788,13 +786,11 @@ class OctopusEffect : public Node {
 
   ~OctopusEffect() {
     freeMB(rMap);
-
-    Node::~Node();
   }
 
   void setRMap() {
-    const uint8_t C_X = layer->size.x / 2 + (offset.x - 128) * layer->size.x / 255;
-    const uint8_t C_Y = layer->size.y / 2 + (offset.y - 128) * layer->size.y / 255;
+    const uint8_t C_X = layer->size.x / 2 + (offset.x - 50) * layer->size.x / 100;
+    const uint8_t C_Y = layer->size.y / 2 + (offset.y - 50) * layer->size.y / 100;
     Coord3D pos = {0, 0, 0};
     const uint8_t mapp = 180 / max(layer->size.x, layer->size.y);
     for (pos.x = 0; pos.x < layer->size.x; pos.x++) {