ambient zones adjusted

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

diff --git a/firmware/buttons.c b/firmware/buttons.c
index 0742f927fb668a17d83d4ca3698e475f5f5a89f5..2e80142b3be896c0bbf2ffa9961c1b2c48127a58 100644 (file)
--- a/firmware/buttons.c
+++ b/firmware/buttons.c
@@ -2,6 +2,7 @@
 #include <avr/interrupt.h>
 #include <avr/sleep.h>
 #include <util/delay.h>
+#include <stdlib.h> // for NULL
 
 #include "lights.h"
 
@@ -26,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 jiffies > 500 ? number_pattern(2) : zero_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)
@@ -68,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;
@@ -89,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;
 }
@@ -107,8 +108,8 @@ static inline void long_press(unsigned char button)
        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;
 }
 
@@ -132,8 +133,8 @@ 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);
+       GIMSK &= ~_BV(PCIE0);
+       GIMSK |= _BV(PCIE1);
 
        PCMSK0 = _BV(PCINT3) | _BV(PCINT4);
                // disable pin-change IRQs on all pins except PA3,PA4
@@ -146,22 +147,22 @@ 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);
+               if (duration > 160) {
+                       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 < 30) {
+               if (duration > 6 && duration < 60) {
                        short_press(button);
-               } else if (duration > 80) {
-                       set_status_led(button, off_pattern);
+               } else if (duration > 160) {
+                       set_status_led(button, NULL);
                        long_press(button);
                }
                // ignore other button-press durations
@@ -179,8 +180,8 @@ void timer_check_buttons()
 
        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());
        }
 }