pwmled: verify the input of pwmled_set_brightness

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

diff --git a/firmware/pwmled.c b/firmware/pwmled.c
index 99650d00460aeff816954cb66ff13da2e1c86f48..c156d8175f01440eef1601e4cc2609cc06082646 100644 (file)
--- a/firmware/pwmled.c
+++ b/firmware/pwmled.c
@@ -42,42 +42,28 @@ static uint16_t adc_max[N_PWMLEDS] = {
 #endif
 };
 
-static uint16_t adc_vals[N_PWMLEDS*N_PWMLED_MODES] = {
-#ifdef TESTING_FW
-       /* pwmled0 */
+static uint16_t adc_targets_0[] = {
        MA_GAIN_TO_ADC(  50, 20),
        MA_GAIN_TO_ADC( 100, 20),
        MA_GAIN_TO_ADC( 200, 20),
-       MA_GAIN_TO_ADC( 300, 20),
-       /* pwmled1 */
+       MA_GAIN_TO_ADC( 350, 20),
+};
+
+static uint16_t adc_targets_1[] = {
        MA_GAIN_TO_ADC(   5, 20),
        MA_GAIN_TO_ADC(  10, 20),
-       MA_GAIN_TO_ADC(  15, 20),
        MA_GAIN_TO_ADC(  20, 20),
-       /* pwmled2 */
+};
+
+static uint16_t adc_targets_2[] = {
        MA_GAIN_TO_ADC(  50,  1),
        MA_GAIN_TO_ADC( 100,  1),
-       MA_GAIN_TO_ADC( 150,  1),
-       MA_GAIN_TO_ADC( 200,  1)
-#else
-       /* pwmled0 */
-       MA_GAIN_TO_ADC( 100, 20),
-       MA_GAIN_TO_ADC( 300, 20),
-       MA_GAIN_TO_ADC( 700, 20),
-       MA_GAIN_TO_ADC( 800, 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( 800,  1),
-       MA_GAIN_TO_ADC(1500,  1)
-#endif
+       MA_GAIN_TO_ADC( 350,  1),
 };
 
+static uint16_t adc_vals[N_PWMLEDS*N_PWMLED_MODES];
+
 #define ST_DISABLED 0
 #define ST_OFF      1
 #define ST_PROBING  2
@@ -94,16 +80,19 @@ void init_pwmled()
                pwmled_t *led = pwmleds + i;
                led->err_sum = 0;
                led->target = adc_vals[i*N_PWMLED_MODES];
-               led->pwm = 0;
                led->mode = 1;
-               led->state = ST_PROBING;
                led->probe_steady = 0;
+               led->state = ST_OFF;
+               led->pwm = 1;
+               pwm_set(i, led->pwm);
 
                for (j = 0; j < N_PWMLED_MODES; j++) {
                        led->mode_pwm[j] = 0;
                        led->err_sums[j] = 0;
                }
        }
+
+       pwmled_set_brightness(PWMLED_BRIGHTNESS(0, 2, 1, 0, 2));
 }
 
 void pwmled_set_mode(unsigned char n, unsigned char mode)
@@ -133,6 +122,40 @@ void pwmled_set_mode(unsigned char n, unsigned char mode)
        }
 }
 
+#define CHECK_BRIGHTNESS(var, expr, array) \
+       do { \
+               (var) = (expr); \
+               if ((var) >= sizeof(array)/sizeof(array[0])) \
+                       (var) = sizeof(array)/sizeof(array[0]) - 1; \
+       } while (0)
+
+void pwmled_set_brightness(uint16_t brightness)
+{
+       unsigned char i;
+
+       CHECK_BRIGHTNESS(i, brightness & 0x7, adc_targets_0);
+       adc_vals[0] = adc_targets_0[i];
+       CHECK_BRIGHTNESS(i, (brightness >> 3) & 0x7, adc_targets_0);
+       adc_vals[1] = adc_targets_0[i];
+       adc_vals[2] = adc_vals[1];
+
+       CHECK_BRIGHTNESS(i, (brightness >> 6) & 0x7, adc_targets_1);
+       adc_vals[3] = adc_targets_1[i];
+       adc_vals[4] = adc_vals[3];
+       adc_vals[5] = adc_vals[3];
+
+       CHECK_BRIGHTNESS(i, (brightness >> 9) & 0x7, adc_targets_2);
+       adc_vals[6] = adc_targets_2[i];
+       CHECK_BRIGHTNESS(i, (brightness >> 12) & 0x7, adc_targets_2);
+       adc_vals[7] = adc_targets_2[i];
+       adc_vals[8] = adc_vals[7];
+
+       for (i = 0; i < N_PWMLEDS; i++) {
+               pwmleds[i].err_sum = 0;
+               pwmled_set_mode(i, pwmleds[i].mode);
+       }
+}
+
 #define PWMLED_PROBE_STEADY_COUNT 10
 
 static inline unsigned char pwmled_probed_ok(unsigned char n, uint16_t old_pwm)
@@ -214,7 +237,8 @@ void pwmled_adc(unsigned char n, uint16_t adcval)
 
        old_pwm = led->pwm;
 
-       shift = led->state == ST_PROBING ? 3 : 5;
+       // shift = led->state == ST_PROBING ? 3 : 8;
+       shift = 3;
 
        sum = ((int32_t)led->pwm << shift)
                + led->err_sum + led->target - adcval;