firmware: control logic moved to a separate module

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

diff --git a/firmware/buttons.c b/firmware/buttons.c
index 2419e89e86dd83b2d1091094193e52dc797f0f78..c1a785d0492c93d9bf91fff728b7e646c3879d9b 100644 (file)
--- a/firmware/buttons.c
+++ b/firmware/buttons.c
@@ -2,9 +2,11 @@
 #include <avr/interrupt.h>
 #include <avr/sleep.h>
 #include <util/delay.h>
+#include <stdlib.h> // for NULL
 
 #include "lights.h"
 
+#define WAKEUP_LIMIT   5       // times 100 ms
 static uint16_t button_start[N_BUTTONS];
 static unsigned char prev_pin;
 
@@ -25,33 +27,33 @@ 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)
+unsigned char buttons_setup_in_progress()
 {
-       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 off_pattern; // for now
-       }
+       if (user_params_state // setup in progress ...
+               // or at least one button is pressed:
+               || !(prev_pin & _BV(PA3))
+               || !(prev_pin & _BV(PA4)))
+               return 1;
+       return 0;
 }
 
-static void toggle_bright_mode()
+pattern_t *buttons_setup_status0_pattern_select()
 {
-       // TODO
+       if (user_params_state) // Setup in progress
+               return number_pattern(user_params_state, 1);
+       else
+               return NULL;
 }
 
-static void set_panic_mode()
+pattern_t *buttons_setup_status1_pattern_select()
 {
-       // TODO
+       if (user_params_state) // Setup in progress
+               return number_pattern(
+                       1 + user_params[user_params_state-1],
+                       1
+               );
+       else
+               return NULL;
 }
 
 unsigned char get_user_param(unsigned char param)
@@ -67,7 +69,7 @@ static inline void short_press(unsigned char button)
 
        if (user_params_state == 0) {
                if (button == 0)
-                       toggle_bright_mode();
+                       toggle_dim_mode();
                else
                        set_panic_mode();
                return;
@@ -79,7 +81,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]++;
 
@@ -88,7 +90,7 @@ static inline void short_press(unsigned char button)
        }
        // FIXME: notify somebody about user_params change?
 
-       set_status_led(1, status_pattern_select(1));
+       set_status_led(1, buttons_setup_status1_pattern_select());
 
        user_params_starttime = jiffies;
 }
@@ -103,22 +105,40 @@ static inline void long_press(unsigned char button)
        // 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(0, status_pattern_select(0));
-       set_status_led(1, status_pattern_select(1));
+       set_status_led(0, buttons_setup_status0_pattern_select());
+       set_status_led(1, buttons_setup_status1_pattern_select());
        user_params_starttime = jiffies;
 }
 
 void init_buttons()
 {
-       DDRA &= ~(_BV(PA3) | _BV(PA4));
-       PORTA |=  _BV(PA3) | _BV(PA4);
+       DDRA &= ~(_BV(PA3) | _BV(PA4)); // set as input
+       PORTA |=  _BV(PA3) | _BV(PA4);  // enable internal pull-ups
+
+       GIMSK &= ~(_BV(PCIE0) | _BV(PCIE1)); // disable pin-change IRQs
+       PCMSK0 = 0; // disable pin-change IRQs on all pins of port A
+       PCMSK1 = 0; // disable pin-change IRQs on all pins of port B
 
        button_start[0] = 0;
        button_start[1] = 0;
        prev_pin = _BV(PA3) | _BV(PA4);
+       user_params_state = 0;
+}
+
+void susp_buttons()
+{
+       DDRA &= ~(_BV(PA3) | _BV(PA4)); // set as input
+       PORTA |=  _BV(PA3) | _BV(PA4);  // enable internal pull-ups
+
+       GIMSK &= ~_BV(PCIE1); // disable pin-change IRQ on port B
+       GIMSK |= _BV(PCIE0);
+
+       PCMSK0 = _BV(PCINT3) | _BV(PCINT4);
+               // disable pin-change IRQs on all pins except PA3,PA4
+       PCMSK1 = 0; // disable pin-change IRQs on all pins of port B
 }
 
 static void handle_button(unsigned char button, unsigned char cur,
@@ -127,13 +147,13 @@ static void handle_button(unsigned char button, unsigned char cur,
        // BEWARE: pins are at _zero_ when pressed!
        if (!cur && prev) {                   // --- just pressed ---
                button_start[button] = jiffies;
-               set_status_led(button, off_pattern);
+               set_status_led(button, NULL);
 
        } else if (!cur && !prev) {           // --- is still pressed ---
                uint16_t duration = jiffies - button_start[button];
 
                if (duration > 80) {
-                       set_status_led(button, on_pattern);
+                       set_status_led(button, on1_pattern);
                                // acknowledge long press
                }
        } else if (cur && !prev) {            // --- just released ---
@@ -142,7 +162,7 @@ static void handle_button(unsigned char button, unsigned char cur,
                if (duration > 6 && duration < 30) {
                        short_press(button);
                } else if (duration > 80) {
-                       set_status_led(button, off_pattern);
+                       set_status_led(button, NULL);
                        long_press(button);
                }
                // ignore other button-press durations
@@ -158,10 +178,35 @@ void timer_check_buttons()
 
        prev_pin = pin;
 
-       if (jiffies - user_params_starttime > 500) {
+       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));
+               set_status_led(0, buttons_setup_status0_pattern_select());
+               set_status_led(1, buttons_setup_status1_pattern_select());
        }
 }
 
+unsigned char buttons_wait_for_release()
+{
+       uint16_t wake_count = 0;
+       unsigned char pin;
+
+       do {
+               if (wake_count++ > WAKEUP_LIMIT)
+                       gpio_set(0, 1); // inform the user
+
+               _delay_ms(100);
+
+               pin = PINA & (_BV(PA3) | _BV(PA4));
+       } while (!(pin & _BV(PA3)) || !(pin & _BV(PA4)));
+
+       gpio_set(0, 0);
+
+       return wake_count > WAKEUP_LIMIT;
+
+}
+
+ISR(PCINT_vect)
+{
+       // empty - let it wake us from sleep, but do nothing else
+}
+