control.c: on_patterns should not last forever

[bike-lights.git] / firmware / control.c

diff --git a/firmware/control.c b/firmware/control.c
index 0b842a74dc794f980d0dc2ced63792cb7e009cb0..57968357f970ad8284cd97f3021cf40eccacd17f 100644 (file)
--- a/firmware/control.c
+++ b/firmware/control.c
@@ -30,15 +30,18 @@ static pattern_t panic_pattern[] = {
 };
 
 pattern_t on1_pattern [] = {
-       { 1, PATTERN_FOREVER }
+       { 1, 0x10 },
+       PATTERN_END
 };
 
 static pattern_t on2_pattern [] = {
-       { 2, PATTERN_FOREVER }
+       { 2, 0x10 },
+       PATTERN_END
 };
 
 static pattern_t on3_pattern [] = {
-       { 3, PATTERN_FOREVER }
+       { 3, 0x10 },
+       PATTERN_END
 };
 
 static pattern_t normal2_pattern[] = {
@@ -54,9 +57,9 @@ static pattern_t normal2_pattern[] = {
 };
 
 static pattern_t normal3_pattern[] = {
-       { 2, 0x1 },
+       { 3, 0x1 },
        { 0, 0x1 },
-       { 2, 0x1 },
+       { 3, 0x1 },
        { 0, 0x8 },
        { 1, 0x1 },
        { 0, 0x1 },
@@ -66,9 +69,9 @@ static pattern_t normal3_pattern[] = {
 };
 
 static pattern_t normal4_pattern[] = {
-       { 2, 0x1 },
+       { 4, 0x1 },
        { 0, 0x1 },
-       { 2, 0x1 },
+       { 4, 0x1 },
        { 0, 0x8 },
        { 1, 0x1 },
        { 0, 0x1 },
@@ -123,6 +126,10 @@ pattern_t *pwmled0_pattern_select()
 {
        // TODO: battery critical
 
+#ifndef TESTING_FW
+       return normal3_pattern;
+#endif
+
        if (towbar_mode)
                return NULL;
 
@@ -139,6 +146,9 @@ pattern_t *pwmled1_pattern_select()
 {
        // TODO: battery critical
 
+#ifndef TESTING_FW
+       return off_pattern;
+#endif
        if (towbar_mode) {
                switch (ambient_zone) {
                case 0:
@@ -163,6 +173,9 @@ pattern_t *pwmled2_pattern_select()
 {
        // TODO: battery critical
 
+#ifndef TESTING_FW
+       return on3_pattern;
+#endif
        switch (ambient_zone) {
        case 0: return dim_mode ? on2_pattern : on3_pattern;
        case 1: return dim_mode ? slow1_pattern : normal2_pattern;
@@ -179,7 +192,7 @@ pattern_t *status_led_pattern_select()
                return buttons_setup_status0_pattern_select();
 
        // FIXME: do something sane
-       return number_pattern(1 + ambient_zone, 1);
+       return number_pattern(1 + ambient_zone, 0);
 }
 
 pattern_t *illumination_led_pattern_select()