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=d5a18bec515ba2d7f3f17d645b923ffebe2e823b;hpb=f956c1fa7f47b0e8b8afe323c2eff1b6c2607c2a;p=bike-lights.git

diff --git a/firmware/buttons.c b/firmware/buttons.c
index d5a18be..467a09a 100644
--- a/firmware/buttons.c
+++ b/firmware/buttons.c
@@ -1,104 +1,143 @@
 #include <avr/io.h>
 #include <avr/interrupt.h>
 #include <avr/sleep.h>
+#include <util/delay.h>
 
 #include "lights.h"
 
 static uint16_t button_start[N_BUTTONS];
-static unsigned char button_pressed[N_BUTTONS];
+static unsigned char prev_pin;
 
-static unsigned char sleep_after_release;
+static unsigned char user_params[MAX_USER_PARAMS] = { 0, 0, 0 };
+static unsigned char user_params_max[MAX_USER_PARAMS] = { 3, 2, 2 };
 
-void init_buttons()
+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]"
+	 */
+
+static uint16_t user_params_starttime;
+
+static void toggle_bright_mode()
 {
-	DDRB &= ~(_BV(PB6) | _BV(PB0));
-	PORTB |= _BV(PB6) | _BV(PB0);
+	// TODO
+}
 
-	sleep_after_release = 0;
-	// log_byte(PORTB);
+static void set_panic_mode()
+{
+	// TODO
 }
 
-static void inline long_press(unsigned char n)
+unsigned char get_user_param(unsigned char param)
 {
-	sleep_after_release = 1;
-	gpio_set(1, 1);
+	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)
 {
-	// led_set_status(2);
-	// MCUCR |= _BV(ISC00); // any edge generates IRQ
-	log_byte(0xb0);
-	log_flush();
-	set_sleep_mode(SLEEP_MODE_PWR_DOWN);
-	PORTA = 0;
-	PORTB = 0;
-	DDRA = 0;
-	DDRB = 0;
-	GIMSK |= _BV(INT0); // enable INT0
-	sleep_enable();
-	sei();
-	sleep_cpu();
-	sleep_disable();
-	cli();
-	GIMSK &= ~_BV(INT0); // disable INT0
-	hw_setup();
+	unsigned char param;
+
+	if (user_params_state == 0) {
+		if (button == 0)
+			toggle_bright_mode();
+		else
+			set_panic_mode();
+		return;
+	}
+
+	param = user_params_state-1;
+
+	if (button == 0) {
+		if (user_params[param])
+			user_params[param]--;
+		else
+			user_params[param] = user_params_max[param];
+	} else {
+		user_params[param]++;
+
+		if (user_params[param] >= user_params_max[param])
+			user_params[param] = 0;
+	}
+	// FIXME: notify somebody about user_params change?
+
+	// set_status_led(2, user_params[param]);
+
+	user_params_starttime = jiffies;
 }
 
-static void inline short_press(unsigned char n)
+static inline void long_press(unsigned char button)
 {
-	led_set_status(1);
+	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;
 }
 
-void timer_check_buttons()
+void init_buttons()
 {
-	unsigned char pinb = PINB;
 	unsigned char i;
-	unsigned char port_states[N_BUTTONS] = {
-		pinb & _BV(PB6),
-		pinb & _BV(PB0),
-	};
-	for (i = 0; i < N_BUTTONS; i++) {
-		if (!port_states[i]) { // is pressed
-			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 (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);
-				if (sleep_after_release)
-					do_sleep();
-			}
-		}
+
+	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);
 	}
 }
 
-ISR(INT0_vect)
+static void handle_button(unsigned char button, unsigned char cur,
+	unsigned char prev)
 {
-	hw_setup();
-	log_byte(0xbb);
-	log_flush();
+	// 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
+	}
 }