X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=firmware%2Fbuttons.c;h=2e80142b3be896c0bbf2ffa9961c1b2c48127a58;hb=9e483c6969d2cdce60f6dcc3d167fec889a48993;hp=17f4bffad9f70e671994e30582616adb309aaa23;hpb=ed608010c0a708b9be0d3577d7f4d3313eb2e851;p=bike-lights.git diff --git a/firmware/buttons.c b/firmware/buttons.c index 17f4bff..2e80142 100644 --- a/firmware/buttons.c +++ b/firmware/buttons.c @@ -2,12 +2,13 @@ #include #include #include +#include // for NULL #include "lights.h" +#define WAKEUP_LIMIT 5 // times 100 ms 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,16 +22,38 @@ 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); +} -static void toggle_bright_mode() +unsigned char buttons_setup_in_progress() { - // TODO + 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 set_panic_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; +} + +pattern_t *buttons_setup_status1_pattern_select() +{ + 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) @@ -46,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; @@ -58,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]++; @@ -67,7 +90,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, buttons_setup_status1_pattern_select()); user_params_starttime = jiffies; } @@ -75,98 +98,115 @@ 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, buttons_setup_status0_pattern_select()); + set_status_led(1, buttons_setup_status1_pattern_select()); user_params_starttime = jiffies; } void init_buttons() { - unsigned char i; - - 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 - for (i=0; i < N_BUTTONS; i++) { - button_start[i] = 0; - button_pressed[i] = 0; - } + 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 - 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() +void susp_buttons() { - log_byte(0xb0); - log_flush(); + DDRA &= ~(_BV(PA3) | _BV(PA4)); // set as input + PORTA |= _BV(PA3) | _BV(PA4); // enable internal pull-ups - hw_suspend(); - gpio_before_poweroff(); // Set the status LED on again + GIMSK &= ~_BV(PCIE0); + GIMSK |= _BV(PCIE1); - while((PINA & _BV(PA3)) == 0) - ; // wait for button release + 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 +} - _delay_ms(100); +static void handle_button(unsigned char button, unsigned char cur, + unsigned char prev) +{ + // BEWARE: pins are at _zero_ when pressed! + if (!cur && prev) { // --- just pressed --- + button_start[button] = jiffies; + set_status_led(button, NULL); - susp_gpio(); // disable the status LED + } else if (!cur && !prev) { // --- is still pressed --- + uint16_t duration = jiffies - button_start[button]; - power_down(); + 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 < 60) { + short_press(button); + } else if (duration > 160) { + set_status_led(button, NULL); + 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, 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 +} +