Daniel/gloves/multi pat arg audit (#146)

* adjusted args for multi pats * recorded tests * some core stuff * some core stuff
StoneOrbits · Dec 8, 2023 · 4bf595b · 4bf595b
1 parent 4c01227
commit 4bf595b
Show file tree

Hide file tree

Showing 57 changed files with 12,070 additions and 12,064 deletions.
diff --git a/VortexEngine/src/Log/Log.cpp b/VortexEngine/src/Log/Log.cpp
@@ -11,6 +11,10 @@
 #include "VortexLib.h"
 #endif
 
+#ifdef VORTEX_EMBEDDED
+#include <Arduino.h>
+#endif
+
 #if LOGGING_LEVEL > 0
 void InfoMsg(const char *msg, ...)
 {

diff --git a/VortexEngine/src/Patterns/Multi/MeteorPattern.cpp b/VortexEngine/src/Patterns/Multi/MeteorPattern.cpp
@@ -34,9 +34,11 @@ void MeteorPattern::blinkOff()
 
 void MeteorPattern::poststep()
 {
-  // when a new meteor is created it is incerted into the stash so the blinking pattern is not interrupted
-  Pair target = (Pair)m_randCtx.next8(PAIR_FIRST, PAIR_LAST);
-  RGBColor col = m_colorset.getNext();
-  m_stash.setIndex(pairEven(target), col);
-  m_stash.setIndex(pairOdd(target), col);
+  for (uint8_t meteorCount = 0; meteorCount < (LED_COUNT / 2); ++meteorCount) {
+    // when a new meteor is created it is incerted into the stash so the blinking pattern is not interrupted
+    Pair target = (Pair)m_randCtx.next8(PAIR_FIRST, PAIR_LAST);
+    RGBColor col = m_colorset.getNext();
+    m_stash.setIndex(pairEven(target), col);
+    m_stash.setIndex(pairOdd(target), col);
+  }
 }
diff --git a/VortexEngine/src/Patterns/PatternBuilder.cpp b/VortexEngine/src/Patterns/PatternBuilder.cpp
@@ -164,28 +164,28 @@ PatternArgs PatternBuilder::getDefaultArgs(PatternID id)
     // =====================
     //  Multi Led Patterns:
 #if VORTEX_SLIM == 0
-    case PATTERN_HUE_SCROLL: return PatternArgs(1, 1);
+    case PATTERN_HUE_SCROLL: return PatternArgs(1, 1, 10);
     case PATTERN_THEATER_CHASE: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 28);
     case PATTERN_CHASER: return PatternArgs();
-    case PATTERN_ZIGZAG: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 55, 1, 55);
-    case PATTERN_ZIPFADE: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 100, 4, 1);
-    case PATTERN_DRIP: return PatternArgs(STROBE_ON_DURATION, STROBE_OFF_DURATION, 250);
+    case PATTERN_ZIGZAG: return PatternArgs(DOPS_ON_DURATION, 3, 3, 5, 55);
+    case PATTERN_ZIPFADE: return PatternArgs(DOPS_ON_DURATION, 2, 75, 9, 230);
+    case PATTERN_DRIP: return PatternArgs(STROBE_ON_DURATION, STROBE_OFF_DURATION, 150);
     case PATTERN_DRIPMORPH: return PatternArgs(STROBE_ON_DURATION, STROBE_OFF_DURATION, 1);
-    case PATTERN_CROSSDOPS: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 100);
+    case PATTERN_CROSSDOPS: return PatternArgs(DOPS_ON_DURATION, 2, 25);
     case PATTERN_DOUBLESTROBE: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 115);
-    case PATTERN_METEOR: return PatternArgs(STROBE_ON_DURATION, STROBE_OFF_DURATION, 55, 75);
-    case PATTERN_SPARKLETRACE: return PatternArgs(5, 0, 50);
-    case PATTERN_VORTEXWIPE: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 130);
-    case PATTERN_WARP: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 150);
-    case PATTERN_WARPWORM: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 110);
-    case PATTERN_SNOWBALL: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 110);
-    case PATTERN_LIGHTHOUSE: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 100, 25, 5);
-    case PATTERN_PULSISH: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, STROBE_ON_DURATION, STROBE_OFF_DURATION, 250);
-    case PATTERN_FILL: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 200);
-    case PATTERN_BOUNCE: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 200, 10);
+    case PATTERN_METEOR: return PatternArgs(1, 1, 20, 130);
+    case PATTERN_SPARKLETRACE: return PatternArgs(1, 5, 3);
+    case PATTERN_VORTEXWIPE: return PatternArgs(DOPS_ON_DURATION, 3, 80);
+    case PATTERN_WARP: return PatternArgs(3, DOPS_OFF_DURATION, 50);
+    case PATTERN_WARPWORM: return PatternArgs(DOPS_ON_DURATION, 10, 100);
+    case PATTERN_SNOWBALL: return PatternArgs(3, 3, 33);
+    case PATTERN_LIGHTHOUSE: return PatternArgs(DOPS_ON_DURATION, 5, 22, 3, 3);
+    case PATTERN_PULSISH: return PatternArgs(DOPS_ON_DURATION, 6, 5, 1, 100);
+    case PATTERN_FILL: return PatternArgs(DOPS_ON_DURATION, 5, 50);
+    case PATTERN_BOUNCE: return PatternArgs(10, 5, 50, 10);
     case PATTERN_SPLITSTROBIE: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 0, 16, 3, 10, PATTERN_DOPS, PATTERN_STROBIE);
     case PATTERN_BACKSTROBE: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 0, HYPERSTROBE_ON_DURATION, HYPERSTROBE_OFF_DURATION, 10, PATTERN_DOPS, PATTERN_HYPERSTROBE);
-    case PATTERN_VORTEX: return PatternArgs(STROBE_ON_DURATION, STROBE_OFF_DURATION, 130);
+    case PATTERN_VORTEX: return PatternArgs(1, 1, 130);
     case PATTERN_NONE: break;
     default: break;
 #else

diff --git a/VortexEngine/tests/tests_general/0001_Cycle_all_modes.test b/VortexEngine/tests/tests_general/0001_Cycle_all_modes.test
diff --git a/VortexEngine/tests/tests_general/0003_Start_Auto-cycle.test b/VortexEngine/tests/tests_general/0003_Start_Auto-cycle.test
diff --git a/VortexEngine/tests/tests_general/0004_End_Auto-cycle.test b/VortexEngine/tests/tests_general/0004_End_Auto-cycle.test
diff --git a/VortexEngine/tests/tests_general/0077_Cycle_Color_Slots_in_Color_Select_Both_Bulbs.test b/VortexEngine/tests/tests_general/0077_Cycle_Color_Slots_in_Color_Select_Both_Bulbs.test
diff --git a/VortexEngine/tests/tests_general/0078_Cycle_Rainbow_Sections_in_Color_Select_Both_Bulbs.test b/VortexEngine/tests/tests_general/0078_Cycle_Rainbow_Sections_in_Color_Select_Both_Bulbs.test
diff --git a/VortexEngine/tests/tests_general/0079_Cycle_Hue_Selection_in_Color_Select_Both_Bulbs.test b/VortexEngine/tests/tests_general/0079_Cycle_Hue_Selection_in_Color_Select_Both_Bulbs.test
diff --git a/VortexEngine/tests/tests_general/0080_Cycle_Sat_Selection_in_Color_Select_Both_Bulbs.test b/VortexEngine/tests/tests_general/0080_Cycle_Sat_Selection_in_Color_Select_Both_Bulbs.test
diff --git a/VortexEngine/tests/tests_general/0081_Cycle_Val_Selection_in_Color_Select_Both_Bulbs.test b/VortexEngine/tests/tests_general/0081_Cycle_Val_Selection_in_Color_Select_Both_Bulbs.test
diff --git a/VortexEngine/tests/tests_general/0083_Select_Blank_in_Color_Select_Both_Bulbs.test b/VortexEngine/tests/tests_general/0083_Select_Blank_in_Color_Select_Both_Bulbs.test
@@ -124,7 +124,7 @@ FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000
-00FF0000FF0000FF0026004B26004B26004B26004B26004B26004B00FF00
+00FF0000FF0026004B26004B26004B26004B26004B26004B00FF0000FF00
 000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000
@@ -223,7 +223,7 @@ FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000
-00FF0000FF0026004B26004B26004B26004B26004B26004B00FF0000FF00
+00FF0026004B26004B26004B26004B26004B26004B00FF0000FF0000FF00
 000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000
@@ -234,7 +234,7 @@ FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000
-00FF0000FF0026004B26004B26004B26004B26004B26004B00FF0000FF00
+00FF0026004B26004B26004B26004B26004B26004B00FF0000FF0000FF00
 000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000