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=80ecce603c65503ad940ad05b6edab7b98bb099e;hp=2e80142b3be896c0bbf2ffa9961c1b2c48127a58;hb=90ffd122f4387d18e8d7cf7d2a507c719409d4e5;hpb=cb10e19fb7311df4c3c14b64064c3d9a44fdacd1 diff --git a/firmware/buttons.c b/firmware/buttons.c index 2e80142..80ecce6 100644 --- a/firmware/buttons.c +++ b/firmware/buttons.c @@ -7,8 +7,21 @@ #include "lights.h" #define WAKEUP_LIMIT 5 // times 100 ms -static uint16_t button_start[N_BUTTONS]; -static unsigned char prev_pin; +#define SHORT_PRESS_MIN 2 // in jiffies (16 Hz ticks) +#define SHORT_PRESS_MAX 5 +#define LONG_PRESS_MIN 10 + +static uint16_t button_start[3]; +union { + unsigned char all; + struct { + unsigned char btn1 : 1; + unsigned char btn2 : 1; + unsigned char brake : 1; + unsigned char brake_working : 1; + unsigned char brake_reported : 1; + }; +} button_state, prev_state; static unsigned char user_params[MAX_USER_PARAMS] = { 0, 0, 0 }; static unsigned char user_params_max[MAX_USER_PARAMS] = { 3, 2, 2 }; @@ -31,8 +44,8 @@ unsigned char buttons_setup_in_progress() { if (user_params_state // setup in progress ... // or at least one button is pressed: - || !(prev_pin & _BV(PA3)) - || !(prev_pin & _BV(PA4))) + || prev_state.btn1 + || prev_state.btn2) return 1; return 0; } @@ -115,8 +128,10 @@ static inline void long_press(unsigned char button) void init_buttons() { - DDRA &= ~(_BV(PA3) | _BV(PA4)); // set as input - PORTA |= _BV(PA3) | _BV(PA4); // enable internal pull-ups + DDRA &= ~_BV(PA4); // set as input + DDRA |= _BV(PA3); // output + PORTA &= ~(_BV(PA3) | _BV(PA4)); // PA4 disable internal pull-up + // PA3 set to zero GIMSK &= ~(_BV(PCIE0) | _BV(PCIE1)); // disable pin-change IRQs PCMSK0 = 0; // disable pin-change IRQs on all pins of port A @@ -124,44 +139,47 @@ void init_buttons() button_start[0] = 0; button_start[1] = 0; - prev_pin = _BV(PA3) | _BV(PA4); + button_start[2] = 0; + + prev_state.all = 0; + button_state.all = 0; user_params_state = 0; } void susp_buttons() { DDRA &= ~(_BV(PA3) | _BV(PA4)); // set as input - PORTA |= _BV(PA3) | _BV(PA4); // enable internal pull-ups + PORTA |= _BV(PA4); // enable internal pull-up + PORTA &= ~_BV(PA3); // disable pull-up GIMSK &= ~_BV(PCIE0); GIMSK |= _BV(PCIE1); - PCMSK0 = _BV(PCINT3) | _BV(PCINT4); - // disable pin-change IRQs on all pins except PA3,PA4 + PCMSK0 = _BV(PCINT4); + // disable pin-change IRQs on all pins except PA4 PCMSK1 = 0; // disable pin-change IRQs on all pins of port B } 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 --- + if (cur && !prev) { // --- just pressed --- button_start[button] = jiffies; set_status_led(button, NULL); - } else if (!cur && !prev) { // --- is still pressed --- + } else if (cur && prev) { // --- is still pressed --- uint16_t duration = jiffies - button_start[button]; - if (duration > 160) { + if (duration >= LONG_PRESS_MIN) { set_status_led(button, on1_pattern); // acknowledge long press } - } else if (cur && !prev) { // --- just released --- + } else if (!cur && prev) { // --- just released --- uint16_t duration = jiffies - button_start[button]; - if (duration > 6 && duration < 60) { + if (duration >= SHORT_PRESS_MIN && duration < SHORT_PRESS_MAX) { short_press(button); - } else if (duration > 160) { + } else if (duration > LONG_PRESS_MIN) { set_status_led(button, NULL); long_press(button); } @@ -169,14 +187,46 @@ static void handle_button(unsigned char button, unsigned char cur, } } -void timer_check_buttons() +static void handle_brake(unsigned char cur, unsigned char prev) { - unsigned char pin = PINA & (_BV(PA3) | _BV(PA4)); + if (cur && !prev) { // --- just pressed --- + button_start[2] = jiffies; + } else if (!cur && prev) { // --- just released --- + button_start[2] = jiffies; + } else { // --- no change --- + uint16_t duration = jiffies - button_start[2]; + + if (duration > 6) { + if (cur) { + if (button_state.brake_working + && !button_state.brake_reported) { + button_state.brake_reported = 1; + brake_on(); + } + } else { + button_state.brake_working = 1; + if (button_state.brake_reported) { + button_state.brake_reported = 0; + brake_off(); + } + } + button_start[2] = jiffies - 7; // avoid overflow + } + } +} - handle_button(0, pin & _BV(PA3), prev_pin & _BV(PA3)); - handle_button(1, pin & _BV(PA4), prev_pin & _BV(PA4)); +void timer_check_buttons() +{ + handle_button(0, button_state.btn1, prev_state.btn1); - prev_pin = pin; + // when button 1 is on, all other states are unreadable + if (button_state.btn1) { + prev_state.btn1 = button_state.btn1; + } else { + handle_button(1, button_state.btn2, prev_state.btn2); + handle_brake(button_state.brake, prev_state.brake); + prev_state.all = button_state.all; + } if (user_params_state && jiffies - user_params_starttime > 1000) { user_params_state = 0; @@ -196,13 +246,47 @@ unsigned char buttons_wait_for_release() _delay_ms(100); - pin = PINA & (_BV(PA3) | _BV(PA4)); - } while (!(pin & _BV(PA3)) || !(pin & _BV(PA4))); + pin = PINA & _BV(PA4); + } while (!(pin & _BV(PA4))); gpio_set(0, 0); return wake_count > WAKEUP_LIMIT; +} + +void button_adc(uint16_t adcval) +{ +#if 0 + static unsigned char count=250; +#endif + PORTA &= ~_BV(PA3); // disable +5V to the hall probe + // adc.c will re-enable it again + + button_state.btn1 = 0; + button_state.btn2 = 0; + button_state.brake = 0; + + if (adcval == 0x3FF) { + button_state.brake = 1; + } else if (adcval > 0x240) { + button_state.brake = 1; + button_state.btn2 = 1; + } else if (adcval > 0x180) { + // nothing + } else if (adcval > 0xc0) { + button_state.btn2 = 1; + } else { + button_state.btn1 = 1; + } + +#if 0 + if (--count) + return; + count = 250; + log_word(adcval); + log_flush(); +#endif } ISR(PCINT_vect)