From 87b9093fd54402618c297aaacbfa68bad80302e9 Mon Sep 17 00:00:00 2001
From: "Jan \"Yenya\" Kasprzak" <kas@fi.muni.cz>
Date: Wed, 21 Nov 2012 17:06:20 +0100
Subject: [PATCH] firmware: button/status LEDs

(maybe the status led handling should be done in a separate module?)
---
 firmware/buttons.c | 78 ++++++++++++++++++++++++++++++----------------
 firmware/lights.h  |  2 +-
 firmware/pattern.c |  6 ++--
 3 files changed, 56 insertions(+), 30 deletions(-)

diff --git a/firmware/buttons.c b/firmware/buttons.c
index 467a09a..2419e89 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 off_pattern; // for now
+	}
+}
+
 static void toggle_bright_mode()
 {
 	// TODO
@@ -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;
 }
@@ -82,14 +106,13 @@ static inline void long_press(unsigned char button)
 	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);
 
@@ -98,46 +121,47 @@ void init_buttons()
 	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);
-	}
-}
-
 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 ---
-		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 (jiffies - user_params_starttime > 500) {
+		user_params_state = 0;
+		set_status_led(0, status_pattern_select(0));
+		set_status_led(1, status_pattern_select(1));
+	}
+}
+
diff --git a/firmware/lights.h b/firmware/lights.h
index eede4d1..2c1062c 100644
--- a/firmware/lights.h
+++ b/firmware/lights.h
@@ -71,7 +71,6 @@ extern pattern_t on_pattern[];
 
 void pattern_init();
 void patterns_next_tick();
-void led_set_status(unsigned char status);
 void led_set_pattern(unsigned char led, pattern_t *pattern);
 pattern_t *number_pattern(unsigned char num);
 
@@ -80,6 +79,7 @@ pattern_t *number_pattern(unsigned char num);
 void init_buttons();
 void timer_check_buttons();
 unsigned char get_user_param(unsigned char param);
+pattern_t *status_pattern_select(unsigned char n);
 
 /* battery.c */
 extern volatile unsigned char battery_100mv;
diff --git a/firmware/pattern.c b/firmware/pattern.c
index a11999d..55b1648 100644
--- a/firmware/pattern.c
+++ b/firmware/pattern.c
@@ -108,7 +108,7 @@ void pattern_init()
 	test_running = 0;
 }
 
-static pattern_t *number_pattern(unsigned char num)
+pattern_t *number_pattern(unsigned char num)
 {
 	if (num >= 9)
 		num = 9;
@@ -124,7 +124,9 @@ static inline pattern_t *pattern_select(unsigned char n)
 	else if (n == 2)
 		return mode1_pattern;
 	else if (n == 3)
-		return number_pattern(1+ambient_zone);
+		return status_pattern_select(0);
+	else if (n == 4)
+		return status_pattern_select(1);
 	return off_pattern;
 }
 
-- 
2.39.3