Skip to content

Commit

Permalink
Merge branch 'daniel/core/multi_pat_arg_audit' into daniel/orbit/mult…
Browse files Browse the repository at this point in the history
…i_pat_arg_audit
  • Loading branch information
Unreal-Dan committed Dec 7, 2023
2 parents 0248732 + 29ae38b commit 4086ebe
Show file tree
Hide file tree
Showing 33 changed files with 19,681 additions and 19,681 deletions.
32 changes: 16 additions & 16 deletions VortexEngine/src/Patterns/PatternBuilder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -164,28 +164,28 @@ PatternArgs PatternBuilder::getDefaultArgs(PatternID id)
// =====================
// Multi Led Patterns:
#if VORTEX_SLIM == 0
case PATTERN_HUE_SCROLL: return PatternArgs(1, 1);
case PATTERN_HUE_SCROLL: return PatternArgs(1, 1, 10);
case PATTERN_THEATER_CHASE: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 28);
case PATTERN_CHASER: return PatternArgs();
case PATTERN_ZIGZAG: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 55, 1, 55);
case PATTERN_ZIPFADE: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 100, 4, 1);
case PATTERN_DRIP: return PatternArgs(STROBE_ON_DURATION, STROBE_OFF_DURATION, 250);
case PATTERN_ZIGZAG: return PatternArgs(DOPS_ON_DURATION, 3, 3, 5, 55);
case PATTERN_ZIPFADE: return PatternArgs(DOPS_ON_DURATION, 2, 75, 9, 230);
case PATTERN_DRIP: return PatternArgs(STROBE_ON_DURATION, STROBE_OFF_DURATION, 150);
case PATTERN_DRIPMORPH: return PatternArgs(STROBE_ON_DURATION, STROBE_OFF_DURATION, 1);
case PATTERN_CROSSDOPS: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 100);
case PATTERN_CROSSDOPS: return PatternArgs(DOPS_ON_DURATION, 2, 25);
case PATTERN_DOUBLESTROBE: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 115);
case PATTERN_METEOR: return PatternArgs(STROBE_ON_DURATION, STROBE_OFF_DURATION, 55, 75);
case PATTERN_SPARKLETRACE: return PatternArgs(5, 0, 50);
case PATTERN_VORTEXWIPE: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 130);
case PATTERN_WARP: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 150);
case PATTERN_WARPWORM: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 110);
case PATTERN_SNOWBALL: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 110);
case PATTERN_LIGHTHOUSE: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 100, 25, 5);
case PATTERN_PULSISH: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, STROBE_ON_DURATION, STROBE_OFF_DURATION, 250);
case PATTERN_FILL: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 200);
case PATTERN_BOUNCE: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 200, 10);
case PATTERN_METEOR: return PatternArgs(1, 1, 20, 130);
case PATTERN_SPARKLETRACE: return PatternArgs(1, 5, 3);
case PATTERN_VORTEXWIPE: return PatternArgs(DOPS_ON_DURATION, 3, 80);
case PATTERN_WARP: return PatternArgs(3, DOPS_OFF_DURATION, 50);
case PATTERN_WARPWORM: return PatternArgs(DOPS_ON_DURATION, 10, 100);
case PATTERN_SNOWBALL: return PatternArgs(3, 3, 33);
case PATTERN_LIGHTHOUSE: return PatternArgs(DOPS_ON_DURATION, 5, 22, 3, 3);
case PATTERN_PULSISH: return PatternArgs(DOPS_ON_DURATION, 6, 5, 1, 100);
case PATTERN_FILL: return PatternArgs(DOPS_ON_DURATION, 5, 50);
case PATTERN_BOUNCE: return PatternArgs(10, 5, 50, 10);
case PATTERN_SPLITSTROBIE: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 0, 16, 3, 10, PATTERN_DOPS, PATTERN_STROBIE);
case PATTERN_BACKSTROBE: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 0, HYPERSTROBE_ON_DURATION, HYPERSTROBE_OFF_DURATION, 10, PATTERN_DOPS, PATTERN_HYPERSTROBE);
case PATTERN_VORTEX: return PatternArgs(STROBE_ON_DURATION, STROBE_OFF_DURATION, 130);
case PATTERN_VORTEX: return PatternArgs(1, 1, 130);
case PATTERN_NONE: break;
default: break;
#else
Expand Down
358 changes: 179 additions & 179 deletions VortexEngine/tests/tests_general/0001_Cycle_all_modes.test

Large diffs are not rendered by default.

358 changes: 179 additions & 179 deletions VortexEngine/tests/tests_general/0002_Enter_Menus.test

Large diffs are not rendered by default.

2,636 changes: 1,318 additions & 1,318 deletions VortexEngine/tests/tests_general/0003_Start_Auto-cycle.test

Large diffs are not rendered by default.

2,636 changes: 1,318 additions & 1,318 deletions VortexEngine/tests/tests_general/0004_End_Auto-cycle.test

Large diffs are not rendered by default.

346 changes: 173 additions & 173 deletions VortexEngine/tests/tests_general/0014_Enter_Adv_Mode_Share.test

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Args=
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
707070000000000000000000000000000000000000707070000000000000000000000000000000000000707070000000000000000000000000000000000000707070000000000000000000000000000000000000
707070000000000000000000000000000000000000707070000000000000000000000000000000000000707070000000000000000000000000000000000000707070000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
707070000000000000000000000000000000000000707070000000000000000000000000000000000000707070000000000000000000000000000000000000707070000000000000000000000000000000000000
FF2A00FF2A00FF2A00FF2A00FF2A00FF2A00FF2A00FF2A00FF2A00FF2A00FF2A00FF2A00FF2A00FF2A00FF2A00FF2A00FF2A00FF2A00FF2A00FF2A00FF2A00FF2A00FF2A00FF2A00FF2A00FF2A00FF2A00FF2A00
000000FF2A00000000FF2A00000000FF2A00000000FF2A00000000FF2A00000000FF2A00000000FF2A00000000FF2A00000000FF2A00000000FF2A00000000FF2A00000000FF2A00000000FF2A00000000FF2A00
000000FF2A00000000FF2A00000000FF2A00000000FF2A00000000FF2A00000000FF2A00000000FF2A00000000FF2A00000000FF2A00000000FF2A00000000FF2A00000000FF2A00000000FF2A00000000FF2A00
Expand Down
Loading

0 comments on commit 4086ebe

Please sign in to comment.