X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?p=bike-lights.git;a=blobdiff_plain;f=firmware%2Fbuttons.c;h=20d28a58915658b84dcfa723d66511743a9cfd46;hp=017a56c6560632fa2a1afe5280fdb966dab05a1f;hb=65c3ad96cf307c3b77b36e6f6a2af5201c213a3c;hpb=cadcc858f6c65c9fd7a18fb8309f7305ec6adb28

diff --git a/firmware/buttons.c b/firmware/buttons.c
index 017a56c..20d28a5 100644
--- a/firmware/buttons.c
+++ b/firmware/buttons.c
@@ -7,6 +7,10 @@
 #include "lights.h"
 
 #define WAKEUP_LIMIT	5	// times 100 ms
+#define SHORT_PRESS_MIN 2       // in jiffies (16 Hz ticks)
+#define SHORT_PRESS_MAX 5
+#define LONG_PRESS_MIN  10
+
 static uint16_t button_start[3];
 union {
 	unsigned char all;
@@ -166,16 +170,16 @@ static void handle_button(unsigned char button, unsigned char cur,
 	} else if (cur && prev) {           // --- is still pressed ---
 		uint16_t duration = jiffies - button_start[button];
 
-		if (duration > 160) {
+		if (duration >= LONG_PRESS_MIN) {
 			set_status_led(button, on1_pattern);
 				// acknowledge long press
 		}
 	} else if (!cur && prev) {            // --- just released ---
 		uint16_t duration = jiffies - button_start[button];
 
-		if (duration > 6 && duration < 60) {
+		if (duration >= SHORT_PRESS_MIN && duration < SHORT_PRESS_MAX) {
 			short_press(button);
-		} else if (duration > 160) {
+		} else if (duration > LONG_PRESS_MIN) {
 			set_status_led(button, NULL);
 			long_press(button);
 		}
@@ -185,30 +189,47 @@ static void handle_button(unsigned char button, unsigned char cur,
 
 static void handle_brake(unsigned char cur, unsigned char prev)
 {
+	uint16_t duration;
+
 	if (cur && !prev) {                   // --- just pressed ---
 		button_start[2] = jiffies;
+		return;
 	} else if (!cur && prev) {            // --- just released ---
 		button_start[2] = jiffies;
-	} else {                              // --- no change ---
-		uint16_t duration = jiffies - button_start[2];
-
-		if (duration > 6) {
-			if (cur) {
-				if (button_state.brake_working
-					&& !button_state.brake_reported) {
-					button_state.brake_reported = 1;
-					brake_on();
-				}
-			} else {
-				button_state.brake_working = 1;
-				if (button_state.brake_reported) {
-					button_state.brake_reported = 0;
+		return;
+	}
+				              // --- no change ---
+	duration = jiffies - button_start[2];
+
+	if (duration <= 3)
+		return;
+
+	if (cur) {
+		if (button_state.brake_working) {
+			static unsigned int brake_time;
+			if (button_state.brake_reported) {
+				if (brake_time) {
+					brake_time--;
+				} else {
 					brake_off();
+					button_state.brake_working = 0;
+					button_state.brake_reported = 0;
 				}
+			} else {
+				button_state.brake_reported = 1;
+				brake_on();
+				brake_time = 255; // avoid longer than ~16s
 			}
-			button_start[2] = jiffies - 7; // avoid overflow
+		}
+	} else {
+		button_state.brake_working = 1;
+		if (button_state.brake_reported) {
+			button_state.brake_reported = 0;
+			brake_off();
 		}
 	}
+
+	button_start[2] = jiffies - 7; // avoid overflow
 }
 
 void timer_check_buttons()