mod_effects: use new time macros

janfietz · Dec 6, 2018 · 26fd15c · 26fd15c
1 parent 19488bc
commit 26fd15c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/modules/mod_effects/mod_effects.cpp b/src/modules/mod_effects/mod_effects.cpp
@@ -89,7 +89,7 @@ void ModuleEffects::ThreadMain() {
  EffectReset(effCurrent, 0, 0, current);
 
  // start timer
- chVTSet(&effTimer, TIME_MS2I(30), ModuleEffects::TimerCallback,
+ chVTSet(&effTimer, TIME_S2I(30), ModuleEffects::TimerCallback,
  reinterpret_cast<void*>(this));
  }
 

diff --git a/src/modules/mod_effects/mod_effects.h b/src/modules/mod_effects/mod_effects.h
@@ -86,7 +86,7 @@ class ModuleEffects : public qos::ThreadedModule<MOD_EFFECTS_THREADSIZE>
 
  /*Effects*/
  EffectRandomPixelsCfg effRandomCfg = {
- .spawninterval = MS2ST(200),
+ .spawninterval = TIME_MS2I(200),
  .color = {0xFF, 0xFF, 0xFF},
  .randomRed = true,
  .randomGreen = true,
@@ -122,7 +122,7 @@ class ModuleEffects : public qos::ThreadedModule<MOD_EFFECTS_THREADSIZE>
  };
 
  EffectWanderingCfg effWanderingCfg = {
- .speed = 100,
+ .speed = TIME_MS2I(100),
  .ledbegin = 0,
  .ledend = LEDCOUNT - 1,
  .dir = 0,