aboutsummaryrefslogtreecommitdiff
path: root/spaghetti-monster
diff options
context:
space:
mode:
authorSelene ToyKeeper2018-07-01 20:38:16 -0600
committerSelene ToyKeeper2018-07-01 20:38:16 -0600
commitaa52415286c095bc2c0e529d52eb383e4d2daa69 (patch)
tree5b69f14c1974d06e3e70eb1a30e5c8cda72b5ad0 /spaghetti-monster
parentmerged upstream fsm changes (diff)
downloadanduril-aa52415286c095bc2c0e529d52eb383e4d2daa69.tar.gz
anduril-aa52415286c095bc2c0e529d52eb383e4d2daa69.tar.bz2
anduril-aa52415286c095bc2c0e529d52eb383e4d2daa69.zip
Moved "next aux LED mode" to 7 clicks instead of 14 clicks.
Shorter, easier, and has sort of an odd symmetry to "next lockout aux LED mode", which is 4 clicks, a pause, and then 3 clicks.
Diffstat (limited to 'spaghetti-monster')
-rw-r--r--spaghetti-monster/anduril/rampingiosv3.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/spaghetti-monster/anduril/rampingiosv3.c b/spaghetti-monster/anduril/rampingiosv3.c
index 13be1b6..d15d8ed 100644
--- a/spaghetti-monster/anduril/rampingiosv3.c
+++ b/spaghetti-monster/anduril/rampingiosv3.c
@@ -77,11 +77,7 @@
#define USE_RAMPING
#define RAMP_LENGTH 150
#define USE_BATTCHECK
-#ifdef USE_INDICATOR_LED
-#define MAX_CLICKS 14
-#else
#define MAX_CLICKS 10
-#endif
#define USE_IDLE_MODE // reduce power use while awake and no tasks are pending
#define USE_DYNAMIC_UNDERCLOCKING // cut clock speed at very low modes for better efficiency
@@ -302,6 +298,13 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
set_state(lockout_state, 0);
return MISCHIEF_MANAGED;
}
+ #ifdef USE_INDICATOR_LED
+ // 7 clicks: next aux LED mode
+ else if (event == EV_7clicks) {
+ set_state(auxled_next_state, 0);
+ return MISCHIEF_MANAGED;
+ }
+ #endif
// 8 clicks: beacon mode
else if (event == EV_8clicks) {
set_state(beacon_state, 0);
@@ -312,13 +315,6 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
push_state(thermal_config_state, 0);
return MISCHIEF_MANAGED;
}
- #ifdef USE_INDICATOR_LED
- // 14 clicks: next aux LED mode
- else if (event == EV_14clicks) {
- set_state(auxled_next_state, 0);
- return MISCHIEF_MANAGED;
- }
- #endif
return EVENT_NOT_HANDLED;
}