X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=firmware%2Fcontrol.c;h=a219f19205947b8a11a6b3d3ee9efb1ccad37b94;hb=29b27abe6adedf08f1067a76c8785cd8fe5d3296;hp=0f19390b3cc274da5c1b03da0742a3a3e518b8b4;hpb=b1796aee655d8b4194f1d9f16c7d8f919cbb549d;p=bike-lights.git

diff --git a/firmware/control.c b/firmware/control.c
index 0f19390..a219f19 100644
--- a/firmware/control.c
+++ b/firmware/control.c
@@ -4,97 +4,103 @@
 #include "lights.h"
 
 static pattern_t panic_pattern[] = {
-	{ 3, 1 }, // FIXME: will be 4, but let's be safe while testing
-	{ 0, 1 },
-	{ 3, 1 },
-	{ 0, 1 },
-	{ 3, 1 },
-	{ 0, 1 },
-	{ 3, 1 },
-	{ 0, 1 },
-	{ 3, 1 },
-	{ 0, 1 },
-	{ 3, 1 },
-	{ 0, 1 },
-	{ 3, 1 },
-	{ 0, 1 },
-	{ 3, 1 },
-	{ 0, 1 },
-	{ 3, 1 },
-	{ 0, 1 },
-	{ 3, 1 },
-	{ 0, 1 },
-	{ 3, 1 },
-	{ 0, 1 },
+	{ 3, D_1 }, // FIXME: will be 4, but let's be safe while testing
+	{ 0, D_1 },
+	{ 3, D_1 },
+	{ 0, D_1 },
+	{ 3, D_1 },
+	{ 0, D_1 },
+	{ 3, D_1 },
+	{ 0, D_1 },
+	{ 3, D_1 },
+	{ 0, D_1 },
+	{ 3, D_1 },
+	{ 0, D_1 },
+	{ 3, D_1 },
+	{ 0, D_1 },
+	{ 3, D_1 },
+	{ 0, D_1 },
+	{ 3, D_1 },
+	{ 0, D_1 },
+	{ 3, D_1 },
+	{ 0, D_1 },
+	{ 3, D_1 },
+	{ 0, D_1 },
 	PATTERN_END
 };
 
 pattern_t on1_pattern [] = {
-	{ 1, 0x10 },
+	{ 1, D_8 },
 	PATTERN_END
 };
 
 static pattern_t on2_pattern [] = {
-	{ 2, 0x10 },
+	{ 2, D_8 },
 	PATTERN_END
 };
 
 static pattern_t on3_pattern [] = {
-	{ 3, 0x10 },
+	{ 3, D_8 },
+	PATTERN_END
+};
+
+static pattern_t brake_pattern [] = {
+	{ 4, D_2 },
+	{ 3, D_8 },
 	PATTERN_END
 };
 
 static pattern_t normal2_pattern[] = {
-	{ 2, 0x1 },
-	{ 0, 0x1 },
-	{ 2, 0x1 },
-	{ 0, 0x8 },
-	{ 1, 0x1 },
-	{ 0, 0x1 },
-	{ 1, 0x1 },
-	{ 0, 0x8 },
+	{ 2, D_1 },
+	{ 0, D_1 },
+	{ 2, D_1 },
+	{ 0, D_8 },
+	{ 1, D_1 },
+	{ 0, D_1 },
+	{ 1, D_1 },
+	{ 0, D_8 },
 	PATTERN_END
 };
 
 static pattern_t normal3_pattern[] = {
-	{ 3, 0x1 },
-	{ 0, 0x1 },
-	{ 3, 0x1 },
-	{ 0, 0x8 },
-	{ 1, 0x1 },
-	{ 0, 0x1 },
-	{ 1, 0x1 },
-	{ 0, 0x8 },
+	{ 3, D_1 },
+	{ 0, D_1 },
+	{ 3, D_1 },
+	{ 0, D_8 },
+	{ 1, D_1 },
+	{ 0, D_1 },
+	{ 1, D_1 },
+	{ 0, D_8 },
 	PATTERN_END
 };
 
 static pattern_t normal4_pattern[] = {
-	{ 4, 0x1 },
-	{ 0, 0x1 },
-	{ 4, 0x1 },
-	{ 0, 0x8 },
-	{ 1, 0x1 },
-	{ 0, 0x1 },
-	{ 1, 0x1 },
-	{ 0, 0x8 },
+	{ 4, D_1 },
+	{ 0, D_1 },
+	{ 4, D_1 },
+	{ 0, D_8 },
+	{ 1, D_1 },
+	{ 0, D_1 },
+	{ 1, D_1 },
+	{ 0, D_8 },
 	PATTERN_END
 };
 
 static pattern_t slow1_pattern[] = {
-	{ 1, 0x01 },
-	{ 0, 0x10 },
+	{ 1, D_1 },
+	{ 0, D_13 },
 	PATTERN_END
 };
 
 static pattern_t slow2_pattern[] = {
-	{ 2, 0x01 },
-	{ 0, 0x10 },
+	{ 2, D_1 },
+	{ 0, D_13 },
 	PATTERN_END
 };
 
 static pattern_t slow3_pattern[] = {
-	{ 3, 0x01 },
-	{ 0, 0x10 },
+	{ 3, D_1 },
+	{ 0, D_13 },
 	PATTERN_END
 };
 
@@ -112,7 +118,7 @@ void brake_on()
 	braking = 1;
 	gpio_set(0, 1);
 	led_set_pattern(N_PWMLEDS, status_led_pattern_select());
-	// TODO brighten rear light
+	led_set_pattern(0, pwmled0_pattern_select());
 }
 
 void brake_off()
@@ -120,7 +126,7 @@ void brake_off()
 	braking = 0;
 	gpio_set(0, 0);
 	led_set_pattern(N_PWMLEDS, status_led_pattern_select());
-	// TODO dim rear light
+	led_set_pattern(0, pwmled0_pattern_select());
 }
 
 void toggle_dim_mode()
@@ -147,10 +153,13 @@ pattern_t *pwmled0_pattern_select()
 	if (towbar_mode)
 		return NULL;
 
+	if (braking)
+		return brake_pattern;
+
 	switch (ambient_zone) {
-	case 0: return dim_mode ? NULL : on3_pattern;
-	case 1: return dim_mode ? NULL : normal3_pattern;
-	case 2: return dim_mode ? slow3_pattern : normal3_pattern;
+	case 0: return dim_mode ? NULL : number_pattern(2, 1);
+	case 1: return dim_mode ? slow1_pattern : normal2_pattern;
+	case 2: return dim_mode ? slow2_pattern : normal3_pattern;
 	case 3:
 	default: return dim_mode ? slow3_pattern : normal4_pattern;
 	}