Merge branch 'master' into handle

StoneOrbits · Dec 29, 2023 · f3e1a05 · f3e1a05
2 parents 788257a + 448cb47
commit f3e1a05
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/VortexEngine/src/Menus/Menu.cpp b/VortexEngine/src/Menus/Menu.cpp
@@ -71,7 +71,9 @@ Menu::MenuAction Menu::run()
 
   // every time the button is clicked, change the target led
   if (g_pButton->onShortClick()) {
-    nextBulbSelection();
+    do {
+      nextBulbSelection();
+    } while (!isValidLedSelection(m_targetLeds));
   }
   // on a long press of the button, lock in the target led
   if (g_pButton->onLongClick()) {

diff --git a/VortexEngine/src/Menus/Menu.h b/VortexEngine/src/Menus/Menu.h
@@ -44,6 +44,10 @@ class Menu
   // iterate to next bulb selection
   void nextBulbSelection();
 
+  // 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; }
+
   // the mode copied from the current mode used to preview changes
   Mode m_previewMode;
   // the color of this menu

diff --git a/VortexEngine/src/Menus/MenuList/ColorSelect.cpp b/VortexEngine/src/Menus/MenuList/ColorSelect.cpp
@@ -261,3 +261,11 @@ void ColorSelect::showFullSet(uint8_t offMs, uint8_t onMs)
   }
   Leds::setIndex(LED_1, 0x001000);
 }
+
+bool ColorSelect::isValidLedSelection(LedMap selection) const
+{
+  // if we have a multi-led pattern then we can only select LED_MULTI otherwise
+  // if we don't have a multi-led pattern then we can't select multi
+  bool selectedMulti =  (selection == MAP_LED(LED_MULTI));
+  return selectedMulti == m_previewMode.isMultiLed();
+}
diff --git a/VortexEngine/src/Menus/MenuList/ColorSelect.h b/VortexEngine/src/Menus/MenuList/ColorSelect.h
@@ -22,7 +22,11 @@ class ColorSelect : public Menu
   void onLongClick() override;
 
 private:
-  enum ColorSelectState
+  // override the led selection api to choose which led maps can be selected
+  bool isValidLedSelection(LedMap selection) const override;
+
+  // private enumeration for internal state of color selection
+  enum ColorSelectState : uint32_t
   {
     STATE_INIT,
     STATE_PICK_SLOT,