Skip to content

Add moving skip to Chase 2 #5504

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

Open
RussStringham wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −8
Open

Add moving skip to Chase 2 #5504

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 22 additions & 8 deletions wled00/FX.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,26 +543,40 @@ static const char _data_FX_MODE_RAINBOW_CYCLE[] PROGMEM = "Rainbow@!,Size;;!";
/*
* Alternating pixels running function.
*/
static void running(uint32_t color1, uint32_t color2, bool theatre = false) {
static void running(uint32_t color1, uint32_t color2, bool theatre = false, int skip = 0) {
int width = (theatre ? 3 : 1) + (SEGMENT.intensity >> 4); // window
uint32_t cycleTime = 50 + (255 - SEGMENT.speed);
uint32_t it = strip.now / cycleTime;
bool usePalette = color1 == SEGCOLOR(0);

// skip>0: each stripe has (width) lit LEDs with (skip) blacks between them, plus a (skip)-wide
// black gap at each color transition. stripe_len = width*pitch - skip; period = 2*width*pitch.
int pitch = skip + 1;
int stripe_len = width * pitch - skip;
int period = theatre ? width : (2 * width * pitch);

for (unsigned i = 0; i < SEGLEN; i++) {
uint32_t col = color2;
uint32_t col;
if (usePalette) color1 = SEGMENT.color_from_palette(i, true, PALETTE_SOLID_WRAP, 0);
if (theatre) {
if ((i % width) == SEGENV.aux0) col = color1;
col = ((i % width) == SEGENV.aux0) ? color1 : color2;
} else {
int pos = (i % (width<<1));
if ((pos < SEGENV.aux0-width) || ((pos >= SEGENV.aux0) && (pos < SEGENV.aux0+width))) col = color1;
int pos = ((int)(i % period) - (int)SEGENV.aux0 + period) % period;
if (pos < stripe_len) {
col = (pos % pitch == 0) ? color1 : 0; // foreground stripe
} else if (pos < stripe_len + skip) {
col = 0; // black gap after foreground
} else if (pos < 2 * stripe_len + skip) {
col = (((pos - stripe_len - skip) % pitch) == 0) ? color2 : 0; // background stripe
} else {
col = 0; // black gap after background
}
}
SEGMENT.setPixelColor(i,col);
}

if (it != SEGENV.step) {
SEGENV.aux0 = (SEGENV.aux0 +1) % (theatre ? width : (width<<1));
SEGENV.aux0 = (SEGENV.aux0 + 1) % period;
SEGENV.step = it;
}
}
Expand Down Expand Up @@ -1160,9 +1174,9 @@ static const char _data_FX_MODE_CHASE_FLASH_RANDOM[] PROGMEM = "Chase Flash Rnd@
* Alternating color/sec pixels running.
*/
void mode_running_color(void) {
running(SEGCOLOR(0), SEGCOLOR(1));
running(SEGCOLOR(0), SEGCOLOR(1), false, SEGMENT.custom1 >> 4);
}
static const char _data_FX_MODE_RUNNING_COLOR[] PROGMEM = "Chase 2@!,Width;!,!;!";
static const char _data_FX_MODE_RUNNING_COLOR[] PROGMEM = "Chase 2@!,Width,Skip;!,!;!;;c1=0";


/*
Expand Down
Loading