X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?p=bike-lights.git;a=blobdiff_plain;f=firmware%2Fbuttons.c;h=c1a785d0492c93d9bf91fff728b7e646c3879d9b;hp=467a09ab84f54f910ebba3adb32007c16beb23c3;hb=647f353f4d8c87c5cf18cae905e9d600cd0e6bcb;hpb=47e678a90062fa2dbc6cb8f9e5efc81072f5dcc5 diff --git a/firmware/buttons.c b/firmware/buttons.c index 467a09a..c1a785d 100644 --- a/firmware/buttons.c +++ b/firmware/buttons.c @@ -2,9 +2,11 @@ #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 prev_pin; @@ -20,14 +22,38 @@ static unsigned char user_params_state = 0; static uint16_t user_params_starttime; -static void toggle_bright_mode() +static void inline set_status_led(unsigned char n, pattern_t *pattern) { - // TODO + led_set_pattern(n + N_PWMLEDS, pattern); } -static void set_panic_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; +} + +pattern_t *buttons_setup_status0_pattern_select() +{ + 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) @@ -43,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; @@ -55,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]++; @@ -64,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; } @@ -79,39 +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(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)); // set as input + PORTA |= _BV(PA3) | _BV(PA4); // enable internal pull-ups - DDRA &= ~(_BV(PA3) | _BV(PA4)); - PORTA |= _BV(PA3) | _BV(PA4); + 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 timer_check_buttons() +void susp_buttons() { - 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)); + DDRA &= ~(_BV(PA3) | _BV(PA4)); // set as input + PORTA |= _BV(PA3) | _BV(PA4); // enable internal pull-ups - prev_pin = pin; + GIMSK &= ~_BV(PCIE1); // disable pin-change IRQ on port B + GIMSK |= _BV(PCIE0); - if (jiffies - user_params_starttime > 500) { - user_params_state = 0; - // set_status_led(0, idle); - // set_status_led(1, idle); - } + 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, @@ -119,25 +146,67 @@ static void handle_button(unsigned char button, unsigned char cur, { // BEWARE: pins are at _zero_ when pressed! if (!cur && prev) { // --- just pressed --- - button_start[i] = jiffies; - // set_status_led(button, 0); + button_start[button] = jiffies; + set_status_led(button, NULL); } else if (!cur && !prev) { // --- is still pressed --- - uint16_t duration = jiffies - button_start[i]; + uint16_t duration = jiffies - button_start[button]; if (duration > 80) { - // set_status_led(button, 1); // acknowledge long press + set_status_led(button, on1_pattern); + // acknowledge long press } } else if (cur && !prev) { // --- just released --- - uint16_t duration = jiffies - button_start[i]; + uint16_t duration = jiffies - button_start[button]; - if (duration > 6 && duration < 30) + if (duration > 6 && duration < 30) { short_press(button); } else if (duration > 80) { - // set_status_led(button, 0); + set_status_led(button, NULL); long_press(button); } // ignore other button-press durations } } +void timer_check_buttons() +{ + 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 +} +