]> www.fi.muni.cz Git - bike-lights.git/commitdiff
buttons.c: param setup fixes
authorJan "Yenya" Kasprzak <kas@fi.muni.cz>
Wed, 21 Nov 2012 23:58:01 +0000 (00:58 +0100)
committerJan "Yenya" Kasprzak <kas@fi.muni.cz>
Wed, 21 Nov 2012 23:58:01 +0000 (00:58 +0100)
firmware/buttons.c

index aa350266ba0f1b4720b6e025a50e55ce1528cfd3..679d958cbec7e1585ae0e661a0140a740d0f3370 100644 (file)
@@ -79,7 +79,7 @@ static inline void short_press(unsigned char button)
                if (user_params[param])
                        user_params[param]--;
                else
                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]++;
 
        } else {
                user_params[param]++;
 
@@ -103,7 +103,7 @@ static inline void long_press(unsigned char button)
        // button 1 - cycle through states
        user_params_state++;
 
        // 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(0, status_pattern_select(0));
                user_params_state = 1;
 
        set_status_led(0, status_pattern_select(0));
@@ -159,7 +159,7 @@ void timer_check_buttons()
 
        prev_pin = pin;
 
 
        prev_pin = pin;
 
-       if (user_params_state && jiffies - user_params_starttime > 500) {
+       if (user_params_state && jiffies - user_params_starttime > 1000) {
                user_params_state = 0;
                set_status_led(0, status_pattern_select(0));
                set_status_led(1, status_pattern_select(1));
                user_params_state = 0;
                set_status_led(0, status_pattern_select(0));
                set_status_led(1, status_pattern_select(1));