Merge branch 'daniel/orbit/multi_led_pattern_select_fix' of https://g…

…ithub.com/Unreal-Dan/VortexEngine into daniel/orbit/multi_led_pattern_select_fix
StoneOrbits · Dec 7, 2023 · a843462 · a843462
2 parents 90975c4 + 3677f0f
commit a843462
Show file tree

Hide file tree

Showing 60 changed files with 9,332 additions and 4,929 deletions.
diff --git a/VortexEngine/src/Leds/LedTypes.h b/VortexEngine/src/Leds/LedTypes.h
@@ -304,7 +304,7 @@ typedef uint64_t LedMap;
 // convert a map to the first Led position in the map
 inline LedPos mapGetFirstLed(LedMap map)
 {
-  if (map == LED_MULTI) {
+  if (map == MAP_LED(LED_MULTI)) {
     return LED_MULTI;
   }
   LedPos pos = LED_FIRST;

diff --git a/VortexEngine/src/Menus/MenuList/ColorSelect.cpp b/VortexEngine/src/Menus/MenuList/ColorSelect.cpp
@@ -49,7 +49,7 @@ bool ColorSelect::init()
     return false;
   }
   if (cur->isMultiLed()) {
-    m_targetLeds = LED_MULTI;
+    m_targetLeds = MAP_LED(LED_MULTI);
     m_ledSelected = true;
   }
   m_state = STATE_INIT;

diff --git a/VortexEngine/tests/tests_general/0010_Enter_Pattern_Select_Menu.test b/VortexEngine/tests/tests_general/0010_Enter_Pattern_Select_Menu.test
diff --git a/VortexEngine/tests/tests_general/0016_Enter_Adv_Pattern_Select.test b/VortexEngine/tests/tests_general/0016_Enter_Adv_Pattern_Select.test
diff --git a/VortexEngine/tests/tests_general/0131_Cycle_bulbs_in_Pattern_Select.test b/VortexEngine/tests/tests_general/0131_Cycle_bulbs_in_Pattern_Select.test
diff --git a/VortexEngine/tests/tests_general/0132_Cycle_Patterns_in_Pattern_Select_Both_Bulbs.test b/VortexEngine/tests/tests_general/0132_Cycle_Patterns_in_Pattern_Select_Both_Bulbs.test
@@ -8,7 +8,7 @@ Args=
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-707070707070707070707070707070707070707070000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+101010101010101010101010101010101010101010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000AB7A0056990000B80000992A00B800569900AB7A00007B55003EAA0000FF2A00D50000FF003EAA007B555500AB7F0081AA0055D4002BAA00557F00815500AB
 FF0000D51E00AB3D00AB5B00AB3D00D51E00FF0000000000000000000000000000000000000000000000007B55003EAA0000FF2A00D50000FF003EAA007B555500AB7F0081AA0055D4002BAA00557F00815500AB
 FF0000D51E00AB3D00AB5B00AB3D00D51E00FF0000000000000000000000000000000000000000000000007B55003EAA0000FF2A00D50000FF003EAA007B555500AB7F0081AA0055D4002BAA00557F00815500AB

diff --git a/VortexEngine/tests/tests_general/0133_Select_Pattern_in_Pattern_Select_Both_Bulbs.test b/VortexEngine/tests/tests_general/0133_Select_Pattern_in_Pattern_Select_Both_Bulbs.test
@@ -8,7 +8,7 @@ Args=
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-707070707070707070707070707070707070707070000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+101010101010101010101010101010101010101010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000AB7A0056990000B80000992A00B800569900AB7A00007B55003EAA0000FF2A00D50000FF003EAA007B555500AB7F0081AA0055D4002BAA00557F00815500AB
 000000000000000000000000000000000000000000D51E00D51E00D51E00D51E00D51E00D51E00D51E00AB3D00AB3D00AB3D00AB3D00AB3D00AB3D00AB3D00AB5B00AB5B00AB5B00AB5B00AB5B00AB5B00AB5B00
 000000000000000000000000000000000000000000D51E00D51E00D51E00D51E00D51E00D51E00D51E00AB3D00AB3D00AB3D00AB3D00AB3D00AB3D00AB3D00AB5B00AB5B00AB5B00AB5B00AB5B00AB5B00AB5B00

diff --git a/VortexEngine/tests/tests_general/0134_Cycle_Patterns_in_Pattern_Select_Top_Bulb.test b/VortexEngine/tests/tests_general/0134_Cycle_Patterns_in_Pattern_Select_Top_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0135_Select_Pattern_in_Pattern_Select_Top_Bulb.test b/VortexEngine/tests/tests_general/0135_Select_Pattern_in_Pattern_Select_Top_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0136_Cycle_Patterns_in_Pattern_Select_Front_Bulb.test b/VortexEngine/tests/tests_general/0136_Cycle_Patterns_in_Pattern_Select_Front_Bulb.test
@@ -8,9 +8,9 @@ Args=
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-707070707070707070707070707070707070707070000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-707070707070707070707070707070707070707070101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
+101010101010101010101010101010101010101010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+FF0000FF0000FF0000FF0000FF0000FF0000FF00000000000000000000000000000000000000000000000045FF0045FF0045FF0045FF0045FF0045FF0045FF101010101010101010101010101010101010101010
+FF0000FF0000FF0000FF0000FF0000FF0000FF000000FF3C00FF3C00FF3C00FF3C00FF3C00FF3C00FF3C000000000000000000000000000000000000000000101010101010101010101010101010101010101010
 000000000000000000000000000000000000000000AB7A0056990000B80000992A00B800569900AB7A00007B55003EAA0000FF2A00D50000FF003EAA007B555500AB7F0081AA0055D4002BAA00557F00815500AB
 FF0000D51E00AB3D00AB5B00AB3D00D51E00FF0000000000000000000000000000000000000000000000007B55003EAA0000FF2A00D50000FF003EAA007B555500AB7F0081AA0055D4002BAA00557F00815500AB
 FF0000D51E00AB3D00AB5B00AB3D00D51E00FF0000AB7A0056990000B80000992A00B800569900AB7A000000000000000000000000000000000000000000005500AB7F0081AA0055D4002BAA00557F00815500AB

diff --git a/VortexEngine/tests/tests_general/0137_Select_Pattern_in_Pattern_Select_Front_Bulb.test b/VortexEngine/tests/tests_general/0137_Select_Pattern_in_Pattern_Select_Front_Bulb.test
@@ -8,9 +8,9 @@ Args=
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-707070707070707070707070707070707070707070000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-707070707070707070707070707070707070707070101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
+101010101010101010101010101010101010101010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+FF0000FF0000FF0000FF0000FF0000FF0000FF00000000000000000000000000000000000000000000000045FF0045FF0045FF0045FF0045FF0045FF0045FF101010101010101010101010101010101010101010
+FF0000FF0000FF0000FF0000FF0000FF0000FF000000FF3C00FF3C00FF3C00FF3C00FF3C00FF3C00FF3C000000000000000000000000000000000000000000101010101010101010101010101010101010101010
 000000000000000000000000000000000000000000AB7A0056990000B80000992A00B800569900AB7A00007B55003EAA0000FF2A00D50000FF003EAA007B555500AB7F0081AA0055D4002BAA00557F00815500AB
 000000000000000000000000000000000000000000D51E00D51E00D51E00D51E00D51E00D51E00D51E00AB3D00AB3D00AB3D00AB3D00AB3D00AB3D00AB3D00AB5B00AB5B00AB5B00AB5B00AB5B00AB5B00AB5B00
 000000000000000000000000000000000000000000D51E00D51E00D51E00D51E00D51E00D51E00D51E00AB3D00AB3D00AB3D00AB3D00AB3D00AB3D00AB3D00AB5B00AB5B00AB5B00AB5B00AB5B00AB5B00AB5B00