X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=firmware%2Fcontrol.c;h=eeeca84cb1ba5565a384a7a216f26a9ffdfc433b;hb=c919c204874b9455471744eb6b802534ed629fcc;hp=0b842a74dc794f980d0dc2ced63792cb7e009cb0;hpb=647f353f4d8c87c5cf18cae905e9d600cd0e6bcb;p=bike-lights.git

diff --git a/firmware/control.c b/firmware/control.c
index 0b842a7..eeeca84 100644
--- a/firmware/control.c
+++ b/firmware/control.c
@@ -30,15 +30,18 @@ static pattern_t panic_pattern[] = {
 };
 
 pattern_t on1_pattern [] = {
-	{ 1, PATTERN_FOREVER }
+	{ 1, 0x10 },
+	PATTERN_END
 };
 
 static pattern_t on2_pattern [] = {
-	{ 2, PATTERN_FOREVER }
+	{ 2, 0x10 },
+	PATTERN_END
 };
 
 static pattern_t on3_pattern [] = {
-	{ 3, PATTERN_FOREVER }
+	{ 3, 0x10 },
+	PATTERN_END
 };
 
 static pattern_t normal2_pattern[] = {
@@ -54,9 +57,9 @@ static pattern_t normal2_pattern[] = {
 };
 
 static pattern_t normal3_pattern[] = {
-	{ 2, 0x1 },
+	{ 3, 0x1 },
 	{ 0, 0x1 },
-	{ 2, 0x1 },
+	{ 3, 0x1 },
 	{ 0, 0x8 },
 	{ 1, 0x1 },
 	{ 0, 0x1 },
@@ -66,9 +69,9 @@ static pattern_t normal3_pattern[] = {
 };
 
 static pattern_t normal4_pattern[] = {
-	{ 2, 0x1 },
+	{ 4, 0x1 },
 	{ 0, 0x1 },
-	{ 2, 0x1 },
+	{ 4, 0x1 },
 	{ 0, 0x8 },
 	{ 1, 0x1 },
 	{ 0, 0x1 },
@@ -127,9 +130,9 @@ pattern_t *pwmled0_pattern_select()
 		return NULL;
 
 	switch (ambient_zone) {
-	case 0: return dim_mode ? NULL : on1_pattern;
-	case 1: return dim_mode ? NULL : slow2_pattern;
-	case 2: return dim_mode ? slow3_pattern : slow2_pattern;
+	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 3:
 	default: return dim_mode ? slow3_pattern : normal4_pattern;
 	}
@@ -139,6 +142,10 @@ pattern_t *pwmled1_pattern_select()
 {
 	// TODO: battery critical
 
+#ifndef TESTING_FW
+	return NULL;
+#endif
+
 	if (towbar_mode) {
 		switch (ambient_zone) {
 		case 0:
@@ -163,6 +170,9 @@ pattern_t *pwmled2_pattern_select()
 {
 	// TODO: battery critical
 
+#ifndef TESTING_FW
+	return on3_pattern;
+#endif
 	switch (ambient_zone) {
 	case 0: return dim_mode ? on2_pattern : on3_pattern;
 	case 1: return dim_mode ? slow1_pattern : normal2_pattern;
@@ -179,7 +189,7 @@ pattern_t *status_led_pattern_select()
 		return buttons_setup_status0_pattern_select();
 
 	// FIXME: do something sane
-	return number_pattern(1 + ambient_zone, 1);
+	return number_pattern(1 + ambient_zone, 0);
 }
 
 pattern_t *illumination_led_pattern_select()
@@ -194,12 +204,19 @@ pattern_t *illumination_led_pattern_select()
 		? number_pattern(2, 1)
 		: number_pattern(3, 1);
 	case 2: return dim_mode
-		? number_pattern(3, 0)
-		: number_pattern(4, 0);
+		? number_pattern(1, 0)
+		: number_pattern(2, 0);
 	case 3:
 	default: return dim_mode
-		? number_pattern(5, 0)
-		: number_pattern(6, 0);
+		? number_pattern(3, 0)
+		: number_pattern(4, 0);
 	}
 }
 
+pattern_t *laser_pattern_select()
+{
+	if (!dim_mode && ambient_zone <= 1)
+		return number_pattern(2, 1);
+	else
+		return NULL;
+}