pwm.c: channels running - visible from the outside

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

diff --git a/firmware/pwmled.c b/firmware/pwmled.c
index fcde84a35a3f103968441a1a9663ee28f6bc3ecb..9aa6d8074689dd9b5e08de41e2d0a23e805e4a60 100644 (file)
--- a/firmware/pwmled.c
+++ b/firmware/pwmled.c
@@ -5,7 +5,10 @@
 typedef struct {
        uint16_t target, pwm;
        int16_t err_sum;
-       unsigned char mode, state, probe_steady;
+       unsigned char mode, state;
+       union {
+               unsigned char probe_steady, mode_changed;
+       };
        uint16_t mode_pwm[N_PWMLED_MODES];
        int16_t err_sums[N_PWMLED_MODES];
 } pwmled_t;
@@ -45,7 +48,7 @@ static uint16_t adc_vals[N_PWMLEDS*N_PWMLED_MODES] = {
        MA_GAIN_TO_ADC(  50, 20),
        MA_GAIN_TO_ADC( 100, 20),
        MA_GAIN_TO_ADC( 200, 20),
-       MA_GAIN_TO_ADC( 300, 20),
+       MA_GAIN_TO_ADC( 350, 20),
        /* pwmled1 */
        MA_GAIN_TO_ADC(   5, 20),
        MA_GAIN_TO_ADC(  10, 20),
@@ -53,23 +56,23 @@ static uint16_t adc_vals[N_PWMLEDS*N_PWMLED_MODES] = {
        MA_GAIN_TO_ADC(  20, 20),
        /* pwmled2 */
        MA_GAIN_TO_ADC(  50,  1),
-       MA_GAIN_TO_ADC( 100,  1),
+       MA_GAIN_TO_ADC(  80,  1),
        MA_GAIN_TO_ADC( 150,  1),
        MA_GAIN_TO_ADC( 200,  1)
 #else
        /* pwmled0 */
+       MA_GAIN_TO_ADC(  50, 20),
        MA_GAIN_TO_ADC( 100, 20),
-       MA_GAIN_TO_ADC( 300, 20),
-       MA_GAIN_TO_ADC( 700, 20),
-       MA_GAIN_TO_ADC( 800, 20),
+       MA_GAIN_TO_ADC( 200, 20),
+       MA_GAIN_TO_ADC( 350, 20),
        /* pwmled1 */
        MA_GAIN_TO_ADC(   5, 20),
        MA_GAIN_TO_ADC(  10, 20),
        MA_GAIN_TO_ADC(  18, 20),
        MA_GAIN_TO_ADC(  23, 20),
        /* pwmled2 */
-       MA_GAIN_TO_ADC( 200,  1),
-       MA_GAIN_TO_ADC( 400,  1),
+       MA_GAIN_TO_ADC( 150,  1),
+       MA_GAIN_TO_ADC( 300,  1),
        MA_GAIN_TO_ADC( 800,  1),
        MA_GAIN_TO_ADC(1500,  1)
 #endif
@@ -122,6 +125,7 @@ void pwmled_set_mode(unsigned char n, unsigned char mode)
                led->state = ST_ON;
                led->pwm = led->mode_pwm[mode - 1];
                led->err_sum = led->err_sums[mode - 1];
+               led->mode_changed = 1;
                pwm_set(n, led->pwm);
        } else {
                led->state = ST_OFF;
@@ -202,11 +206,15 @@ void pwmled_adc(unsigned char n, uint16_t adcval)
        if (!ST_IS_ON(led->state))
                return;
 
+       if (led->state == ST_ON && led->mode_changed) {
+               led->mode_changed--;
+               return;
+       }
        // FIXME: test for maximum adcval value (adc_max[n])
 
        old_pwm = led->pwm;
 
-       shift = led->state == ST_PROBING ? 3 : 5;
+       shift = led->state == ST_PROBING ? 3 : 8;
 
        sum = ((int32_t)led->pwm << shift)
                + led->err_sum + led->target - adcval;
@@ -218,7 +226,8 @@ void pwmled_adc(unsigned char n, uint16_t adcval)
        sum -= led->pwm << shift;
        led->err_sum = sum;
 
-       if (led->pwm >= PWM_MAX) {
+       if (led->pwm >= PWM_MAX
+               || (n == 1 && led->pwm > PWM_MAX/2 && adcval < 0x08)) {
                pwmled_err(n);
                return;
        }