jeans/WLED
jeans/WLED
1
0
Fork 0
mirror of https://github.com/wled/WLED.git synced 2025-07-25 19:56:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Noise 4 fix

Browse Source
This commit is contained in:
cschwinne 2019-12-23 19:28:37 +01:00
parent cb66900575
commit 194aa90aee
2 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
wled00/FX.cpp
View File

@ -461,16 +461,34 @@ uint16_t WS2812FX::mode_saw(void) {
* Inspired by www.tweaking4all.com/hardware/arduino/adruino-led-strip-effects/ * Inspired by www.tweaking4all.com/hardware/arduino/adruino-led-strip-effects/
*/ */
uint16_t WS2812FX::mode_twinkle(void) { uint16_t WS2812FX::mode_twinkle(void) {
if(SEGENV.step == 0) { fill(SEGCOLOR(1));
fill(SEGCOLOR(1));
SEGENV.step = map(SEGMENT.intensity, 0, 255, 1, SEGLEN); // make sure, at least one LED is on uint32_t cycleTime = 20 + (255 - SEGMENT.speed)*5;
uint32_t it = now / cycleTime;
if (it != SEGENV.step)
{
uint16_t maxOn = map(SEGMENT.intensity, 0, 255, 1, SEGLEN); // make sure at least one LED is on
if (SEGENV.aux0 >= maxOn)
{
SEGENV.aux0 = 0;
SEGENV.aux1 = random16(); //new seed for our PRNG
}
SEGENV.aux0++;
SEGENV.step = it;
}
uint16_t PRNG16 = SEGENV.aux1;
for (uint16_t i = 0; i < SEGENV.aux0; i++)
{
PRNG16 = (uint16_t)(PRNG16 * 2053) + 13849; // next 'random' number
uint32_t p = (uint32_t)SEGLEN * (uint32_t)PRNG16;
uint16_t mapped = p >> 16;
uint16_t j = SEGMENT.start + mapped;
setPixelColor(j, color_from_palette(j, true, PALETTE_SOLID_WRAP, 0));
} }
uint16_t i = SEGMENT.start + random16(SEGLEN); return FRAMETIME;
setPixelColor(i, color_from_palette(i, true, PALETTE_SOLID_WRAP, 0));
SEGENV.step--;
return 20 + (5 * (uint16_t)(255 - SEGMENT.speed));
} }
@ -592,6 +610,7 @@ uint16_t WS2812FX::mode_multi_strobe(void) {
for(uint16_t i=SEGMENT.start; i < SEGMENT.stop; i++) { for(uint16_t i=SEGMENT.start; i < SEGMENT.stop; i++) {
setPixelColor(i, color_from_palette(i, true, PALETTE_SOLID_WRAP, 1)); setPixelColor(i, color_from_palette(i, true, PALETTE_SOLID_WRAP, 1));
} }
//blink(SEGCOLOR(0), SEGCOLOR(1), true, true);
uint16_t delay = 50 + 20*(uint16_t)(255-SEGMENT.speed); uint16_t delay = 50 + 20*(uint16_t)(255-SEGMENT.speed);
uint16_t count = 2 * ((SEGMENT.speed / 10) + 1); uint16_t count = 2 * ((SEGMENT.speed / 10) + 1);
@ -679,7 +698,8 @@ uint16_t WS2812FX::chase(uint32_t color1, uint32_t color2, uint32_t color3, bool
setPixelColor(SEGMENT.start + b, color2); setPixelColor(SEGMENT.start + b, color2);
setPixelColor(SEGMENT.start + c, color3); setPixelColor(SEGMENT.start + c, color3);
SEGENV.step = (SEGENV.step + 1) % SEGLEN; SEGENV.step++;
if (SEGENV.step >= SEGLEN) SEGENV.step = 0;
return SPEED_FORMULA_L; return SPEED_FORMULA_L;
} }
@ -1523,13 +1543,13 @@ uint16_t WS2812FX::mode_juggle(void){
CRGB fastled_col; CRGB fastled_col;
byte dothue = 0; byte dothue = 0;
for ( byte i = 0; i < 8; i++) { for ( byte i = 0; i < 8; i++) {
uint16_t index = SEGMENT.start + beatsin16(i + 7, 0, SEGLEN -1); uint16_t index = SEGMENT.start + beatsin88((128 + SEGMENT.speed)*(i + 7), 0, SEGLEN -1);
fastled_col = col_to_crgb(getPixelColor(index)); fastled_col = col_to_crgb(getPixelColor(index));
fastled_col |= (SEGMENT.palette==0)?CHSV(dothue, 220, 255):ColorFromPalette(currentPalette, dothue, 255); fastled_col |= (SEGMENT.palette==0)?CHSV(dothue, 220, 255):ColorFromPalette(currentPalette, dothue, 255);
setPixelColor(index, fastled_col.red, fastled_col.green, fastled_col.blue); setPixelColor(index, fastled_col.red, fastled_col.green, fastled_col.blue);
dothue += 32; dothue += 32;
} }
return 10 + (uint16_t)(255 - SEGMENT.speed)/4; return FRAMETIME;
} }
@ -1780,8 +1800,7 @@ uint16_t WS2812FX::mode_noise16_3()
uint16_t WS2812FX::mode_noise16_4() uint16_t WS2812FX::mode_noise16_4()
{ {
CRGB fastled_col; CRGB fastled_col;
SEGENV.step += SEGMENT.speed; uint32_t stp = (now * SEGMENT.speed) >> 7;
uint32_t stp = (now / 160) * SEGMENT.speed;
for (uint16_t i = SEGMENT.start; i < SEGMENT.stop; i++) { for (uint16_t i = SEGMENT.start; i < SEGMENT.stop; i++) {
int16_t index = inoise16(uint32_t(i - SEGMENT.start) << 12, stp); int16_t index = inoise16(uint32_t(i - SEGMENT.start) << 12, stp);
fastled_col = ColorFromPalette(currentPalette, index); fastled_col = ColorFromPalette(currentPalette, index);

2
wled00/wled00.ino
View File

@ -98,7 +98,7 @@
//version code in format yymmddb (b = daily build) //version code in format yymmddb (b = daily build)
#define VERSION 1912221 #define VERSION 1912231
char versionString[] = "0.9.0-b2"; char versionString[] = "0.9.0-b2";