Added reversing to Anduril. Made EV_tick always send 0 while in "hold" state.

Reversing is a build-time option.

2 files changed, 40 insertions, 5 deletions

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 010f060..6e7b0b9 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -34,6 +34,7 @@
 #define USE_LIGHTNING_MODE
 #define GOODNIGHT_TIME  60  // minutes (approximately)
 #define GOODNIGHT_LEVEL 24  // ~11 lm
+#define USE_REVERSING
 
 /********* Configure SpaghettiMonster *********/
 #define USE_DELAY_ZERO
@@ -228,6 +229,9 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
     uint8_t mode_min = ramp_smooth_floor;
     uint8_t mode_max = ramp_smooth_ceil;
     uint8_t ramp_step_size = 1;
+    #ifdef USE_REVERSING
+    static int8_t ramp_direction = 1;
+    #endif
     if (ramp_style) {
         mode_min = ramp_discrete_floor;
         mode_max = ramp_discrete_ceil;
@@ -289,8 +293,16 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         if (ramp_style  &&  (arg % HOLD_TIMEOUT != 0)) {
             return MISCHIEF_MANAGED;
         }
-        // TODO? make it ramp down instead, if already at max?
+        #ifdef USE_REVERSING
+        // make it ramp down instead, if already at max
+        if ((arg <= 1) && (actual_level >= mode_max)) {
+            ramp_direction = -1;
+        }
+        memorized_level = nearest_level((int16_t)actual_level \
+                          + (ramp_step_size * ramp_direction));
+        #else
         memorized_level = nearest_level((int16_t)actual_level + ramp_step_size);
+        #endif
         #ifdef USE_THERMAL_REGULATION
         target_level = memorized_level;
         #endif
@@ -309,6 +321,9 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
                 #ifdef BLINK_AT_RAMP_CEILING
                 (memorized_level == mode_max)
                 #endif
+                #if defined(USE_REVERSING) && defined(BLINK_AT_RAMP_FLOOR)
+                || (memorized_level == mode_min)
+                #endif
                 )) {
             set_level(0);
             delay_4ms(8/4);
@@ -317,8 +332,17 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         set_level(memorized_level);
         return MISCHIEF_MANAGED;
     }
+    #ifdef USE_REVERSING
+    // reverse ramp direction on hold release
+    else if (event == EV_click1_hold_release) {
+        ramp_direction = -ramp_direction;
+    }
+    #endif
     // click, hold: change brightness (dimmer)
     else if (event == EV_click2_hold) {
+        #ifdef USE_REVERSING
+        ramp_direction = 1;
+        #endif
         // ramp slower in discrete mode
         if (ramp_style  &&  (arg % HOLD_TIMEOUT != 0)) {
             return MISCHIEF_MANAGED;
@@ -351,11 +375,17 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         set_level(memorized_level);
         return MISCHIEF_MANAGED;
     }
-    #ifdef USE_SET_LEVEL_GRADUALLY
+    #if defined(USE_SET_LEVEL_GRADUALLY) || defined(USE_REVERSING)
     else if (event == EV_tick) {
+        #ifdef USE_SET_LEVEL_GRADUALLY
         if (!(arg & 7)) gradual_tick();
         //if (!(arg & 3)) gradual_tick();
         //gradual_tick();
+        #endif
+        #ifdef USE_REVERSING
+        // un-reverse after 1 second
+        if (arg == TICKS_PER_SECOND) ramp_direction = 1;
+        #endif
         return MISCHIEF_MANAGED;
     }
     #endif
diff --git a/spaghetti-monster/fsm-wdt.c b/spaghetti-monster/fsm-wdt.c
index afcf467..7cbe0d2 100644
--- a/spaghetti-monster/fsm-wdt.c
+++ b/spaghetti-monster/fsm-wdt.c
@@ -50,9 +50,6 @@ ISR(WDT_vect) {
     ticks_since_last_event = (ticks_since_last_event + 1) \
                              | (ticks_since_last_event & 0x8000);
 
-    // callback on each timer tick
-    emit(EV_tick, ticks_since_last_event);
-
     // if time since last event exceeds timeout,
     // append timeout to current event sequence, then
     // send event to current state callback
@@ -64,6 +61,14 @@ ISR(WDT_vect) {
     if (le_num >= 1) last_event = current_event[le_num-1];
     if (le_num >= 2) prev_event = current_event[le_num-2];
 
+    // callback on each timer tick
+    if (last_event == A_HOLD) {
+        emit(EV_tick, 0);  // override tick counter while holding button
+    }
+    else {
+        emit(EV_tick, ticks_since_last_event);
+    }
+
     // user held button long enough to count as a long click?
     if (last_event == A_PRESS) {
         if (ticks_since_last_event >= HOLD_TIMEOUT) {