X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?p=bike-lights.git;a=blobdiff_plain;f=firmware%2Fpattern.c;h=55b64cc6e5bf23729d75c5a676c69708619999ff;hp=d3e097740249474921fc3c55b53b38a9cd5ca018;hb=65c3ad96cf307c3b77b36e6f6a2af5201c213a3c;hpb=926be135a0c8184c17ad39ae0dff55ea6e00c50e

diff --git a/firmware/pattern.c b/firmware/pattern.c
index d3e0977..55b64cc 100644
--- a/firmware/pattern.c
+++ b/firmware/pattern.c
@@ -1,42 +1,12 @@
 #include <avr/io.h>
+#include <stdlib.h> // for NULL
 
 #include "lights.h"
 
 static unsigned char led_counters[N_LEDS];
 static pattern_t *led_patterns[N_LEDS];
 
-pattern_t off_pattern[] = {
-	{ 0, PATTERN_FOREVER },
-};
-
-pattern_t zero_pattern[] = {
-	{ 0, 0x10 },
-	PATTERN_END
-};
-
-pattern_t on_pattern[] = {
-	{ 1, PATTERN_FOREVER },
-};
-
-pattern_t blink_pattern[] = {
-	{ 1, 0x4 },
-	{ 0, 0x8 },
-	PATTERN_END
-};
-
-pattern_t mode1_pattern[] = {
-	{ 4, 0x1 },
-	{ 0, 0x1 },
-	{ 4, 0x1 },
-	{ 0, 0x8 },
-	{ 1, 0x1 },
-	{ 0, 0x1 },
-	{ 1, 0x1 },
-	{ 0, 0x8 },
-	PATTERN_END
-};
-
-pattern_t boot_pattern[] = {
+static pattern_t boot_pattern[] = {
 	{ 1, 0x6 },
 	{ 0, 0x6 },
 	{ 1, 0x3 },
@@ -56,7 +26,7 @@ pattern_t boot_pattern[] = {
 	PATTERN_END
 };
 
-pattern_t pattern_num[] = {
+static pattern_t pattern_num[] = {
 	{ 0, 0x5 },
 	{ 1, 0x1 }, /* 10 */
 	{ 0, 0x5 },
@@ -77,11 +47,39 @@ pattern_t pattern_num[] = {
 	{ 1, 0x1 }, /*  2 */
 	{ 0, 0x5 },
 	{ 1, 0x1 }, /*  1 */
-	{ 0, 0x1E },
+	{ 0, 0xF },
+	PATTERN_END
+};
+
+static pattern_t pattern_invnum[] = {
+	{ 1, 0x5 },
+	{ 0, 0x1 }, /* 10 */
+	{ 1, 0x5 },
+	{ 0, 0x1 }, /*  9 */
+	{ 1, 0x5 },
+	{ 0, 0x1 }, /*  8 */
+	{ 1, 0x5 },
+	{ 0, 0x1 }, /*  7 */
+	{ 1, 0x5 },
+	{ 0, 0x1 }, /*  6 */
+	{ 1, 0x5 },
+	{ 0, 0x1 }, /*  5 */
+	{ 1, 0x5 },
+	{ 0, 0x1 }, /*  4 */
+	{ 1, 0x5 },
+	{ 0, 0x1 }, /*  3 */
+	{ 1, 0x5 },
+	{ 0, 0x1 }, /*  2 */
+	{ 1, 0x5 },
+	{ 0, 0x1 }, /*  1 */
+	{ 1, 0xF },
 	PATTERN_END
 };
 
-static unsigned char test_running;
+pattern_t off_pattern[] = {
+	{ 0, 0x1 },
+	PATTERN_END
+};
 
 static void led_set_mode(unsigned char n, unsigned char mode)
 {
@@ -98,41 +96,81 @@ void led_set_pattern(unsigned char n, pattern_t *pattern)
 		pattern = off_pattern;
 
 	led_patterns[n] = pattern;
+
 	led_counters[n] = pattern->duration;
 	led_set_mode(n, pattern->mode);
 }
 
-void pattern_init()
+void init_pattern()
 {
 	unsigned char i;
 
 	for (i = 0; i < N_LEDS; i++)
-		led_set_pattern(i, zero_pattern);
+		led_set_pattern(i, NULL);
 
 	led_set_pattern(N_PWMLEDS+1, boot_pattern);
-	test_running = 0;
 }
 
-pattern_t *number_pattern(unsigned char num)
+pattern_t *number_pattern(unsigned char num, unsigned char inv)
+{
+	if (num >= 10)
+		num = 10;
+
+	if (inv) {
+		return pattern_invnum
+			+ sizeof(pattern_invnum)/sizeof(pattern_t)
+			- 2 - 2*num;
+	} else {
+		return pattern_num
+			+ sizeof(pattern_num)/sizeof(pattern_t)
+			- 2 - 2*num;
+	}
+}
+
+static pattern_t *pattern_select(unsigned char n)
+{
+	switch(n) {
+	case 0: return pwmled0_pattern_select();
+	case 1: return pwmled1_pattern_select();
+	case 2: return pwmled2_pattern_select();
+	case 3: return status_led_pattern_select();
+	case 4: return illumination_led_pattern_select();
+	case 6: return laser_pattern_select();
+	default: return NULL;
+	}
+}
+
+void pattern_reload()
 {
-	if (num >= 9)
-		num = 9;
+	unsigned char i;
 
-	return pattern_num + sizeof(pattern_num)/sizeof(pattern_t)
-		- 2 - 2*num;
+	for (i = 0; i < N_LEDS; i++)
+		led_set_pattern(i, pattern_select(i));
 }
 
-static inline pattern_t *pattern_select(unsigned char n)
+static void inline pattern_finished(unsigned char n)
 {
-	if (n < N_PWMLEDS && !pwmled_enabled(n))
-		return off_pattern; // Don't mess with non-enabled LEDs
-	else if (n < N_PWMLEDS)
-		return mode1_pattern;
-	else if (n == 3)
-		return status_pattern_select(0);
-	else if (n == 4)
-		return status_pattern_select(1);
-	return off_pattern;
+	unsigned char i;
+
+	led_patterns[n] = NULL;
+
+	if (n < N_PWMLEDS) {
+		for (i = 0; i < N_PWMLEDS; i++)
+			if (led_patterns[i])
+				return;
+
+		/* all pwmleds finished; restart them */
+		for (i = 0; i < N_PWMLEDS; i++)
+			led_set_pattern(i, pattern_select(i));
+	} else if (n == 3) {
+		if (!led_patterns[4])
+			led_set_pattern(4, pattern_select(4));
+	} else if (n == 4) {
+		if (!led_patterns[3])
+			led_set_pattern(3, pattern_select(3));
+	} else {
+		led_set_pattern(n, pattern_select(n));
+	}
 }
 
 void patterns_next_tick()
@@ -140,17 +178,22 @@ void patterns_next_tick()
 	unsigned char i;
 
 	for (i = 0; i < N_LEDS; i++) {
-		if (led_counters[i] == 0) {
+		if (!led_patterns[i]) {
+			pattern_finished(i);
+			continue;
+		}
+
+		if (--led_counters[i] == 0) {
 			pattern_t *p = led_patterns[i];
 			p++;
 			if (p->duration == 0) { // END
-				p = pattern_select(i);
+				/* Keep the last state, wait for others */
+				pattern_finished(i);
+				continue;
 			}
 			led_set_pattern(i, p);
 		}
 
-		if (led_counters[i] < PATTERN_FOREVER)
-			led_counters[i]--;
 	}
 }