Update checkin comments

PlummersSoftwareLLC · Oct 31, 2024 · 38345d1 · 38345d1
1 parent 582ac0e
commit 38345d1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/include/gfxbase.h b/include/gfxbase.h
@@ -65,7 +65,6 @@
 #pragma once
 
 #include <stdexcept>
-#include <Arduino.h>
 #include "Adafruit_GFX.h"
 #include "pixeltypes.h"
 #include "effects/matrix/Boid.h"

diff --git a/include/soundanalyzer.h b/include/soundanalyzer.h
@@ -652,17 +652,17 @@ class SoundAnalyzer : public AudioVariables
 
     inline void UpdatePeakData()
     {
-        const float maxIncrease = std::max(0.0, g_Values.AppTime.LastFrameTime() * _peak1DecayRate * VU_REACTIVITY_RATIO);
-
         for (int i = 0; i < NUM_BANDS; i++)
         {
             if (_Peaks[i] > _peak1Decay[i])
             {
+                const float maxIncrease = std::max(0.0, g_Values.AppTime.LastFrameTime() * _peak1DecayRate * VU_REACTIVITY_RATIO);  
                 _peak1Decay[i] = std::min(_Peaks[i], _peak1Decay[i] + maxIncrease);
                 _lastPeak1Time[i] = millis();
             }
             if (_Peaks[i] > _peak2Decay[i])
             {
+                const float maxIncrease = std::max(0.0, g_Values.AppTime.LastFrameTime() * _peak2DecayRate * VU_REACTIVITY_RATIO);
                 _peak2Decay[i] = std::min(_Peaks[i], _peak2Decay[i] + maxIncrease);
             }
         }

diff --git a/src/effects.cpp b/src/effects.cpp
@@ -276,7 +276,7 @@ void LoadEffectFactories()
         ADD_EFFECT(EFFECT_MATRIX_SMPICASSO3IN1,     PatternSMPicasso3in1, "Lines", 38);
         ADD_EFFECT(EFFECT_MATRIX_SMPICASSO3IN1,     PatternSMPicasso3in1, "Circles", 73);
         ADD_EFFECT(EFFECT_MATRIX_SMAMBERRAIN,       PatternSMAmberRain);
- //     ADD_EFFECT(EFFECT_MATRIX_SMSTROBE_DIFFUSION,PatternSMStrobeDiffusion);
+        ADD_EFFECT(EFFECT_MATRIX_SMSTROBE_DIFFUSION,PatternSMStrobeDiffusion);
         ADD_EFFECT(EFFECT_MATRIX_SMRAINBOW_TUNNEL,  PatternSMRainbowTunnel);
         ADD_EFFECT(EFFECT_MATRIX_SMSPIRO_PULSE,     PatternSMSpiroPulse);
         ADD_EFFECT(EFFECT_MATRIX_SMTWISTER,         PatternSMTwister);
@@ -449,6 +449,10 @@ void LoadEffectFactories()
 
     #elif PLATECOVER
 
+        #ifndef EFFECT_SET_VERSION
+            #define EFFECT_SET_VERSION  3
+        #endif    
+
         ADD_EFFECT(EFFECT_STRIP_COLOR_FILL, ColorFillEffect, "Solid White", CRGB::White, 1);
         ADD_EFFECT(EFFECT_STRIP_COLOR_FILL, ColorFillEffect, "Solid Red",   CRGB::Red,   1);
         ADD_EFFECT(EFFECT_STRIP_COLOR_FILL, ColorFillEffect, "Solid Amber", CRGB(255, 50, 0), 1);
@@ -459,6 +463,10 @@ void LoadEffectFactories()
 
     #elif SPIRALLAMP
 
+        #ifndef EFFECT_SET_VERSION
+            #define EFFECT_SET_VERSION  3
+        #endif
+
         ADD_EFFECT(EFFECT_STRIP_VUMETER_VERTICAL, VUMeterVerticalEffect);
         ADD_EFFECT(EFFECT_STRIP_METEOR, MeteorEffect, 4, 4, 10, 1.0, 1.0);
         ADD_EFFECT(EFFECT_STRIP_COLOR_FILL, ColorFillEffect, "Solid White", CRGB::White, 1);