braking is handled behind the patterns inside pattern.c

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

diff --git a/firmware/control.c b/firmware/control.c
index efc61ad2498d4a240d31a64415b545a0946769b9..8477722f86bd8095d461af75735c90e991b6c4c1 100644 (file)
--- a/firmware/control.c
+++ b/firmware/control.c
@@ -4,34 +4,27 @@
 #include "lights.h"
 
 static pattern_t panic_pattern[] = {
-       { 3, D_1 }, // FIXME: will be 4, but let's be safe while testing
-       { 0, D_1 },
-       { 3, D_1 },
-       { 0, D_1 },
-       { 3, D_1 },
-       { 0, D_1 },
-       { 3, D_1 },
-       { 0, D_1 },
-       { 3, D_1 },
-       { 0, D_1 },
-       { 3, D_1 },
-       { 0, D_1 },
-       { 3, D_1 },
-       { 0, D_1 },
-       { 3, D_1 },
-       { 0, D_1 },
-       { 3, D_1 },
-       { 0, D_1 },
-       { 3, D_1 },
-       { 0, D_1 },
-       { 3, D_1 },
-       { 0, D_1 },
-       PATTERN_END
-};
-
-static pattern_t brake_pattern [] = {
-       { 4, D_2 },
-       { 3, D_8 },
+       { PWM_PAT(2, 0, 0), D_1 },
+       { PWM_PAT(0, 0, 2), D_1 },
+       { PWM_PAT(0, 0, 0), D_1 },
+       { PWM_PAT(2, 0, 0), D_1 },
+       { PWM_PAT(0, 0, 2), D_1 },
+       { PWM_PAT(0, 0, 0), D_1 },
+       { PWM_PAT(2, 0, 0), D_1 },
+       { PWM_PAT(0, 0, 2), D_1 },
+       { PWM_PAT(0, 0, 0), D_1 },
+       { PWM_PAT(2, 0, 0), D_1 },
+       { PWM_PAT(0, 0, 2), D_1 },
+       { PWM_PAT(0, 0, 0), D_1 },
+       { PWM_PAT(2, 0, 0), D_1 },
+       { PWM_PAT(0, 0, 2), D_1 },
+       { PWM_PAT(0, 0, 0), D_1 },
+       { PWM_PAT(2, 0, 0), D_1 },
+       { PWM_PAT(0, 0, 2), D_1 },
+       { PWM_PAT(0, 0, 0), D_1 },
+       { PWM_PAT(2, 0, 0), D_1 },
+       { PWM_PAT(0, 0, 2), D_1 },
+       { PWM_PAT(0, 0, 0), D_1 },
        PATTERN_END
 };
 
@@ -71,7 +64,8 @@ pattern_t on_pattern[] = {
        PATTERN_END
 };
 
-static unsigned char dim_mode, towbar_mode, braking;
+volatile unsigned char braking;
+static unsigned char dim_mode, towbar_mode;
 
 void init_control()
 {
@@ -85,7 +79,7 @@ void brake_on()
        braking = 1;
        gpio_set(0, 1);
        led_set_pattern(N_STATUS_LED, status_led_pattern_select());
-       led_set_pattern(0, pwmled_pattern_select());
+       pwmleds_update_mode();
 }
 
 void brake_off()
@@ -93,7 +87,7 @@ void brake_off()
        braking = 0;
        gpio_set(0, 0);
        led_set_pattern(N_STATUS_LED, status_led_pattern_select());
-       led_set_pattern(0, pwmled_pattern_select());
+       pwmleds_update_mode();
 }
 
 void toggle_dim_mode()
@@ -113,12 +107,6 @@ pattern_t *pwmled_pattern_select()
        if (battery_critical)
                return slow_pattern;
 
-       if (towbar_mode)
-               return NULL;
-
-       if (braking)
-               return brake_pattern;
-
        switch (ambient_zone) {
        case 0: return night_pattern;
        case 1: