From: Jan "Yenya" Kasprzak Date: Sun, 16 Dec 2012 16:32:32 +0000 (+0100) Subject: control.c: blinking modes update X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?p=bike-lights.git;a=commitdiff_plain;h=9812e0e491f8582ea322138b440054f19cd1f792 control.c: blinking modes update --- diff --git a/firmware/control.c b/firmware/control.c index 5796835..384edc8 100644 --- a/firmware/control.c +++ b/firmware/control.c @@ -126,17 +126,13 @@ pattern_t *pwmled0_pattern_select() { // TODO: battery critical -#ifndef TESTING_FW - return normal3_pattern; -#endif - if (towbar_mode) return NULL; switch (ambient_zone) { - case 0: return dim_mode ? NULL : on1_pattern; - case 1: return dim_mode ? NULL : slow2_pattern; - case 2: return dim_mode ? slow3_pattern : slow2_pattern; + case 0: return dim_mode ? NULL : on3_pattern; + case 1: return dim_mode ? NULL : normal3_pattern; + case 2: return dim_mode ? slow3_pattern : normal3_pattern; case 3: default: return dim_mode ? slow3_pattern : normal4_pattern; } @@ -147,8 +143,9 @@ pattern_t *pwmled1_pattern_select() // TODO: battery critical #ifndef TESTING_FW - return off_pattern; + return NULL; #endif + if (towbar_mode) { switch (ambient_zone) { case 0: @@ -207,12 +204,12 @@ pattern_t *illumination_led_pattern_select() ? number_pattern(2, 1) : number_pattern(3, 1); case 2: return dim_mode - ? number_pattern(3, 0) - : number_pattern(4, 0); + ? number_pattern(1, 0) + : number_pattern(2, 0); case 3: default: return dim_mode - ? number_pattern(5, 0) - : number_pattern(6, 0); + ? number_pattern(3, 0) + : number_pattern(4, 0); } }