X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=firmware%2Fpattern.c;h=a11999d66e152198b7c160a0d1f84cd4274ba2b4;hb=63d8caf3a232630160a7af8c371b98351cd534bc;hp=78f988034fad04bfe0432aeac18d0a566f23c31c;hpb=b5f2360e2efefeb664add9043bf17dedf91ae085;p=bike-lights.git

diff --git a/firmware/pattern.c b/firmware/pattern.c
index 78f9880..a11999d 100644
--- a/firmware/pattern.c
+++ b/firmware/pattern.c
@@ -2,18 +2,15 @@
 
 #include "lights.h"
 
-typedef struct {
-	unsigned char mode: 3;
-	unsigned char duration: 5;
-} pattern_t;
-
 static unsigned char led_counters[N_LEDS];
 static pattern_t *led_patterns[N_LEDS];
 
-#define PATTERN_END { 0, 0 }
 pattern_t off_pattern[] = {
-	{ 0, 0x1F },
-	PATTERN_END
+	{ 0, PATTERN_FOREVER },
+};
+
+pattern_t on_pattern[] = {
+	{ 1, PATTERN_FOREVER },
 };
 
 pattern_t blink_pattern[] = {
@@ -75,7 +72,7 @@ pattern_t pattern_num[] = {
 	{ 1, 0x1 }, /*  2 */
 	{ 0, 0x5 },
 	{ 1, 0x1 }, /*  1 */
-	{ 0, 0x1F },
+	{ 0, 0x1E },
 	PATTERN_END
 };
 
@@ -104,10 +101,9 @@ void pattern_init()
 {
 	unsigned char i;
 
-	for (i = 0; i < N_LEDS; i++) {
-		led_counters[i] = 0;
-		led_patterns[i] = off_pattern;
-	}
+	for (i = 0; i < N_LEDS; i++)
+		led_set_pattern(i, off_pattern);
+
 	led_set_pattern(N_PWMLEDS+1, boot_pattern);
 	test_running = 0;
 }
@@ -146,7 +142,8 @@ void patterns_next_tick()
 			led_set_pattern(i, p);
 		}
 
-		led_counters[i]--;
+		if (led_counters[i] < PATTERN_FOREVER)
+			led_counters[i]--;
 	}
 }