fixed multi led patterns in pattern select

VortexEngine/VortexEngine.vcxproj

@@ -179,7 +179,7 @@
     <ClCompile Include="src\Patterns\Multi\HueShiftPattern.cpp" />
     <ClCompile Include="src\Patterns\Multi\CompoundPattern.cpp" />
     <ClCompile Include="src\Patterns\Multi\LighthousePattern.cpp" />
-    <ClCompile Include="src\Patterns\Multi\MateriaPattern.cpp" />
+    <ClCompile Include="src\Patterns\Multi\VortexPattern.cpp" />
     <ClCompile Include="src\Patterns\Multi\MeteorPattern.cpp" />
     <ClCompile Include="src\Patterns\Multi\MultiLedPattern.cpp" />
     <ClCompile Include="src\Patterns\Multi\PulsishPattern.cpp" />
@@ -251,7 +251,7 @@
     <ClInclude Include="src\Patterns\Multi\HueShiftPattern.h" />
     <ClInclude Include="src\Patterns\Multi\CompoundPattern.h" />
     <ClInclude Include="src\Patterns\Multi\LighthousePattern.h" />
-    <ClInclude Include="src\Patterns\Multi\MateriaPattern.h" />
+    <ClInclude Include="src\Patterns\Multi\VortexPattern.h" />
     <ClInclude Include="src\Patterns\Multi\MeteorPattern.h" />
     <ClInclude Include="src\Patterns\Multi\MultiLedPattern.h" />
     <ClInclude Include="src\Patterns\Multi\PulsishPattern.h" />

VortexEngine/VortexEngine.vcxproj.filters

@@ -240,7 +240,7 @@
     <ClCompile Include="src\Patterns\Multi\LighthousePattern.cpp">
       <Filter>Source Files\Patterns\Multi</Filter>
     </ClCompile>
-    <ClCompile Include="src\Patterns\Multi\MateriaPattern.cpp">
+    <ClCompile Include="src\Patterns\Multi\VortexPattern.cpp">
       <Filter>Source Files\Patterns\Multi</Filter>
     </ClCompile>
     <ClCompile Include="src\Patterns\Multi\MeteorPattern.cpp">
@@ -452,7 +452,7 @@
     <ClInclude Include="src\Patterns\Multi\LighthousePattern.h">
       <Filter>Header Files\Patterns\Multi</Filter>
     </ClInclude>
-    <ClInclude Include="src\Patterns\Multi\MateriaPattern.h">
+    <ClInclude Include="src\Patterns\Multi\VortexPattern.h">
       <Filter>Header Files\Patterns\Multi</Filter>
     </ClInclude>
     <ClInclude Include="src\Patterns\Multi\MeteorPattern.h">

VortexEngine/src/Menus/MenuList/PatternSelect.cpp

@@ -140,7 +140,9 @@ void PatternSelect::nextPattern()
   if (isMultiLedPatternID(newID)) {
     m_previewMode.setPattern(newID);
   } else {
+    // TODO: clear multi a better way
     m_previewMode.setPatternMap(m_targetLeds, newID);
+    m_previewMode.clearPattern(LED_MULTI);
   }
   m_previewMode.init();
   DEBUG_LOGF("Iterated to pattern id %d", newID);
@@ -174,7 +176,9 @@ void PatternSelect::previousPattern()
   if (isMultiLedPatternID(newID)) {
     m_previewMode.setPattern(newID);
   } else {
+    // TODO: clear multi a better way
     m_previewMode.setPatternMap(m_targetLeds, newID);
+    m_previewMode.clearPattern(LED_MULTI);
   }
   m_previewMode.init();
   DEBUG_LOGF("Iterated to pattern id %d", newID);
@@ -199,14 +203,10 @@ void PatternSelect::onLongClick()
     break;
   case STATE_PICK_PATTERN:
     // need to save the new pattern if it's different from current
-    needsSave = (cur->getPatternID() != m_newPatternID);
-    // store the new pattern in the mode
-    cur->setPattern(m_newPatternID);
-    cur->init();
-    DEBUG_LOGF("Saving pattern %u", m_newPatternID);
-    // go back to beginning for next time
-    m_state = STATE_PICK_LIST;
-    // done in the pattern select menu
+    needsSave = (cur->getPatternID() != m_previewMode.getPatternID());
+    // update the current mode with the new pattern
+    Modes::updateCurMode(&m_previewMode);
+    // then done here, save if the mode was different
     leaveMenu(needsSave);
     break;
   }

VortexEngine/src/Patterns/Multi/CrossDopsPattern.cpp

@@ -19,7 +19,7 @@ void CrossDopsPattern::init()
 {
   BlinkStepPattern::init();
   // Alternating evens and odds mapping of leds to turn on/off
-  m_ledMap = MAP_PAIR_EVENS;
+  m_ledMap = MAP_LINE_1;
   // start colorset at index 0 so cur() works
   m_colorset.setCurIndex(0);
 }

VortexEngine/src/Patterns/Multi/FillPattern.cpp

@@ -28,13 +28,13 @@ void FillPattern::init()
 
 void FillPattern::blinkOn()
 {
-  Leds::setQuadrants(QUADRANT_FIRST, (Quadrant)m_progress, m_colorset.peekNext());
-  Leds::setQuadrants((Quadrant)m_progress, QUADRANT_LAST, m_colorset.cur());
+  Leds::setRange(LED_FIRST, LedPos(m_progress * (LED_COUNT / 4)), m_colorset.peekNext());
+  Leds::setRange(LedPos(LED_COUNT / 4), LED_LAST, m_colorset.cur());
 }
 
 void FillPattern::poststep()
 {
-  m_progress = (m_progress + 1) % PAIR_COUNT;
+  m_progress = (m_progress + 1) % 4;
   if (m_progress == 0) {
     m_colorset.getNext();
   }

VortexEngine/src/Patterns/Multi/MeteorPattern.cpp

@@ -34,8 +34,10 @@ 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
-  LedPos target = (LedPos)m_randCtx.next8(LED_FIRST, LED_LAST);
-  RGBColor col = m_colorset.getNext();
-  m_stash.setIndex(target, col);
+  for (int 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
+    LedPos target = (LedPos)m_randCtx.next8(LED_FIRST, LED_LAST);
+    RGBColor col = m_colorset.getNext();
+    m_stash.setIndex(target, col);
+  }
 }

VortexEngine/src/Patterns/Multi/Sequencer/ChaserPattern.cpp

@@ -1,47 +1,49 @@
 #include "ChaserPattern.h"
 
+// This controlls the ratio of chaser dots to LED_COUNT. Default 1 chaser per 7 LEDs. Range: 1-LED_COUNT.
+#define CHASER_RATIO 7
+
+
 // This pattern aims to be a demonstration of the sequencer.
 // There are always many ways to implement a pattern, it's best
 // to choose the method that is most suitable for the pattern.
 ChaserPattern::ChaserPattern(const PatternArgs &args) :
   SequencedPattern(args)
 {
   setArgs(args);
+
+  // Makes sure there is at least 1 chaser
+  uint32_t numChasers = LED_COUNT / CHASER_RATIO;
+  if (!numChasers) {
+    numChasers = 1;
+  }
   // set the pattern ID
   //m_patternID = PATTERN_CHASER;
-  // There are 8 steps in the chaser, so iterate 8 times and generate
+  // There are LED_COUNT steps in the chaser, so iterate LED_COUNT times and generate
   // a pattern map for each step. A colorset map can also be applied
   // to override certain colors for specific steps, but that's not
   // what is being done here
-  for (uint8_t i = 0; i < 8; ++i) {
-    // Each step all fingers are dops except for one, so start with a
-    // Pattern Map that has dops on all fingers. A Pattern Map will map
+  for (uint8_t i = 0; i < LED_COUNT; ++i) {
+    // Each step all LEDs are dops except for one, so start with a
+    // Pattern Map that has dops on all LEDs. A Pattern Map will map
     // a Pattern ID to each LED on the device, then we will override a
     // different entry each step with the Pattern ID for Solid0.
     PatternMap patMap(PATTERN_DOPS);
-    // Override a single finger in the pattern map with the Solid0 pattern
+    // Override a single LED in the pattern map with the Solid0 pattern
     // which will use the 0th color from the colorset as the solid color.
     // An LedMap is a bitmap that indicates which leds are turned on or off
     // at any given time. This will generate an Led Map based on the current
-    // step index like this:
-    //
-    //  step -> finger index -> target leds -> LedMap
-    // -----------------------------------------------------
-    //     0         0             0, 1        00 00 00 00 11
-    //     1         1             2, 3        00 00 00 11 00
-    //     2         2             4, 5        00 00 11 00 00
-    //     3         3             6, 7        00 11 00 00 00
-    //     4         4             8, 9        11 00 00 00 00
-    //     5         3             6, 7        00 11 00 00 00
-    //     6         2             4, 5        00 00 11 00 00
-    //     7         1             2, 3        00 00 00 11 00
-    LedMap overrideLeds = 0; //MAP_PAIR((Pair)((i < 5) ? i : (8 - i)));
+    LedMap overrideLeds = MAP_LED_NONE; 
+    // This creates an led map with 1 chaser per CHASER_RATIO (default 7) leds in LED_COUNT
+    for (int chaserCount = 0; chaserCount < numChasers; ++chaserCount) {
+      overrideLeds |= MAP_LED((i + (chaserCount * CHASER_RATIO)) % LED_COUNT);
+    }
     // Then this API is used to override specific positions in the Pattern Map
     // with a different pattern ID, we use the Led Map generated above to tell
     // setPatternAt() which indices to override with Solid0
     patMap.setPatternAt(PATTERN_SOLID, overrideLeds);
     // Then finally we add this pattern mapping to the sequence in a new step
-    // that will last 300ms, this means all 8 steps will be 300ms each.
+    // that will last 300ms, this means all LED_COUNT steps will be 300ms each.
     // The last parameter of addStep() is omitted, that parameter could be used
     // to override the colorset for specific Leds on any given step. Since it
     // is omitted that means this pattern will use whichever colorset is chosen

VortexEngine/src/Patterns/Multi/VortexPattern.cpp

@@ -0,0 +1,41 @@
+#include "VortexPattern.h"
+
+#include "../../Serial/ByteStream.h"
+#include "../../Time/TimeControl.h"
+#include "../../Leds/Leds.h"
+#include "../../Log/Log.h"
+
+VortexPattern::VortexPattern(const PatternArgs& args) :
+  BlinkStepPattern(args),
+  m_progress(0)
+{
+  m_patternID = PATTERN_VORTEXWIPE;
+  setArgs(args);
+}
+
+VortexPattern::~VortexPattern()
+{
+}
+
+// init the pattern to initial state
+void VortexPattern::init()
+{
+  BlinkStepPattern::init();
+  // reset progress
+  m_progress = 0;
+  // start colorset at index 0 so cur() works
+  m_colorset.setCurIndex(0);
+}
+
+void VortexPattern::blinkOn()
+{
+  Leds::setRing((Ring)(RING_LAST - m_progress), m_colorset.peekNext());
+}
+
+void VortexPattern::poststep()
+{
+  m_progress = (m_progress + 1) % RING_COUNT;
+  if (RING_COUNT - m_progress == RING_LAST) {
+    m_colorset.getNext();
+  }
+}