X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=firmware%2Fbuttons.c;h=679d958cbec7e1585ae0e661a0140a740d0f3370;hb=68424ad19806bd6f0b857e878bf632cf5851e7c5;hp=467a09ab84f54f910ebba3adb32007c16beb23c3;hpb=47e678a90062fa2dbc6cb8f9e5efc81072f5dcc5;p=bike-lights.git

diff --git a/firmware/buttons.c b/firmware/buttons.c
index 467a09a..679d958 100644
--- a/firmware/buttons.c
+++ b/firmware/buttons.c
@@ -20,6 +20,30 @@ static unsigned char user_params_state = 0;
 
 static uint16_t user_params_starttime;
 
+static void inline set_status_led(unsigned char n, pattern_t *pattern)
+{
+	led_set_pattern(n + N_PWMLEDS, pattern);
+}
+
+pattern_t *status_pattern_select(unsigned char n)
+{
+	if (user_params_state) // Setup in progress
+		return number_pattern(n == 0
+			? user_params_state
+			: 1 + user_params[user_params_state-1]
+		);
+	else if (!(prev_pin & _BV(PA3)) || !(prev_pin & _BV(PA4)))
+		// at least one button is pressed
+		return off_pattern;
+	// otherwise, an ordinary state
+	if (n == 0) {
+		// error led
+		return number_pattern(1 + ambient_zone);
+	} else {
+		return jiffies > 500 ? number_pattern(2) : zero_pattern; // for now
+	}
+}
+
 static void toggle_bright_mode()
 {
 	// TODO
@@ -55,7 +79,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 +88,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, status_pattern_select(1));
 
 	user_params_starttime = jiffies;
 }
@@ -79,39 +103,23 @@ 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, status_pattern_select(0));
+	set_status_led(1, status_pattern_select(1));
 	user_params_starttime = jiffies;
 }
 
 void init_buttons()
 {
-	unsigned char i;
-
 	DDRA &= ~(_BV(PA3) | _BV(PA4));
 	PORTA |=  _BV(PA3) | _BV(PA4);
 
 	button_start[0] = 0;
 	button_start[1] = 0;
 	prev_pin = _BV(PA3) | _BV(PA4);
-}
-
-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 (jiffies - user_params_starttime > 500) {
-		user_params_state = 0;
-		// set_status_led(0, idle);
-		// set_status_led(1, idle);
-	}
+	user_params_state = 0;
 }
 
 static void handle_button(unsigned char button, unsigned char cur,
@@ -119,25 +127,42 @@ 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, off_pattern);
 
 	} 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, on_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, off_pattern);
 			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, status_pattern_select(0));
+		set_status_led(1, status_pattern_select(1));
+	}
+}
+