Skip to content

Commit

Permalink
Fixed fogotten refactored names
Browse files Browse the repository at this point in the history
  • Loading branch information
dbambus committed May 20, 2024
1 parent e49121a commit b74e7b7
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions include/Transitiontypes/Transition.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,15 @@ bool Transition::isSpecialEvent(Transition_t &type, struct tm &tm,
#endif
{
minutesAfterMidnight = 0;
type = COUNTDOWN;
type = NEWYEAR_COUNTDOWN;
} else {
minutesAfterMidnight++;
}
if ((type == NEWYEAR) && (minutesAfterMidnight >= 11)) {
if ((type == NEWYEAR_FIRE) && (minutesAfterMidnight >= 11)) {
type = getTransitionType(true);
}
}
return (type == COUNTDOWN) || (type == NEWYEAR);
return (type == NEWYEAR_COUNTDOWN) || (type == NEWYEAR_FIRE);
}

//------------------------------------------------------------------------------
Expand Down Expand Up @@ -623,7 +623,7 @@ uint16_t Transition::transitionFire() {
case (FIRE_6 + 4):
mirrored = !mirrored;
copyMatrix(old, act); // old contains artefacts
if ((transitionType == NEWYEAR)) {
if ((transitionType == NEWYEAR_FIRE)) {
transitionDelay = 500;
return 1; // restart transition
}
Expand Down Expand Up @@ -704,7 +704,7 @@ uint16_t Transition::transitionCountdown(struct tm &tm) {
if (countDown < 0) { // 60 - 0
countDown = 60;
lastSecond = 99;
transitionType = NEWYEAR;
transitionType = NEWYEAR_FIRE;
return 1; // continue FIRE in phase 1
}
lastSecond = _second;
Expand Down

0 comments on commit b74e7b7

Please sign in to comment.