fixed multi led patterns in pattern select

VortexEngine/src/Leds/LedTypes.h

@@ -161,6 +161,9 @@ enum Pair : uint8_t
 #define isEven(pos) ((pos % 2) == 0)
 #define isOdd(pos) ((pos % 2) != 0)
 
+// check if an led is orbit even
+#define isOrbitEven(pos) ((MAP_LED(pos) & MAP_RINGS_EVEN) == MAP_LED(pos))
+
 // convert a pair to even or odd led position
 #define pairEven(pair) (LedPos)((uint32_t)pair * 2)
 #define pairOdd(pair) (LedPos)(((uint32_t)pair * 2) + 1)
@@ -371,8 +374,8 @@ inline LedPos mapGetNextLed(LedMap map, LedPos pos)
                          MAP_LED(LED_16) | MAP_LED(LED_18) | MAP_LED(LED_23) | MAP_LED(LED_25))
 #define MAP_RING_EDGE   (MAP_LED(LED_3) | MAP_LED(LED_10) | MAP_LED(LED_17) | MAP_LED(LED_24))
 
-#define MAP_RINGS_ODD   (MAP_RING_INNER | MAP_RING_OUTER)
-#define MAP_RINGS_EVEN  (MAP_RING_MIDDLE | MAP_RING_EDGE)
+#define MAP_RINGS_EVEN  (MAP_RING_INNER | MAP_RING_OUTER)
+#define MAP_RINGS_ODD   (MAP_RING_MIDDLE | MAP_RING_EDGE)
 
 // led quadrant maps
 #define MAP_QUADRANT_1  (MAP_LED(LED_0) | MAP_LED(LED_1) | MAP_LED(LED_2) | MAP_LED(LED_3) | \

VortexEngine/src/Menus/Menu.cpp

@@ -203,6 +203,7 @@ void Menu::onLongClick()
 
 void Menu::onLongClick2()
 {
+  leaveMenu(false);
 }
 
 void Menu::leaveMenu(bool doSave)
@@ -254,7 +255,7 @@ void Menu::blinkSelection(uint32_t offMs, uint32_t onMs)
 // this adds the currently targeted ledPermutation to the selected leds
 void Menu::addSelectionMask() {
   // if selecting any of the individual leds then toggle
-  uint32_t mask = ledPermutations[m_ledSelection];
+  LedMap mask = ledPermutations[m_ledSelection];
   // checks if only 1 b it is set in the target mask
   if ((mask & (mask - 1)) == 0) {
     // if there's only one bit set then toggle that location

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);
@@ -201,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/Modes/DefaultModes.cpp

@@ -6,10 +6,12 @@
 // the gloveset upon factory reset
 const default_mode_entry default_modes[MAX_MODES] = {
   {
-    PATTERN_BOUNCE, 3, {
-      HSV(0, 255, 255),
-      HSV(96, 255, 255),
-      HSV(160, 255, 255)
+    PATTERN_VORTEX, 5, {
+      RGB_RED,
+      RGB_GREEN,
+      RGB_BLUE,
+      0xABAA00,
+      0x5500AB
     }
   },
 
@@ -128,6 +130,7 @@ const default_mode_entry default_modes[MAX_MODES] = {
       0x13000A
     }
   },
+
   {
     PATTERN_GHOSTCRUSH, 7, {
       0x26004B,

VortexEngine/src/Patterns/Multi/CompoundPattern.cpp

@@ -84,8 +84,8 @@ void CompoundPattern::setEvensOdds(PatternID evenPattern, PatternID oddPattern,
 {
   // Set the evenPattern on all evens and oddPattern on all odds
   for (LedPos p = LED_FIRST; p <= LED_LAST; p++) {
-    const PatternArgs *args = isEven(p) ? evenArgs : oddArgs;
-    PatternID id = isEven(p) ? evenPattern : oddPattern;
+    const PatternArgs *args = isOrbitEven(p) ? evenArgs : oddArgs;
+    PatternID id = isOrbitEven(p) ? evenPattern : oddPattern;
     setPatternAt(p, PatternBuilder::makeSingle(id, args));
   }
 }

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/DoubleStrobePattern.cpp

@@ -24,6 +24,6 @@ void DoubleStrobePattern::init()
 
 void DoubleStrobePattern::blinkOn()
 {
-  Leds::setAllOdds(m_colorset.cur());
-  Leds::setAllEvens(m_colorset.peekNext());
+  Leds::setMap(MAP_RINGS_ODD, m_colorset.cur());
+  Leds::setMap(MAP_RINGS_EVEN, m_colorset.peekNext());
 }

VortexEngine/src/Patterns/Multi/DripMorphPattern.cpp

@@ -74,8 +74,8 @@ void DripMorphPattern::blinkOn()
   //       always over/under shoot
   m_cur.hue += m_speed * sign;
   // set the target led with the current HSV color
-  Leds::setAllEvens(m_cur);
-  Leds::setAllOdds(m_colorset.cur());
+  Leds::setMap(MAP_RINGS_EVEN, m_cur);
+  Leds::setMap(MAP_RINGS_ODD, m_colorset.cur());
 }
 
 void DripMorphPattern::blinkOff()

VortexEngine/src/Patterns/Multi/DripPattern.cpp

@@ -26,8 +26,8 @@ void DripPattern::init()
 void DripPattern::blinkOn()
 {
   if (!m_sync) {
-    Leds::setAllEvens(m_colorset.cur());
-    Leds::setAllOdds(m_colorset.peekNext());
+    Leds::setMap(MAP_RINGS_EVEN, m_colorset.cur());
+    Leds::setMap(MAP_RINGS_ODD, m_colorset.peekNext());
   } else {
     Leds::setAll(m_colorset.cur());
   }

VortexEngine/src/Patterns/Multi/FillPattern.cpp

@@ -28,13 +28,14 @@ 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());
+  LedPos edgePos = (LedPos)(m_progress * (LED_COUNT / 4));
+  Leds::setRange(LED_FIRST, edgePos, m_colorset.peekNext());
+  Leds::setRange(edgePos, 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/VortexPattern.cpp

@@ -32,17 +32,13 @@ void VortexPattern::init()
 
 void VortexPattern::blinkOn()
 {
-  // Sets an LED at opposite ends of the strip and progresses towards the center
-  Leds::setIndex((LedPos)m_progress, m_colorset.peekNext());
-  Leds::setIndex((LedPos)(LED_LAST - m_progress), m_colorset.peekNext());
+  Leds::setRing((Ring)(RING_LAST - m_progress), m_colorset.peekNext());
 }
 
 void VortexPattern::poststep()
 {
-  // step till the middle point
-  m_progress = (m_progress + 1) % MIDDLE_POINT;
-  // each cycle progress to the next color
-  if (m_progress == 0) {
+  m_progress = (m_progress + 1) % RING_COUNT;
+  if (RING_COUNT - m_progress == RING_COUNT) {
     m_colorset.getNext();
   }
 }

VortexEngine/src/Patterns/Multi/ZigzagPattern.cpp

@@ -4,25 +4,8 @@
 #include "../../Leds/Leds.h"
 #include "../../Log/Log.h"
 
-// Mapping of LED positions to steps.
-// The lights runs across evens, then back across odds.
-// Index this array with m_step in order to get correct LedPos
-const LedPos ZigzagPattern::ledStepPositions[] = {
-  LED_1,
-  LED_3,
-  LED_5,
-  LED_7,
-  LED_9,
-
-  LED_8,
-  LED_6,
-  LED_4,
-  LED_2,
-  LED_0,
-};
-
 // There just happens to be LED_COUNT steps in the pattern
-#define NUM_ZIGZAG_STEPS (sizeof(ledStepPositions) / sizeof(ledStepPositions[0]))
+#define NUM_ZIGZAG_STEPS LED_COUNT
 #define HALF_ZIGZAG_STEPS (NUM_ZIGZAG_STEPS / 2)
 
 ZigzagPattern::ZigzagPattern(const PatternArgs &args) :
@@ -60,8 +43,8 @@ void ZigzagPattern::init()
   m_stepTimer.start();
 
   // initialize the snakes with dops timing
-  m_snake1.init(m_onDuration, m_offDuration, m_colorset, 0, 0, m_snakeSize, m_fadeAmount, 3);
-  m_snake2.init(m_onDuration, m_offDuration, m_colorset, 1, HALF_ZIGZAG_STEPS, m_snakeSize, m_fadeAmount, 8);
+  m_snake1.init(m_onDuration, m_offDuration, m_colorset, 0, 0, m_snakeSize, m_fadeAmount, 4);
+  m_snake2.init(m_onDuration, m_offDuration, m_colorset, 1, HALF_ZIGZAG_STEPS, m_snakeSize, m_fadeAmount, 7);
 }
 
 // pure virtual must override the play function
@@ -159,7 +142,7 @@ void ZigzagPattern::Snake::drawSnake()
       col.adjustBrightness(m_fadeAmount * segment);
     }
     // lookup the target in the step positions array and turn it on with given color/brightness
-    Leds::setIndex(ledStepPositions[segment_position], col);
+    Leds::setIndex((LedPos)segment_position, col);
     // if this segment is on the step where the color changes
     if (segment_position == m_changeBoundary) {
       // then decrement the color index for the rest of the snake so that the

VortexEngine/src/Patterns/Multi/ZigzagPattern.h

@@ -39,10 +39,6 @@ class ZigzagPattern : public MultiLedPattern
     uint8_t m_fadeAmount;
     uint8_t m_changeBoundary;
   };
-
-  // path for leds to take, index this with m_step up to LED_COUNT steps
-  static const LedPos ledStepPositions[];
-
   // blink on duration
   uint8_t m_onDuration;
   // blink off duration