lba.gitea/WLED
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify casting a bit, where possible

Browse Source
This commit is contained in:
TripleWhy 2023-11-04 15:54:21 +01:00
parent f3831665d4
commit adcecf969a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wled00/FX.cpp
View File

@ -2602,7 +2602,7 @@ static const char _data_FX_MODE_TWINKLECAT[] PROGMEM = "Twinklecat@!,Twinkle rat
uint16_t mode_halloween_eyes() uint16_t mode_halloween_eyes()
{ {
enum class eyeState : uint8_t { enum eyeState : uint8_t {
initializeOn = 0, initializeOn = 0,
on, on,
blink, blink,
@ -2634,7 +2634,7 @@ uint16_t mode_halloween_eyes()
if (!SEGMENT.check2) SEGMENT.fill(SEGCOLOR(1)); //fill background if (!SEGMENT.check2) SEGMENT.fill(SEGCOLOR(1)); //fill background
data.state = static_cast<eyeState>(static_cast<uint8_t>(data.state) % static_cast<uint8_t>(eyeState::count)); data.state = static_cast<eyeState>(data.state % eyeState::count);
uint16_t duration = data.duration; uint16_t duration = data.duration;
duration = max(uint16_t{1u}, duration); duration = max(uint16_t{1u}, duration);
const uint32_t elapsedTime = strip.now - data.startTime; const uint32_t elapsedTime = strip.now - data.startTime;
@ -2651,11 +2651,11 @@ uint16_t mode_halloween_eyes()
} }
case eyeState::on: { case eyeState::on: {
uint16_t start2ndEye = data.startPos + HALLOWEEN_EYE_WIDTH + HALLOWEEN_EYE_SPACE; uint16_t start2ndEye = data.startPos + HALLOWEEN_EYE_WIDTH + HALLOWEEN_EYE_SPACE;
duration = min(duration, static_cast<uint16_t>(128u + (SEGMENT.intensity*64u))); duration = min(duration, static_cast<uint16_t>(128u + (SEGMENT.intensity * 64u)));
constexpr uint32_t minimumOnTimeBegin = 1024u; constexpr uint32_t minimumOnTimeBegin = 1024u;
constexpr uint32_t minimumOnTimeEnd = 1024u; constexpr uint32_t minimumOnTimeEnd = 1024u;
const uint32_t fadeInAnimationState = elapsedTime * static_cast<uint32_t>(256*8) / duration; const uint32_t fadeInAnimationState = elapsedTime * uint32_t{256u * 8u} / duration;
const uint32_t backgroundColor = SEGCOLOR(1); const uint32_t backgroundColor = SEGCOLOR(1);
const uint32_t eyeColor = SEGMENT.color_from_palette(data.color, false, false, 0); const uint32_t eyeColor = SEGMENT.color_from_palette(data.color, false, false, 0);
uint32_t c = eyeColor; uint32_t c = eyeColor;