Public/esp32-sk6812
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Latest ZAM changes

Browse source
This commit is contained in:
Thomas Kolb 2023-07-27 22:20:22 +02:00
parent c9471331d3
commit e3fcd485f9
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Animation/AnimationController.cpp
View file

@ -87,7 +87,7 @@ void AnimationController::changeAnimation(AnimationController::DefaultAnimation
break; break;
case RACERS: case RACERS:
anim.reset(new RacerAnimation(m_fader, m_fader->strips() * m_fader->modules_per_strip() / 10)); anim.reset(new RacerAnimation(m_fader, m_fader->strips() * m_fader->modules_per_strip() / 8));
break; break;
default: default:

9
src/Animation/RacerAnimation.cpp
View file

@ -63,14 +63,19 @@ RacerAnimation::RacerAnimation(Fader *fader, uint32_t racer_count)
std::uniform_int_distribution<int32_t> posRng(0, maxpos); std::uniform_int_distribution<int32_t> posRng(0, maxpos);
std::uniform_int_distribution<int32_t> speedRng(-128, 128); std::uniform_int_distribution<int32_t> speedRng(-128, 128);
std::uniform_int_distribution<int16_t> colorRng(0, 255); std::uniform_int_distribution<int16_t> colorRng(0, 255);
std::uniform_int_distribution<int16_t> whiteRng(0, 64); std::uniform_int_distribution<int16_t> whiteRng(0, 48);
m_racers.reserve(racer_count); m_racers.reserve(racer_count);
for(size_t i = 0; i < racer_count; i++) { for(size_t i = 0; i < racer_count; i++) {
int32_t speed = speedRng(m_gen);
if(speed == 0) {
speed++;
}
m_racers.emplace_back(Racer{ m_racers.emplace_back(Racer{
fader, fader,
posRng(m_gen), posRng(m_gen),
speedRng(m_gen), speed,
Fader::Color{ Fader::Color{
colorRng(m_gen), colorRng(m_gen),
colorRng(m_gen), colorRng(m_gen),

2
src/main.cpp
View file

@ -239,7 +239,7 @@ static void ledFSM(void)
} }
// change to last used animation after some time // change to last used animation after some time
if((millis() - stateEnteredTime) > 60000) { if((millis() - stateEnteredTime) > 20000) {
// FIXME: does not work with transition because of restart() call in ANIMATION state // FIXME: does not work with transition because of restart() call in ANIMATION state
animController.changeAnimation(loadSavedAnimation(), false); animController.changeAnimation(loadSavedAnimation(), false);
ledState = ANIMATION; ledState = ANIMATION;