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

diff --git a/firmware/buttons.c b/firmware/buttons.c
index 9a4c7e1..467a09a 100644
--- a/firmware/buttons.c
+++ b/firmware/buttons.c
@@ -6,101 +6,138 @@
 #include "lights.h"
 
 static uint16_t button_start[N_BUTTONS];
-static unsigned char button_pressed[N_BUTTONS];
-static unsigned char just_waked_up;
+static unsigned char prev_pin;
 
-void init_buttons()
-{
-	unsigned char i;
+static unsigned char user_params[MAX_USER_PARAMS] = { 0, 0, 0 };
+static unsigned char user_params_max[MAX_USER_PARAMS] = { 3, 2, 2 };
 
-	DDRB &= ~(_BV(PB4) | _BV(PB6));
-	PORTB |=  _BV(PB4) | _BV(PB6);
+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
+	 *           the value of user_params[user_params_state-1]"
+	 */
 
-	for (i=0; i < N_BUTTONS; i++) {
-		button_start[i] = 0;
-		button_pressed[i] = 0;
-	}
+static uint16_t user_params_starttime;
 
-	just_waked_up = 1;
+static void toggle_bright_mode()
+{
+	// TODO
+}
+
+static void set_panic_mode()
+{
+	// TODO
+}
 
-	// log_byte(PORTB);
+unsigned char get_user_param(unsigned char param)
+{
+	if (param < MAX_USER_PARAMS)
+		return user_params[param];
+	return 0; // FIXME: internal error?
 }
 
-static void do_sleep()
+static inline void short_press(unsigned char button)
 {
-	log_byte(0xb0);
-	log_flush();
+	unsigned char param;
+
+	if (user_params_state == 0) {
+		if (button == 0)
+			toggle_bright_mode();
+		else
+			set_panic_mode();
+		return;
+	}
 
-	hw_suspend();
-	gpio_before_poweroff(); // Set the status LED on again
+	param = user_params_state-1;
 
-	while((PINB & _BV(PB6)) == 0)
-		; // wait for button release
+	if (button == 0) {
+		if (user_params[param])
+			user_params[param]--;
+		else
+			user_params[param] = user_params_max[param];
+	} else {
+		user_params[param]++;
 
-	_delay_ms(100);
+		if (user_params[param] >= user_params_max[param])
+			user_params[param] = 0;
+	}
+	// FIXME: notify somebody about user_params change?
 
-	susp_gpio(); // disable the status LED
+	// set_status_led(2, user_params[param]);
 
-	power_down();
+	user_params_starttime = jiffies;
 }
 
-static void inline long_press(unsigned char n)
+static inline void long_press(unsigned char button)
 {
-	if (n == 0)
-		do_sleep();
+	if (button == 0) {
+		power_down();
+		return;
+	}
+
+	// button 1 - cycle through states
+	user_params_state++;
+
+	if (user_params_state >= MAX_USER_PARAMS)
+		user_params_state = 1;
+
+	// set_status_led(1, state);
+	user_params_starttime = jiffies;
 }
 
-static void inline short_press(unsigned char n)
+void init_buttons()
 {
-	if (n == 0)
-		gpio_set(2,1);
+	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 pinb = PINB;
-	unsigned char i;
-	unsigned char port_states[N_BUTTONS] = {
-		pinb & _BV(PB6),
-		pinb & _BV(PB4),
-	};
-
-	for (i = 0; i < N_BUTTONS; i++) {
-		if (!port_states[i]) { // is pressed
-			if (i == 0 && just_waked_up)
-				continue;
-			if (button_pressed[i] == 0) {
-				// begin of button press
-				button_pressed[i] = 1;
-				button_start[i] = jiffies;
-#if 0
-				log_byte(0xC0);
-				log_word(jiffies);
-#endif
-			} else if (button_pressed[i] == 1) {
-				// been already pressed
-				uint16_t duration = jiffies - button_start[i];
-				if (duration > 80) {
-					// long button press
-					button_pressed[i] = 2;
-					long_press(i);
-				}
-			}
-		} else { // is not pressed
-			if (i == 0)
-				just_waked_up = 0;
-			if (button_pressed[i]) { // just depressed
-				uint16_t duration = jiffies - button_start[i];
-#if 1
-				log_byte(0xC1);
-				log_word(duration);
-				log_flush();
-#endif
-				button_pressed[i] = 0;
-				if (duration > 6 && duration < 30)
-					short_press(i);
-			}
+	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);
+
+	} else if (!cur && !prev) {           // --- is still pressed ---
+		uint16_t duration = jiffies - button_start[i];
+
+		if (duration > 80) {
+			// set_status_led(button, 1); // acknowledge long press
+		}
+	} else if (cur && !prev) {            // --- just released ---
+		uint16_t duration = jiffies - button_start[i];
+
+		if (duration > 6 && duration < 30)
+			short_press(button);
+		} else if (duration > 80) {
+			// set_status_led(button, 0);
+			long_press(button);
 		}
+		// ignore other button-press durations
 	}
 }