buttons.c: param setup fixes

[bike-lights.git] / firmware / buttons.c

diff --git a/firmware/buttons.c b/firmware/buttons.c
index 17f4bffad9f70e671994e30582616adb309aaa23..679d958cbec7e1585ae0e661a0140a740d0f3370 100644 (file)
--- a/firmware/buttons.c
+++ b/firmware/buttons.c
@@ -6,8 +6,7 @@
 #include "lights.h"
 
 static uint16_t button_start[N_BUTTONS];
-static unsigned char button_pressed[N_BUTTONS];
-static unsigned char just_waked_up;
+static unsigned char prev_pin;
 
 static unsigned char user_params[MAX_USER_PARAMS] = { 0, 0, 0 };
 static unsigned char user_params_max[MAX_USER_PARAMS] = { 3, 2, 2 };
@@ -21,7 +20,29 @@ static unsigned char user_params_state = 0;
 
 static uint16_t user_params_starttime;
 
-static void do_sleep();
+static void inline set_status_led(unsigned char n, pattern_t *pattern)
+{
+       led_set_pattern(n + N_PWMLEDS, pattern);
+}
+
+pattern_t *status_pattern_select(unsigned char n)
+{
+       if (user_params_state) // Setup in progress
+               return number_pattern(n == 0
+                       ? user_params_state
+                       : 1 + user_params[user_params_state-1]
+               );
+       else if (!(prev_pin & _BV(PA3)) || !(prev_pin & _BV(PA4)))
+               // at least one button is pressed
+               return off_pattern;
+       // otherwise, an ordinary state
+       if (n == 0) {
+               // error led
+               return number_pattern(1 + ambient_zone);
+       } else {
+               return jiffies > 500 ? number_pattern(2) : zero_pattern; // for now
+       }
+}
 
 static void toggle_bright_mode()
 {
@@ -58,7 +79,7 @@ static inline void short_press(unsigned char button)
                if (user_params[param])
                        user_params[param]--;
                else
-                       user_params[param] = user_params_max[param];
+                       user_params[param] = user_params_max[param]-1;
        } else {
                user_params[param]++;
 
@@ -67,7 +88,7 @@ static inline void short_press(unsigned char button)
        }
        // FIXME: notify somebody about user_params change?
 
-       // set_status_led(2, user_params[param]);
+       set_status_led(1, status_pattern_select(1));
 
        user_params_starttime = jiffies;
 }
@@ -75,98 +96,73 @@ static inline void short_press(unsigned char button)
 static inline void long_press(unsigned char button)
 {
        if (button == 0) {
-               do_sleep();
+               power_down();
                return;
        }
 
        // button 1 - cycle through states
        user_params_state++;
 
-       if (user_params_state >= MAX_USER_PARAMS)
+       if (user_params_state > MAX_USER_PARAMS)
                user_params_state = 1;
 
-       // set_status_led(1, state);
+       set_status_led(0, status_pattern_select(0));
+       set_status_led(1, status_pattern_select(1));
        user_params_starttime = jiffies;
 }
 
 void init_buttons()
 {
-       unsigned char i;
-
        DDRA &= ~(_BV(PA3) | _BV(PA4));
        PORTA |=  _BV(PA3) | _BV(PA4);
 
-       for (i=0; i < N_BUTTONS; i++) {
-               button_start[i] = 0;
-               button_pressed[i] = 0;
-       }
-
-       just_waked_up = 1;
+       button_start[0] = 0;
+       button_start[1] = 0;
+       prev_pin = _BV(PA3) | _BV(PA4);
+       user_params_state = 0;
 }
 
-static void do_sleep()
+static void handle_button(unsigned char button, unsigned char cur,
+       unsigned char prev)
 {
-       log_byte(0xb0);
-       log_flush();
+       // BEWARE: pins are at _zero_ when pressed!
+       if (!cur && prev) {                   // --- just pressed ---
+               button_start[button] = jiffies;
+               set_status_led(button, off_pattern);
 
-       hw_suspend();
-       gpio_before_poweroff(); // Set the status LED on again
+       } else if (!cur && !prev) {           // --- is still pressed ---
+               uint16_t duration = jiffies - button_start[button];
 
-       while((PINA & _BV(PA3)) == 0)
-               ; // wait for button release
-
-       _delay_ms(100);
-
-       susp_gpio(); // disable the status LED
-
-       power_down();
+               if (duration > 80) {
+                       set_status_led(button, on_pattern);
+                               // acknowledge long press
+               }
+       } else if (cur && !prev) {            // --- just released ---
+               uint16_t duration = jiffies - button_start[button];
+
+               if (duration > 6 && duration < 30) {
+                       short_press(button);
+               } else if (duration > 80) {
+                       set_status_led(button, off_pattern);
+                       long_press(button);
+               }
+               // ignore other button-press durations
+       }
 }
 
 void timer_check_buttons()
 {
-       unsigned char pin = PINA;
-       unsigned char i;
-       unsigned char port_states[N_BUTTONS] = {
-               pin & _BV(PA3),
-               pin & _BV(PA4),
-       };
-
-       for (i = 0; i < N_BUTTONS; i++) {
-               if (!port_states[i]) { // is pressed
-                       if (i == 0 && just_waked_up)
-                               continue;
-                       if (button_pressed[i] == 0) {
-                               // begin of button press
-                               button_pressed[i] = 1;
-                               button_start[i] = jiffies;
-#if 0
-                               log_byte(0xC0);
-                               log_word(jiffies);
-#endif
-                       } else if (button_pressed[i] == 1) {
-                               // been already pressed
-                               uint16_t duration = jiffies - button_start[i];
-                               if (duration > 80) {
-                                       // long button press
-                                       button_pressed[i] = 2;
-                                       long_press(i);
-                               }
-                       }
-               } else { // is not pressed
-                       if (i == 0)
-                               just_waked_up = 0;
-                       if (button_pressed[i]) { // just depressed
-                               uint16_t duration = jiffies - button_start[i];
-#if 1
-                               log_byte(0xC1);
-                               log_word(duration);
-                               log_flush();
-#endif
-                               button_pressed[i] = 0;
-                               if (duration > 6 && duration < 30)
-                                       short_press(i);
-                       }
-               }
+       unsigned char pin = PINA & (_BV(PA3) | _BV(PA4));
+
+       handle_button(0, pin & _BV(PA3), prev_pin & _BV(PA3));
+       handle_button(1, pin & _BV(PA4), prev_pin & _BV(PA4));
+
+       prev_pin = pin;
+
+       if (user_params_state && jiffies - user_params_starttime > 1000) {
+               user_params_state = 0;
+               set_status_led(0, status_pattern_select(0));
+               set_status_led(1, status_pattern_select(1));
        }
 }