From 47e678a90062fa2dbc6cb8f9e5efc81072f5dcc5 Mon Sep 17 00:00:00 2001 From: "Jan \"Yenya\" Kasprzak" Date: Wed, 21 Nov 2012 16:05:37 +0100 Subject: [PATCH] firmware: buttons-press and pwrdown rework Reworked short and long button presses. The long press is now also reported only _after_ release, which allows us to simplify the power-down case in buttons.c, and even in main.c. --- firmware/buttons.c | 103 ++++++++++++++++----------------------------- firmware/lights.h | 2 - firmware/main.c | 6 +-- 3 files changed, 40 insertions(+), 71 deletions(-) diff --git a/firmware/buttons.c b/firmware/buttons.c index 17f4bff..467a09a 100644 --- a/firmware/buttons.c +++ b/firmware/buttons.c @@ -6,8 +6,7 @@ #include "lights.h" 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,8 +20,6 @@ static unsigned char user_params_state = 0; static uint16_t user_params_starttime; -static void do_sleep(); - static void toggle_bright_mode() { // TODO @@ -75,7 +72,7 @@ static inline void short_press(unsigned char button) static inline void long_press(unsigned char button) { if (button == 0) { - do_sleep(); + power_down(); return; } @@ -96,77 +93,51 @@ void init_buttons() DDRA &= ~(_BV(PA3) | _BV(PA4)); PORTA |= _BV(PA3) | _BV(PA4); - for (i=0; i < N_BUTTONS; i++) { - button_start[i] = 0; - button_pressed[i] = 0; - } - - just_waked_up = 1; + button_start[0] = 0; + button_start[1] = 0; + prev_pin = _BV(PA3) | _BV(PA4); } -static void do_sleep() +void timer_check_buttons() { - log_byte(0xb0); - log_flush(); - - hw_suspend(); - gpio_before_poweroff(); // Set the status LED on again - - while((PINA & _BV(PA3)) == 0) - ; // wait for button release + unsigned char pin = PINA & (_BV(PA3) | _BV(PA4)); - _delay_ms(100); + handle_button(0, pin & _BV(PA3), prev_pin & _BV(PA3)); + handle_button(1, pin & _BV(PA4), prev_pin & _BV(PA4)); - susp_gpio(); // disable the status LED + prev_pin = pin; - power_down(); + if (jiffies - user_params_starttime > 500) { + user_params_state = 0; + // set_status_led(0, idle); + // set_status_led(1, idle); + } } -void timer_check_buttons() +static void handle_button(unsigned char button, unsigned char cur, + unsigned char prev) { - 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); - } + // BEWARE: pins are at _zero_ when pressed! + if (!cur && prev) { // --- just pressed --- + button_start[i] = jiffies; + // set_status_led(button, 0); + + } else if (!cur && !prev) { // --- is still pressed --- + uint16_t duration = jiffies - button_start[i]; + + if (duration > 80) { + // set_status_led(button, 1); // acknowledge long press + } + } else if (cur && !prev) { // --- just released --- + uint16_t duration = jiffies - button_start[i]; + + if (duration > 6 && duration < 30) + short_press(button); + } else if (duration > 80) { + // set_status_led(button, 0); + long_press(button); } + // ignore other button-press durations } } diff --git a/firmware/lights.h b/firmware/lights.h index bb4bca7..d0eddd7 100644 --- a/firmware/lights.h +++ b/firmware/lights.h @@ -85,8 +85,6 @@ void battery_adc(); void init_battery(); /* main.c */ -void hw_setup(); -void hw_suspend(); void power_down(); #endif /* !LIGHTS_H__ */ diff --git a/firmware/main.c b/firmware/main.c index 25ea829..02e75d9 100644 --- a/firmware/main.c +++ b/firmware/main.c @@ -7,7 +7,7 @@ #include "lights.h" -void hw_setup() +static void hw_setup() { wdt_enable(WDTO_1S); init_battery(); @@ -24,7 +24,7 @@ void hw_setup() set_sleep_mode(SLEEP_MODE_IDLE); } -void hw_suspend() +static void hw_suspend() { susp_pwm(); susp_adc(); @@ -39,6 +39,7 @@ void power_down() uint16_t wake_count = 0; unsigned char btn; + hw_suspend(); sleep_again: // enable PCINT14, so that user can wake up later GIMSK |= _BV(PCIE1); @@ -92,7 +93,6 @@ int main(void) log_set_state(3); hw_setup(); - hw_suspend(); power_down(); sei(); -- 2.39.3