From 4e23fbbf8b1a155c830a2db79d412687332ce031 Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Sat, 1 Sep 2018 17:29:29 -0600 Subject: Reduced moon-during-lockout code size by 10 bytes. --- spaghetti-monster/anduril/anduril.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c index d4e541d..f5c2649 100644 --- a/spaghetti-monster/anduril/anduril.c +++ b/spaghetti-monster/anduril/anduril.c @@ -1098,16 +1098,15 @@ uint8_t lockout_state(EventPtr event, uint16_t arg) { last = pgm_read_byte(event + i); if (arg == 0) { // Only turn on/off when button state changes if ((last == A_PRESS) || (last == A_HOLD)) { - // detect moon level and activate it - uint8_t lvl = ramp_smooth_floor; #ifdef LOCKOUT_MOON_LOWEST // Use lowest moon configured + uint8_t lvl = ramp_smooth_floor; if (ramp_discrete_floor < lvl) lvl = ramp_discrete_floor; + set_level(lvl); #else // Use moon from current ramp - if (ramp_style) lvl = ramp_discrete_floor; + set_level(nearest_level(1)); #endif - set_level(lvl); } else if ((last == A_RELEASE) || (last == A_RELEASE_TIMEOUT)) { set_level(0); -- cgit v1.2.3