Merge branch '0_15_0' of https://github.com/Aircoookie/WLED into 0_15_0

This commit is contained in:
Will Tatam 2024-12-09 09:33:33 +00:00
commit 1891cc816f

View File

@ -2565,11 +2565,11 @@ static CRGB twinklefox_one_twinkle(uint32_t ms, uint8_t salt, bool cat)
{ {
// Overall twinkle speed (changed) // Overall twinkle speed (changed)
unsigned ticks = ms / SEGENV.aux0; unsigned ticks = ms / SEGENV.aux0;
unsigned fastcycle8 = ticks; unsigned fastcycle8 = uint8_t(ticks);
unsigned slowcycle16 = (ticks >> 8) + salt; uint16_t slowcycle16 = (ticks >> 8) + salt;
slowcycle16 += sin8_t(slowcycle16); slowcycle16 += sin8_t(slowcycle16);
slowcycle16 = (slowcycle16 * 2053) + 1384; slowcycle16 = (slowcycle16 * 2053) + 1384;
unsigned slowcycle8 = (slowcycle16 & 0xFF) + (slowcycle16 >> 8); uint8_t slowcycle8 = (slowcycle16 & 0xFF) + (slowcycle16 >> 8);
// Overall twinkle density. // Overall twinkle density.
// 0 (NONE lit) to 8 (ALL lit at once). // 0 (NONE lit) to 8 (ALL lit at once).