Updated RampingIOS V3 to new event API. Applied recent changes from Anduril too.

2 files changed, 56 insertions, 62 deletions

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 4c3ccd7..ec16497 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -146,15 +146,6 @@
 #define MAX_BIKING_LEVEL 120  // should be 127 or less
 #define USE_BATTCHECK
 
-// determine the highest number of clicks to handle
-#ifdef USE_INDICATOR_LED
-#define MAX_CLICKS 7
-#elif defined(USE_MUGGLE_MODE)
-#define MAX_CLICKS 6
-#else
-#define MAX_CLICKS 5
-#endif
-
 #if defined(USE_MUGGLE_MODE)
 #ifndef MUGGLE_FLOOR
 #define MUGGLE_FLOOR 22
diff --git a/spaghetti-monster/rampingios/rampingiosv3.c b/spaghetti-monster/rampingios/rampingiosv3.c
index 2aeeddf..4142121 100644
--- a/spaghetti-monster/rampingios/rampingiosv3.c
+++ b/spaghetti-monster/rampingios/rampingiosv3.c
@@ -112,9 +112,10 @@
 /********* Configure SpaghettiMonster *********/
 #define USE_DELAY_ZERO
 #define USE_RAMPING
+#ifndef RAMP_LENGTH
 #define RAMP_LENGTH 150  // default, if not overridden in a driver cfg file
+#endif
 #define USE_BATTCHECK
-#define MAX_CLICKS 10
 #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
 
@@ -141,34 +142,34 @@
 
 
 // FSM states
-uint8_t off_state(EventPtr event, uint16_t arg);
+uint8_t off_state(Event event, uint16_t arg);
 // simple numeric entry config menu
-uint8_t config_state_base(EventPtr event, uint16_t arg,
+uint8_t config_state_base(Event event, uint16_t arg,
                           uint8_t num_config_steps,
                           void (*savefunc)());
 #define MAX_CONFIG_VALUES 3
 uint8_t config_state_values[MAX_CONFIG_VALUES];
 // ramping mode and its related config mode
-uint8_t steady_state(EventPtr event, uint16_t arg);
-uint8_t ramp_config_state(EventPtr event, uint16_t arg);
+uint8_t steady_state(Event event, uint16_t arg);
+uint8_t ramp_config_state(Event event, uint16_t arg);
 #ifdef USE_BATTCHECK
-uint8_t battcheck_state(EventPtr event, uint16_t arg);
+uint8_t battcheck_state(Event event, uint16_t arg);
 #endif
 #ifdef USE_THERMAL_REGULATION
-uint8_t tempcheck_state(EventPtr event, uint16_t arg);
-uint8_t thermal_config_state(EventPtr event, uint16_t arg);
+uint8_t tempcheck_state(Event event, uint16_t arg);
+uint8_t thermal_config_state(Event event, uint16_t arg);
 #endif
 // beacon mode and its related config mode
-uint8_t beacon_state(EventPtr event, uint16_t arg);
-uint8_t beacon_config_state(EventPtr event, uint16_t arg);
+uint8_t beacon_state(Event event, uint16_t arg);
+uint8_t beacon_config_state(Event event, uint16_t arg);
 // soft lockout
 #define MOON_DURING_LOCKOUT_MODE
-uint8_t lockout_state(EventPtr event, uint16_t arg);
+uint8_t lockout_state(Event event, uint16_t arg);
 // momentary / signalling mode
-uint8_t momentary_state(EventPtr event, uint16_t arg);
+uint8_t momentary_state(Event event, uint16_t arg);
 
 // general helper function for config modes
-uint8_t number_entry_state(EventPtr event, uint16_t arg);
+uint8_t number_entry_state(Event event, uint16_t arg);
 // return value from number_entry_state()
 volatile uint8_t number_entry_value;
 
@@ -177,7 +178,7 @@ void blink_confirm(uint8_t num);
 void indicator_blink(uint8_t arg);
 #endif
 #ifdef USE_INDICATOR_LED
-uint8_t auxled_next_state(EventPtr event, uint16_t arg);
+uint8_t auxled_next_state(Event event, uint16_t arg);
 #endif
 
 // remember stuff even after battery was changed
@@ -246,7 +247,7 @@ uint8_t target_level = 0;
 volatile uint8_t beacon_seconds = 2;
 
 
-uint8_t off_state(EventPtr event, uint16_t arg) {
+uint8_t off_state(Event event, uint16_t arg) {
     // turn emitter off when entering state
     if (event == EV_enter_state) {
         set_level(0);
@@ -371,7 +372,7 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
 }
 
 
-uint8_t steady_state(EventPtr event, uint16_t arg) {
+uint8_t steady_state(Event event, uint16_t arg) {
     uint8_t mode_min = ramp_smooth_floor;
     uint8_t mode_max = ramp_smooth_ceil;
     uint8_t ramp_step_size = 1;
@@ -677,7 +678,7 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
 
 
 #ifdef USE_BATTCHECK
-uint8_t battcheck_state(EventPtr event, uint16_t arg) {
+uint8_t battcheck_state(Event event, uint16_t arg) {
     // 1 click: off
     if (event == EV_1click) {
         set_state(off_state, 0);
@@ -694,7 +695,7 @@ uint8_t battcheck_state(EventPtr event, uint16_t arg) {
 
 
 #ifdef USE_THERMAL_REGULATION
-uint8_t tempcheck_state(EventPtr event, uint16_t arg) {
+uint8_t tempcheck_state(Event event, uint16_t arg) {
     // 1 click: off
     if (event == EV_1click) {
         set_state(off_state, 0);
@@ -710,7 +711,7 @@ uint8_t tempcheck_state(EventPtr event, uint16_t arg) {
 #endif
 
 
-uint8_t beacon_state(EventPtr event, uint16_t arg) {
+uint8_t beacon_state(Event event, uint16_t arg) {
     // 1 click: off
     if (event == EV_1click) {
         set_state(off_state, 0);
@@ -727,29 +728,24 @@ uint8_t beacon_state(EventPtr event, uint16_t arg) {
 }
 
 
-uint8_t lockout_state(EventPtr event, uint16_t arg) {
+uint8_t lockout_state(Event event, uint16_t arg) {
     #ifdef MOON_DURING_LOCKOUT_MODE
     // momentary(ish) moon mode during lockout
-    // not all presses will be counted;
-    // it depends on what is in the master event_sequences table
-    uint8_t last = 0;
-    for(uint8_t i=0; pgm_read_byte(event + i) && (i<EV_MAX_LEN); i++)
-        last = pgm_read_byte(event + i);
-    if (arg == 0) {  // Only turn on/off when button state changes
-        if ((last == A_PRESS) || (last == A_HOLD)) {
-            #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
-            set_level(nearest_level(1));
-            #endif
-        }
-        else if ((last == A_RELEASE) || (last == A_RELEASE_TIMEOUT)) {
-            set_level(0);
-        }
+    // button is being held
+    if ((event & (B_CLICK | B_PRESS)) == (B_CLICK | B_PRESS)) {
+        #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
+        set_level(nearest_level(1));
+        #endif
+    }
+    // button was released
+    else if ((event & (B_CLICK | B_PRESS)) == (B_CLICK)) {
+        set_level(0);
     }
     #endif
 
@@ -789,6 +785,9 @@ uint8_t lockout_state(EventPtr event, uint16_t arg) {
         #else
         mode = (mode + 1) % 3;
         #endif
+        #ifdef INDICATOR_LED_SKIP_LOW
+        if (mode == 1) { mode ++; }
+        #endif
         indicator_led_mode = (mode << 2) + (indicator_led_mode & 0x03);
         indicator_led(mode);
         save_config();
@@ -807,7 +806,7 @@ uint8_t lockout_state(EventPtr event, uint16_t arg) {
 
 
 #ifdef USE_INDICATOR_LED
-uint8_t auxled_next_state(EventPtr event, uint16_t arg) {
+uint8_t auxled_next_state(Event event, uint16_t arg) {
     if (event == EV_enter_state) {
         uint8_t mode = indicator_led_mode & 3;
         #ifdef TICK_DURING_STANDBY
@@ -815,6 +814,9 @@ uint8_t auxled_next_state(EventPtr event, uint16_t arg) {
         #else
         mode = (mode + 1) % 3;
         #endif
+        #ifdef INDICATOR_LED_SKIP_LOW
+        if (mode == 1) { mode ++; }
+        #endif
         indicator_led_mode = mode + (indicator_led_mode & 0b00001100);
         indicator_led(mode);
         save_config();
@@ -830,19 +832,19 @@ uint8_t auxled_next_state(EventPtr event, uint16_t arg) {
 #endif
 
 
-uint8_t momentary_state(EventPtr event, uint16_t arg) {
+uint8_t momentary_state(Event event, uint16_t arg) {
     // TODO: momentary strobe here?  (for light painting)
-    if (event == EV_click1_press) {
+
+    // light up when the button is pressed; go dark otherwise
+    // button is being held
+    if ((event & (B_CLICK | B_PRESS)) == (B_CLICK | B_PRESS)) {
         set_level(memorized_level);
-        empty_event_sequence();  // don't attempt to parse multiple clicks
         return MISCHIEF_MANAGED;
     }
-
-    else if (event == EV_release) {
+    // button was released
+    else if ((event & (B_CLICK | B_PRESS)) == (B_CLICK)) {
         set_level(0);
-        empty_event_sequence();  // don't attempt to parse multiple clicks
         //go_to_standby = 1;  // sleep while light is off
-        // TODO: lighted button should use lockout config?
         return MISCHIEF_MANAGED;
     }
 
@@ -854,6 +856,7 @@ uint8_t momentary_state(EventPtr event, uint16_t arg) {
     else if ((event == EV_tick)  &&  (actual_level == 0)) {
         if (arg > TICKS_PER_SECOND*15) {  // sleep after 15 seconds
             go_to_standby = 1;  // sleep while light is off
+            // TODO: lighted button should use lockout config?
         }
         return MISCHIEF_MANAGED;
     }
@@ -863,7 +866,7 @@ uint8_t momentary_state(EventPtr event, uint16_t arg) {
 
 
 // ask the user for a sequence of numbers, then save them and return to caller
-uint8_t config_state_base(EventPtr event, uint16_t arg,
+uint8_t config_state_base(Event event, uint16_t arg,
                           uint8_t num_config_steps,
                           void (*savefunc)()) {
     static uint8_t config_step;
@@ -922,7 +925,7 @@ void ramp_config_save() {
     }
 }
 
-uint8_t ramp_config_state(EventPtr event, uint16_t arg) {
+uint8_t ramp_config_state(Event event, uint16_t arg) {
     uint8_t num_config_steps;
     num_config_steps = 2 + ramp_style;
     return config_state_base(event, arg,
@@ -950,7 +953,7 @@ void thermal_config_save() {
     if (therm_ceil > MAX_THERM_CEIL) therm_ceil = MAX_THERM_CEIL;
 }
 
-uint8_t thermal_config_state(EventPtr event, uint16_t arg) {
+uint8_t thermal_config_state(Event event, uint16_t arg) {
     return config_state_base(event, arg,
                              2, thermal_config_save);
 }
@@ -965,13 +968,13 @@ void beacon_config_save() {
     }
 }
 
-uint8_t beacon_config_state(EventPtr event, uint16_t arg) {
+uint8_t beacon_config_state(Event event, uint16_t arg) {
     return config_state_base(event, arg,
                              1, beacon_config_save);
 }
 
 
-uint8_t number_entry_state(EventPtr event, uint16_t arg) {
+uint8_t number_entry_state(Event event, uint16_t arg) {
     static uint8_t value;
     static uint8_t blinks_left;
     static uint8_t entry_step;