PWM LEDs driven by a single pattern

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

diff --git a/firmware/buttons.c b/firmware/buttons.c
index be3a86581f477f825cbbaaa9728bcc0bdc282cdb..ac41c06879b46a01c2cbae7ef19a321b271332a2 100644 (file)
--- a/firmware/buttons.c
+++ b/firmware/buttons.c
@@ -7,6 +7,10 @@
 #include "lights.h"
 
 #define WAKEUP_LIMIT   5       // times 100 ms
+#define SHORT_PRESS_MIN 2       // in jiffies (16 Hz ticks)
+#define SHORT_PRESS_MAX 5
+#define LONG_PRESS_MIN  10
+
 static uint16_t button_start[3];
 union {
        unsigned char all;
@@ -14,6 +18,8 @@ union {
                unsigned char btn1 : 1;
                unsigned char btn2 : 1;
                unsigned char brake : 1;
+               unsigned char brake_working : 1;
+               unsigned char brake_reported : 1;
        };
 } button_state, prev_state;
 
@@ -31,7 +37,7 @@ static uint16_t user_params_starttime;
 
 static void inline set_status_led(unsigned char n, pattern_t *pattern)
 {
-       led_set_pattern(n + N_PWMLEDS, pattern);
+       led_set_pattern(n + 1, pattern);
 }
 
 unsigned char buttons_setup_in_progress()
@@ -105,7 +111,7 @@ static inline void short_press(unsigned char button)
 static inline void long_press(unsigned char button)
 {
        if (button == 0) {
-               power_down();
+               power_down(0);
                return;
        }
 
@@ -164,16 +170,16 @@ static void handle_button(unsigned char button, unsigned char cur,
        } else if (cur && prev) {           // --- is still pressed ---
                uint16_t duration = jiffies - button_start[button];
 
-               if (duration > 160) {
+               if (duration >= LONG_PRESS_MIN) {
                        set_status_led(button, on1_pattern);
                                // acknowledge long press
                }
        } else if (!cur && prev) {            // --- just released ---
                uint16_t duration = jiffies - button_start[button];
 
-               if (duration > 6 && duration < 60) {
+               if (duration >= SHORT_PRESS_MIN && duration < SHORT_PRESS_MAX) {
                        short_press(button);
-               } else if (duration > 160) {
+               } else if (duration > LONG_PRESS_MIN) {
                        set_status_led(button, NULL);
                        long_press(button);
                }
@@ -183,27 +189,61 @@ static void handle_button(unsigned char button, unsigned char cur,
 
 static void handle_brake(unsigned char cur, unsigned char prev)
 {
+       uint16_t duration;
+
        if (cur && !prev) {                   // --- just pressed ---
                button_start[2] = jiffies;
-       } else if (cur && prev) {           // --- is still pressed ---
-               uint16_t duration = jiffies - button_start[2];
+               return;
+       } else if (!cur && prev) {            // --- just released ---
+               button_start[2] = jiffies;
+               return;
+       }
+                                             // --- no change ---
+       duration = jiffies - button_start[2];
 
-               if (duration > 6) {
-                       brake_on();
-                       button_start[2] = jiffies - 7; // avoid overflow
+       if (duration <= 3)
+               return;
+
+       if (cur) {
+               if (button_state.brake_working) {
+                       static unsigned int brake_time;
+                       if (button_state.brake_reported) {
+                               if (brake_time) {
+                                       brake_time--;
+                               } else {
+                                       brake_off();
+                                       button_state.brake_working = 0;
+                                       button_state.brake_reported = 0;
+                               }
+                       } else {
+                               button_state.brake_reported = 1;
+                               brake_on();
+                               brake_time = 255; // avoid longer than ~16s
+                       }
+               }
+       } else {
+               button_state.brake_working = 1;
+               if (button_state.brake_reported) {
+                       button_state.brake_reported = 0;
+                       brake_off();
                }
-       } else if (!cur && prev) {            // --- just released ---
-               brake_off();
        }
+
+       button_start[2] = jiffies - 7; // avoid overflow
 }
 
 void timer_check_buttons()
 {
        handle_button(0, button_state.btn1, prev_state.btn1);
-       handle_button(1, button_state.btn2, prev_state.btn2);
-       handle_brake(button_state.brake, prev_state.brake);
 
-       prev_state.all = button_state.all;
+       // when button 1 is on, all other states are unreadable
+       if (button_state.btn1) {
+               prev_state.btn1 = button_state.btn1;
+       } else {
+               handle_button(1, button_state.btn2, prev_state.btn2);
+               handle_brake(button_state.brake, prev_state.brake);
+               prev_state.all = button_state.all;
+       }
 
        if (user_params_state && jiffies - user_params_starttime > 1000) {
                user_params_state = 0;
@@ -239,7 +279,10 @@ void button_adc(uint16_t adcval)
        PORTA &= ~_BV(PA3); // disable +5V to the hall probe
                // adc.c will re-enable it again
 
-       button_state.all = 0;
+       button_state.btn1 = 0;
+       button_state.btn2 = 0;
+       button_state.brake = 0;
+
        if (adcval == 0x3FF) {
                button_state.brake = 1;
        } else if (adcval > 0x240) {