X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=firmware%2Fbuttons.c;h=17f4bffad9f70e671994e30582616adb309aaa23;hb=ed608010c0a708b9be0d3577d7f4d3313eb2e851;hp=84dd8da680a1019bfadd5f2992cb8e52f9068d86;hpb=2a206315ac194c21e3a14ca0b3a9e29cd0cec0b2;p=bike-lights.git

diff --git a/firmware/buttons.c b/firmware/buttons.c
index 84dd8da..17f4bff 100644
--- a/firmware/buttons.c
+++ b/firmware/buttons.c
@@ -1,72 +1,147 @@
 #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 just_waked_up;
 
-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 do_sleep();
+
+static void toggle_bright_mode()
+{
+	// TODO
+}
+
+static void set_panic_mode()
+{
+	// TODO
+}
+
+unsigned char get_user_param(unsigned char param)
+{
+	if (param < MAX_USER_PARAMS)
+		return user_params[param];
+	return 0; // FIXME: internal error?
+}
+
+static inline void short_press(unsigned char button)
+{
+	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 inline void long_press(unsigned char button)
 {
-	DDRB &= ~(_BV(PB4) | _BV(PB6));
-	PORTB |=  _BV(PB4) | _BV(PB6);
+	if (button == 0) {
+		do_sleep();
+		return;
+	}
 
-	sleep_after_release = 0;
-	// log_byte(PORTB);
+	// 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 long_press(unsigned char n)
+void init_buttons()
 {
-	sleep_after_release = 1;
-	gpio_set(1, 1);
+	unsigned char i;
+
+	DDRA &= ~(_BV(PA3) | _BV(PA4));
+	PORTA |=  _BV(PA3) | _BV(PA4);
+
+	for (i=0; i < N_BUTTONS; i++) {
+		button_start[i] = 0;
+		button_pressed[i] = 0;
+	}
+
+	just_waked_up = 1;
 }
 
 static void do_sleep()
 {
-	// 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();
-}
 
-static void inline short_press(unsigned char n)
-{
-	led_set_status(1);
+	hw_suspend();
+	gpio_before_poweroff(); // Set the status LED on again
+
+	while((PINA & _BV(PA3)) == 0)
+		; // wait for button release
+
+	_delay_ms(100);
+
+	susp_gpio(); // disable the status LED
+
+	power_down();
 }
 
 void timer_check_buttons()
 {
-	unsigned char pinb = PINB;
+	unsigned char pin = PINA;
 	unsigned char i;
 	unsigned char port_states[N_BUTTONS] = {
-		pinb & _BV(PB6),
-		pinb & _BV(PB4),
+		pin & _BV(PA3),
+		pin & _BV(PA4),
 	};
+
 	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);
+				log_byte(0xC0);
+				log_word(jiffies);
 #endif
 			} else if (button_pressed[i] == 1) {
 				// been already pressed
@@ -78,6 +153,8 @@ void timer_check_buttons()
 				}
 			}
 		} 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
@@ -88,17 +165,8 @@ void timer_check_buttons()
 				button_pressed[i] = 0;
 				if (duration > 6 && duration < 30)
 					short_press(i);
-				if (sleep_after_release)
-					do_sleep();
 			}
 		}
 	}
 }
 
-ISR(INT0_vect)
-{
-	hw_setup();
-	log_byte(0xbb);
-	log_flush();
-}
-