Bypass led select and foreach macro fix (#292)

Author: Unreal-Dan

VortexEngine/src/Leds/LedTypes.h

@@ -106,7 +106,7 @@ typedef uint64_t LedMap;
 #define MAP_IS_ONE_LED(map) (map && !(map & (map-1)))
 
 // foreach led macro (only iterates singles)
-#define MAP_FOREACH_LED(map) for (LedPos pos = ledmapGetFirstLed(map); pos < LED_COUNT; pos = ledmapGetNextLed(map, pos))
+#define MAP_FOREACH_LED(map) for (LedPos pos = ledmapGetFirstLed(map); pos != LED_COUNT; pos = ledmapGetNextLed(map, pos))
 
 // convert a map to the first Led position in the map
 inline LedPos ledmapGetFirstLed(LedMap map)

VortexEngine/src/Menus/Menu.cpp

@@ -157,6 +157,13 @@ void Menu::nextBulbSelection()
   }
 }
 
+void Menu::bypassLedSelection(LedMap map)
+{
+  m_ledSelected = true;
+  m_targetLeds = map;
+  onLedSelected();
+}
+
 void Menu::onLedSelected()
 {
 }

VortexEngine/src/Menus/Menu.h

@@ -44,6 +44,8 @@ class Menu
   // iterate to next bulb selection
   void nextBulbSelection();
 
+  // skip led selection
+  void bypassLedSelection(LedMap map);
   // an overridable api that allows derived menus to decide which led selections
   // should be available before they have actually opened
   virtual bool isValidLedSelection(LedMap selection) const { return true; }

VortexEngine/src/Menus/MenuList/ColorSelect.cpp

@@ -45,8 +45,7 @@ bool ColorSelect::init()
     return false;
   }
   if (cur->isMultiLed()) {
-    m_targetLeds = MAP_LED(LED_MULTI);
-    m_ledSelected = true;
+    bypassLedSelection(MAP_LED(LED_MULTI));
   }
   m_state = STATE_INIT;
   DEBUG_LOG("Entered color select");

VortexEngine/src/Menus/MenuList/Randomizer.cpp

@@ -147,11 +147,14 @@ bool Randomizer::reRoll()
     if (!reRollMulti()) {
       return false;
     }
+  } else if (!reRollSingles()) {
+    return false;
   }
-#endif
+#else
   if (!reRollSingles()) {
     return false;
   }
+#endif
   // initialize the mode with the new pattern and colorset
   m_previewMode.init();
   return true;