Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed multi led patterns in pattern select #139

Merged
merged 52 commits into from
Dec 8, 2023
+178,006 −178,025
Merged

fixed multi led patterns in pattern select #139

Changes from 1 commit
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
bc96d49
fixed multi led patterns in pattern select
Unreal-Dan Nov 17, 2023
d334449
restored these
Unreal-Dan Nov 17, 2023
f626b9e
minor fix
Unreal-Dan Nov 17, 2023
7389367
Changed saving to work off preview mode
LivingSynthesis Nov 17, 2023
a250fdf
Chaser pattern for orbit
LivingSynthesis Nov 17, 2023
a3e0281
Finished Dynamic Chaser Pattern
LivingSynthesis Nov 18, 2023
f937792
Ensures at least 1 Chaser for Chaser pattern
LivingSynthesis Nov 18, 2023
cfc76c2
Fixes to several patterns
LivingSynthesis Nov 18, 2023
c7c9f1d
Substituted Materia for Vortex, needs renaming
LivingSynthesis Nov 18, 2023
b5d50ea
Renamed Materia to Vortex
LivingSynthesis Nov 18, 2023
9c43498
Upated Materia to Vortex
LivingSynthesis Nov 18, 2023
b1d8b18
Small fixes to comments an types
LivingSynthesis Nov 19, 2023
344e449
fixed random function call ordering
Unreal-Dan Nov 22, 2023
e945187
added a comment
Unreal-Dan Nov 22, 2023
6641d42
minor fixes
Unreal-Dan Nov 22, 2023
2cbcb90
Explicit random call order
LivingSynthesis Nov 22, 2023
f8ceb45
Merge branch 'shane/core/random_call_ordering' into daniel/orbit/mult…
LivingSynthesis Nov 22, 2023
e66bfc1
Merge branch 'orbit' into daniel/orbit/multi_led_pattern_select_fix
Unreal-Dan Nov 24, 2023
fb3c52d
fixed multi-led stuff and renamed materia to vortex
Unreal-Dan Nov 24, 2023
9ae30d7
fixed default mode on jest
Unreal-Dan Nov 24, 2023
e11d81d
how to solve vortex on other devices
Unreal-Dan Nov 24, 2023
28b5924
Dynamic version of Vortex Pattern for all devices
LivingSynthesis Nov 28, 2023
cc2ddc9
Merge branch 'daniel/core/multi_led_audit1' into daniel/orbit/multi_l…
LivingSynthesis Nov 29, 2023
bebaa9e
Mutliled pattern args for orbit
LivingSynthesis Nov 29, 2023
b1736fe
Merge branch 'orbit' into daniel/orbit/multi_led_pattern_select_fix
LivingSynthesis Nov 30, 2023
cbf7026
missed this before woops
LivingSynthesis Nov 30, 2023
82d1558
Orbit variants for some patterns
LivingSynthesis Nov 30, 2023
4b902a0
Merge branch 'orbit' into daniel/orbit/multi_led_pattern_select_fix
Unreal-Dan Nov 30, 2023
34c0c50
recorded tests
Unreal-Dan Nov 30, 2023
b2035ed
Merge branch 'orbit' into daniel/orbit/multi_led_pattern_select_fix
Unreal-Dan Nov 30, 2023
9aaecad
fixed sequenced patterns
Unreal-Dan Nov 30, 2023
72a02c1
sequencer fix
Unreal-Dan Nov 30, 2023
01eb151
Fixed deleted default
LivingSynthesis Nov 30, 2023
dce3797
Silly comma, tricks are for kids
LivingSynthesis Nov 30, 2023
6d930fc
adjusted led typing for ring even odd
Unreal-Dan Dec 1, 2023
568f805
Merge branch 'daniel/orbit/multi_led_pattern_select_fix' of https://g…
Unreal-Dan Dec 1, 2023
a33b5da
adjusted blend code
Unreal-Dan Dec 1, 2023
d8ed3b3
removed unused var
Unreal-Dan Dec 1, 2023
69877e1
began pattern expansion for multiled randomizer
LivingSynthesis Dec 1, 2023
751207c
Merge branch 'daniel/orbit/multi_led_pattern_select_fix' of https://g…
LivingSynthesis Dec 1, 2023
acedd21
Added colors to the multi randomize thingy
LivingSynthesis Dec 2, 2023
a4a5746
Finished MutliLed randomize and fixed a bug
LivingSynthesis Dec 5, 2023
9bfc4a6
Fixes for HueShift
LivingSynthesis Dec 5, 2023
3677f0f
Merge branch 'orbit' into daniel/orbit/multi_led_pattern_select_fix
Unreal-Dan Dec 6, 2023
90975c4
Added support for 2nd button exit, orbit only
LivingSynthesis Dec 7, 2023
a843462
Merge branch 'daniel/orbit/multi_led_pattern_select_fix' of https://g…
LivingSynthesis Dec 7, 2023
6d50cbc
Merge branch 'orbit' into daniel/orbit/multi_led_pattern_select_fix
Unreal-Dan Dec 8, 2023
f1eb7ad
Cleaned up HueShiftPattern
LivingSynthesis Dec 8, 2023
00b57fe
Merge branch 'orbit' into daniel/orbit/multi_led_pattern_select_fix
Unreal-Dan Dec 8, 2023
9041103
Merge branch 'orbit' into daniel/orbit/multi_led_pattern_select_fix
Unreal-Dan Dec 8, 2023
faa9a7e
Reverted randomizer
Unreal-Dan Dec 8, 2023
f3b91f2
recorded tests
Unreal-Dan Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions VortexEngine/src/Menus/MenuList/PatternSelect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
PatternSelect::PatternSelect(const RGBColor &col, bool advanced) :
Menu(col, advanced),
m_state(STATE_PICK_LIST),
m_newPatternID(PATTERN_FIRST),
m_started(false)
m_newPatternID(PATTERN_FIRST)
{
}

Expand Down Expand Up @@ -132,15 +131,13 @@ void PatternSelect::nextPattern()
if (newID > endList || newID < beginList) {
newID = beginList;
}
if (!m_started) {
m_started = true;
m_newPatternID = PATTERN_FIRST;
}
// set the new pattern id
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);
Expand All @@ -166,15 +163,13 @@ void PatternSelect::previousPattern()
if (newID > endList || newID < beginList) {
newID = endList;
}
if (!m_started) {
m_started = true;
m_newPatternID = PATTERN_FIRST;
}
// set the new pattern id
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);
Expand Down