X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=pattern.c;h=363868610dfc8f3487c15ce694c5c76f60f943ad;hb=243ecacbd6e12a329b29b19cc37200829ac17276;hp=06911707d059b5a05def1268c280df4a7238665b;hpb=1d7ad9daee131c758cdf95b5608f602254f10427;p=bike-lights.git

diff --git a/pattern.c b/pattern.c
index 0691170..3638686 100644
--- a/pattern.c
+++ b/pattern.c
@@ -77,6 +77,25 @@ pattern_t pattern_num[] = {
 
 static unsigned char test_running;
 
+static void led_set_mode(unsigned char n, unsigned char mode)
+{
+	if (n < N_PWMLEDS) {
+		pwmled_set_mode(n, mode);
+	} else if (n < N_LEDS) {
+		gpio_set(n - N_PWMLEDS, mode);
+	}
+}
+
+void led_set_pattern(unsigned char n, pattern_t *pattern)
+{
+	if (!pattern)
+		pattern = off_pattern;
+
+	led_patterns[n] = pattern;
+	led_counters[n] = pattern->duration;
+	led_set_mode(n, pattern->mode);
+}
+
 void pattern_init()
 {
 	unsigned char i;
@@ -85,12 +104,19 @@ void pattern_init()
 		led_counters[i] = 0;
 		led_patterns[i] = off_pattern;
 	}
-	led_patterns[N_PWMLEDS] = boot_pattern;
-	led_counters[N_PWMLEDS] = boot_pattern->duration;
-	gpio_set(GPIO_LED2, 1);
+	led_set_pattern(N_PWMLEDS+1, boot_pattern);
 	test_running = 0;
 }
 
+static pattern_t *number_pattern(unsigned char num)
+{
+	if (num >= 9)
+		num = 9;
+
+	return pattern_num + sizeof(pattern_num)/sizeof(pattern_t)
+		- 1 - 2*num;
+}
+
 static inline pattern_t *pattern_select(unsigned char n)
 {
 	if (n < N_PWMLEDS && !pwmled_enabled(n))
@@ -107,25 +133,7 @@ static inline pattern_t *pattern_select(unsigned char n)
 			return mode1_pattern;
 		}
 	}
-	return pattern_num + sizeof(pattern_num)/sizeof(pattern_t)
-		- 1 - 2*(1+ambient_zone);
-}
-
-static void led_set_mode(unsigned char n, unsigned char mode)
-{
-	if (n < N_PWMLEDS) {
-		pwmled_set_mode(n, mode);
-	} else if (n == N_PWMLEDS) {
-		gpio_set(GPIO_LED2, mode);
-	}
-	// TODO LED 1
-}
-
-static void inline led_set_level(unsigned char n, unsigned char level)
-{
-	if (n == N_PWMLEDS) {
-		gpio_set(GPIO_LED2, 1);
-	}
+	return number_pattern(1+ambient_zone);
 }
 
 void patterns_next_tick()
@@ -134,12 +142,12 @@ void patterns_next_tick()
 
 	for (i = 0; i < N_LEDS; i++) {
 		if (led_counters[i] == 0) {
-			led_patterns[i]++;
-			if (led_patterns[i]->duration == 0) { // END
-				led_patterns[i] = pattern_select(i);
+			pattern_t *p = led_patterns[i];
+			p++;
+			if (p->duration == 0) { // END
+				p = pattern_select(i);
 			}
-			led_counters[i] = led_patterns[i]->duration;
-			led_set_mode(i, led_patterns[i]->mode);
+			led_set_pattern(i, p);
 		}
 
 		led_counters[i]--;