X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=firmware%2Fcontrol.c;h=1a768e6ca9d2d84f5b3932a7424c9a1bd6201178;hb=6c51c5f6242dbf1ba8f9355aab512d4b28a75012;hp=57968357f970ad8284cd97f3021cf40eccacd17f;hpb=f2a1b61c8c58ba290e073f53f3a0f461da9ce011;p=bike-lights.git

diff --git a/firmware/control.c b/firmware/control.c
index 5796835..1a768e6 100644
--- a/firmware/control.c
+++ b/firmware/control.c
@@ -126,17 +126,13 @@ pattern_t *pwmled0_pattern_select()
 {
 	// TODO: battery critical
 
-#ifndef TESTING_FW
-	return normal3_pattern;
-#endif
-
 	if (towbar_mode)
 		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;
 	}
@@ -147,8 +143,9 @@ pattern_t *pwmled1_pattern_select()
 	// TODO: battery critical
 
 #ifndef TESTING_FW
-	return off_pattern;
+	return NULL;
 #endif
+
 	if (towbar_mode) {
 		switch (ambient_zone) {
 		case 0:
@@ -192,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, 0);
+	return number_pattern(battery_gauge(), 0);
 }
 
 pattern_t *illumination_led_pattern_select()
@@ -207,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;
+}