diff options
| author | Selene ToyKeeper | 2018-10-09 19:01:46 -0600 |
|---|---|---|
| committer | Selene ToyKeeper | 2018-10-09 19:01:46 -0600 |
| commit | db91fff43ac956ce4cb69d2d519d7d5533168d1a (patch) | |
| tree | 0d736d6a7059ae7156f47294b3c01af9e5050bd5 | |
| parent | Made second aux LED copy the behavior of the first. (diff) | |
| parent | applied thermal target bugfix from Anduril (diff) | |
| download | anduril-db91fff43ac956ce4cb69d2d519d7d5533168d1a.tar.gz anduril-db91fff43ac956ce4cb69d2d519d7d5533168d1a.tar.bz2 anduril-db91fff43ac956ce4cb69d2d519d7d5533168d1a.zip | |
merged bug fix from upstream fsm branch
| -rw-r--r-- | spaghetti-monster/anduril/anduril.c | 3 | ||||
| -rw-r--r-- | spaghetti-monster/rampingios/rampingiosv3.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c index d15e9a0..6e33610 100644 --- a/spaghetti-monster/anduril/anduril.c +++ b/spaghetti-monster/anduril/anduril.c @@ -515,10 +515,11 @@ uint8_t steady_state(EventPtr event, uint16_t arg) { if ((arg > mode_min) && (arg < mode_max)) memorized_level = arg; // use the requested level even if not memorized + arg = nearest_level(arg); #ifdef USE_THERMAL_REGULATION target_level = arg; #endif - set_level(nearest_level(arg)); + set_level(arg); #ifdef USE_REVERSING ramp_direction = 1; #endif diff --git a/spaghetti-monster/rampingios/rampingiosv3.c b/spaghetti-monster/rampingios/rampingiosv3.c index 5c8f7ea..2aeeddf 100644 --- a/spaghetti-monster/rampingios/rampingiosv3.c +++ b/spaghetti-monster/rampingios/rampingiosv3.c @@ -394,10 +394,11 @@ uint8_t steady_state(EventPtr event, uint16_t arg) { if ((arg > mode_min) && (arg < mode_max)) memorized_level = arg; // use the requested level even if not memorized + arg = nearest_level(arg); #ifdef USE_THERMAL_REGULATION target_level = arg; #endif - set_level(nearest_level(arg)); + set_level(arg); #ifdef USE_REVERSING ramp_direction = 1; #endif |