X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=pattern.c;h=fb74ae0204426579429c39a59af78d97ef9f34f4;hb=404cf862f8c6bb413580dce16d0a0bdab1037525;hp=9999749fd2fe794952bbc16d83cc6f8704486636;hpb=66dbf8c04a632ad64f68aad6c775af6a5f5b12e8;p=bike-lights.git

diff --git a/pattern.c b/pattern.c
index 9999749..fb74ae0 100644
--- a/pattern.c
+++ b/pattern.c
@@ -23,11 +23,14 @@ pattern_t blink_pattern[] = {
 };
 
 pattern_t mode1_pattern[] = {
-	{ 1, 0x1 },
+	{ 3, 0x1 },
 	{ 0, 0x1 },
-	{ 4, 0x1 },
+	{ 3, 0x1 },
+	{ 0, 0x8 },
+	{ 1, 0x1 },
 	{ 0, 0x1 },
 	{ 1, 0x1 },
+	{ 0, 0x8 },
 	PATTERN_END
 };
 
@@ -77,6 +80,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,9 +107,7 @@ void pattern_init()
 		led_counters[i] = 0;
 		led_patterns[i] = off_pattern;
 	}
-	led_patterns[N_PWMLEDS+1] = boot_pattern;
-	led_counters[N_PWMLEDS+1] = boot_pattern->duration;
-	gpio_set(GPIO_LED2, 1);
+	led_set_pattern(N_PWMLEDS+1, boot_pattern);
 	test_running = 0;
 }
 
@@ -106,33 +126,10 @@ static inline pattern_t *pattern_select(unsigned char n)
 		return off_pattern; // Don't mess with non-enabled LEDs
 
 	if (n == 2) {
-		if (test_running) {
-			log_byte(0xF7);
-			log_flush();
-			return off_pattern;
-		} else {
-			test_running = 1;
-			log_byte(0xF6);
-			return mode1_pattern;
-		}
-	}
-	return number_pattern(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_LEDS) {
-		gpio_set(n - N_PWMLEDS, mode);
-	}
-}
-
-static void inline led_set_level(unsigned char n, unsigned char level)
-{
-	if (n == N_PWMLEDS) {
-		gpio_set(GPIO_LED2, 1);
+		return mode1_pattern;
 	}
+	// return number_pattern(1+ambient_zone);
+	return off_pattern;
 }
 
 void patterns_next_tick()
@@ -141,15 +138,19 @@ 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]--;
 	}
 }
 
+void led_set_status(unsigned char status)
+{
+	led_set_pattern(N_PWMLEDS+1, number_pattern(status));
+}