Skip to content

Commit

Permalink
Fix for #4193 (twinkle fox & cat)
Browse files Browse the repository at this point in the history
  • Loading branch information
@DedeHai
DedeHai committed Dec 4, 2024
1 parent a873ca6 commit 4902d7f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions wled00/FX.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2565,8 +2565,8 @@ static CRGB twinklefox_one_twinkle(uint32_t ms, uint8_t salt, bool cat)
{
// Overall twinkle speed (changed)
unsigned ticks = ms / SEGENV.aux0;
unsigned fastcycle8 = ticks;
unsigned slowcycle16 = (ticks >> 8) + salt;
unsigned fastcycle8 = uint8_t(ticks);
unsigned slowcycle16 = uint16_t((ticks >> 8) + salt);
slowcycle16 += sin8_t(slowcycle16);
slowcycle16 = (slowcycle16 * 2053) + 1384;
unsigned slowcycle8 = (slowcycle16 & 0xFF) + (slowcycle16 >> 8);
Expand Down

2 comments on commit 4902d7f

@netmindz
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This creates a conflict if I try and cherry-pick into 0_15_0 - can you cherry-pick and resolve the conflict @DedeHai ?

@DedeHai
Copy link
Collaborator Author

@DedeHai DedeHai commented on 4902d7f Dec 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

conflict was from the 0_15_0 not yet having the new sin/cos functions

Please sign in to comment.