diff options
| author | Selene ToyKeeper | 2019-04-08 11:59:18 -0600 |
|---|---|---|
| committer | Selene ToyKeeper | 2019-04-08 11:59:18 -0600 |
| commit | 942dee30adce308ea9177712cfaaea4a26603aaa (patch) | |
| tree | b1319ee6ac6eec1fbdb7f0d5027656c0035aa18f /spaghetti-monster/rampingios | |
| parent | configured lantern stepped ramp and button LED mode, set default tint to 128 ... (diff) | |
| parent | level_calc.py: Combined log_2 and log_e into just log, because all logs have ... (diff) | |
| download | anduril-942dee30adce308ea9177712cfaaea4a26603aaa.tar.gz anduril-942dee30adce308ea9177712cfaaea4a26603aaa.tar.bz2 anduril-942dee30adce308ea9177712cfaaea4a26603aaa.zip | |
merged trunk
Diffstat (limited to 'spaghetti-monster/rampingios')
| -rw-r--r-- | spaghetti-monster/rampingios/rampingiosv3.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/spaghetti-monster/rampingios/rampingiosv3.c b/spaghetti-monster/rampingios/rampingiosv3.c index ff81f61..399bcf0 100644 --- a/spaghetti-monster/rampingios/rampingiosv3.c +++ b/spaghetti-monster/rampingios/rampingiosv3.c @@ -274,11 +274,6 @@ uint8_t off_state(Event event, uint16_t arg) { set_state(steady_state, memorized_level); return MISCHIEF_MANAGED; } - // 2 clicks (initial press): off, to prep for later events - else if (event == EV_click2_press) { - set_level(0); - return MISCHIEF_MANAGED; - } // click, hold: go to highest level (ceiling) (for ramping down) else if (event == EV_click2_hold) { set_state(steady_state, MAX_LEVEL); @@ -289,6 +284,11 @@ uint8_t off_state(Event event, uint16_t arg) { set_state(steady_state, MAX_LEVEL); return MISCHIEF_MANAGED; } + // 3 clicks (initial press): off, to prep for later events + else if (event == EV_click3_press) { + set_level(0); + return MISCHIEF_MANAGED; + } #ifdef USE_BATTCHECK // 3 clicks: battcheck mode / blinky mode group 1 else if (event == EV_3clicks) { @@ -1154,9 +1154,6 @@ void loop() { StatePtr state = current_state; - #ifdef USE_DYNAMIC_UNDERCLOCKING - auto_clock_speed(); - #endif if (0) {} #ifdef USE_BATTCHECK |