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=4f7a5ceb184f2d804c50ac76c74e547ca6bbd556;hp=017a56c6560632fa2a1afe5280fdb966dab05a1f;hb=b2a7818a12aab1915c19ae65af12b2f16c2f4da6;hpb=cadcc858f6c65c9fd7a18fb8309f7305ec6adb28 diff --git a/firmware/buttons.c b/firmware/buttons.c index 017a56c..4f7a5ce 100644 --- a/firmware/buttons.c +++ b/firmware/buttons.c @@ -7,6 +7,12 @@ #include "lights.h" #define WAKEUP_LIMIT 5 // times 100 ms +#define SHORT_PRESS_MIN 2 // in jiffies (16 Hz ticks) +#define SHORT_PRESS_MAX 5 +#define LONG_PRESS_MIN 10 +#define SETUP_TIMEOUT 255 // 15 seconds in jiffies +// #define USER_PARAMS_WRAPPING 1 + static uint16_t button_start[3]; union { unsigned char all; @@ -19,34 +25,59 @@ union { }; } 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 }; +/* + * How does the user_params setup mode work: + * + * There is an array of user-settable parameters user_params[N_USER_PARAMS], + * each of which has its own maximum value (user_params_max[N_USER_PARAMS]. + * These parameters can be modified in the following way: + * + * Long press of button 1 enters the setup mode. + * In the setup mode, status and illumination LEDs both blink in inversion + * number mode. + * The # of blinks of the illumination LED shows which user_param is + * being modified now, + * and the # of blinks of the status LED shows the value of this particular + * user_param. + * + * Long press of button 1 selects the next user_param, + * short press of button 0 decrements this particular user_param value, + * short press of button 1 increments this particular user_param value. + * + * If USER_PARAMS_WRAPPING is #defined, decrementing the zero leads to + * the maximum value - 1, and incrementing the maximum value - 1 leads + * to zero. + * + * After the SETUP_TIMEOUT with no button press, the system leaves the setup + * mode. + */ +static unsigned char user_params[N_USER_PARAMS] = { 0, 0, 0 }; +static unsigned char user_params_max[N_USER_PARAMS] = { + N_AMBIENT_ZONES+1, 2, 2 +}; static unsigned char user_params_state = 0; /* * Here 0 means "no setup currently in progress", - * 1 .. MAX_USER_PARAMS means "now short presses increase or decrease + * 1 .. N_USER_PARAMS means "now short presses increase or decrease * the value of user_params[user_params_state-1]" */ -static uint16_t user_params_starttime; +static unsigned char user_params_timeout; static void inline set_status_led(unsigned char n, pattern_t *pattern) { - led_set_pattern(n + N_PWMLEDS, pattern); + led_set_pattern(n + 1, pattern); } unsigned char buttons_setup_in_progress() { - if (user_params_state // setup in progress ... - // or at least one button is pressed: - || prev_state.btn1 - || prev_state.btn2) + if (user_params_state) // setup in progress ... return 1; return 0; } -pattern_t *buttons_setup_status0_pattern_select() +pattern_t *buttons_setup_status1_pattern_select() { if (user_params_state) // Setup in progress return number_pattern(user_params_state, 1); @@ -54,7 +85,7 @@ pattern_t *buttons_setup_status0_pattern_select() return NULL; } -pattern_t *buttons_setup_status1_pattern_select() +pattern_t *buttons_setup_status0_pattern_select() { if (user_params_state) // Setup in progress return number_pattern( @@ -67,7 +98,7 @@ pattern_t *buttons_setup_status1_pattern_select() unsigned char get_user_param(unsigned char param) { - if (param < MAX_USER_PARAMS) + if (param < N_USER_PARAMS) return user_params[param]; return 0; // FIXME: internal error? } @@ -88,38 +119,44 @@ static inline void short_press(unsigned char button) if (button == 0) { if (user_params[param]) - user_params[param]--; + --user_params[param]; +#if SETUP_VALUES_WRAPPING else user_params[param] = user_params_max[param]-1; +#endif } else { - user_params[param]++; + ++user_params[param]; if (user_params[param] >= user_params_max[param]) +#if SETUP_VALUES_WRAPPING user_params[param] = 0; +#else + user_params[param] = user_params_max[param]-1; +#endif } // FIXME: notify somebody about user_params change? set_status_led(1, buttons_setup_status1_pattern_select()); - user_params_starttime = jiffies; + user_params_timeout = SETUP_TIMEOUT; } static inline void long_press(unsigned char button) { if (button == 0) { - power_down(); + power_down(0); return; } // button 1 - cycle through states user_params_state++; - if (user_params_state > MAX_USER_PARAMS) + if (user_params_state > N_USER_PARAMS) user_params_state = 1; set_status_led(0, buttons_setup_status0_pattern_select()); set_status_led(1, buttons_setup_status1_pattern_select()); - user_params_starttime = jiffies; + user_params_timeout = SETUP_TIMEOUT; } void init_buttons() @@ -161,21 +198,22 @@ static void handle_button(unsigned char button, unsigned char cur, { if (cur && !prev) { // --- just pressed --- button_start[button] = jiffies; - set_status_led(button, NULL); + if (!user_params_state) + set_status_led(button, NULL); } else if (cur && prev) { // --- is still pressed --- uint16_t duration = jiffies - button_start[button]; - if (duration > 160) { - set_status_led(button, on1_pattern); + if (duration >= LONG_PRESS_MIN) { + set_status_led(button, on_pattern); // acknowledge long press } } 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); } @@ -185,30 +223,47 @@ static void handle_button(unsigned char button, unsigned char cur, static void handle_brake(unsigned char cur, unsigned char prev) { + uint16_t duration; + if (cur && !prev) { // --- just pressed --- button_start[2] = jiffies; + return; } 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; + return; + } + // --- no change --- + duration = jiffies - button_start[2]; + + if (duration == 0) // at least two jiffies + return; + + if (cur) { + if (button_state.brake_working) { + static unsigned int brake_time; + if (button_state.brake_reported) { + if (brake_time) { + brake_time--; + } else { brake_off(); + button_state.brake_working = 0; + button_state.brake_reported = 0; } + } else { + button_state.brake_reported = 1; + brake_on(); + brake_time = 255; // avoid longer than ~16s } - button_start[2] = jiffies - 7; // avoid overflow + } + } 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 } void timer_check_buttons() @@ -224,7 +279,10 @@ void timer_check_buttons() prev_state.all = button_state.all; } - if (user_params_state && jiffies - user_params_starttime > 1000) { + if (user_params_timeout) + --user_params_timeout; + + if (user_params_state && !user_params_timeout) { user_params_state = 0; set_status_led(0, buttons_setup_status0_pattern_select()); set_status_led(1, buttons_setup_status1_pattern_select());