X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?p=bike-lights.git;a=blobdiff_plain;f=firmware%2Fpwmled.c;h=03d1adb5957df2711b6c7bedf11a9c696ccdec57;hp=99650d00460aeff816954cb66ff13da2e1c86f48;hb=3e13c7f4abd65b939c1645d77cf6ed5e0124808e;hpb=fb3fd7b91398f2ad2cf344bdfff56e353972986a diff --git a/firmware/pwmled.c b/firmware/pwmled.c index 99650d0..03d1adb 100644 --- a/firmware/pwmled.c +++ b/firmware/pwmled.c @@ -11,10 +11,26 @@ typedef struct { }; uint16_t mode_pwm[N_PWMLED_MODES]; int16_t err_sums[N_PWMLED_MODES]; + unsigned char modes_not_yet_stable; } pwmled_t; pwmled_t pwmleds[N_PWMLEDS]; +/* + * Mode stabilization: + * when changing brightness via pwmled_set_brightness() below, + * we want to converge to the target value as fast as possible. Also, + * we would like to somehow initialize the mode 3, which is used as + * "mode 2 + other PWMLED on". So after the brightness is set, + * we also set pwmleds[n].modes_not_yet_stable to MODE_STABILIZATION_TIME. + * When modes_not_yet_stable is non-zero, we allow only mode 2 to be set + * regardless of what is fed to pwmled_set_mode. We will then converge + * to the target value of mode 2 only, and after MODE_STABILIZATION_TIME + * ADC measurements, we copy the mode_pwm value to all other modes. + * Only then it is allowed to set the other modes. + */ +#define MODE_STABILIZATION_TIME (2*16) // two seconds worth of measurements + #define PWMLED2_TESTING_WITH_350MA_LED #define SENSE_MOHM 33 /* 0.033 Ohm */ @@ -42,42 +58,38 @@ 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( 80, 20), + MA_GAIN_TO_ADC( 160, 20), + 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 */ - MA_GAIN_TO_ADC( 50, 1), - MA_GAIN_TO_ADC( 100, 1), - MA_GAIN_TO_ADC( 150, 1), - MA_GAIN_TO_ADC( 200, 1) +}; + +static uint16_t adc_targets_2[] = { +#ifdef TESTING_FW + MA_GAIN_TO_ADC( 120, 1), + MA_GAIN_TO_ADC( 160, 1), + MA_GAIN_TO_ADC( 240, 1), + MA_GAIN_TO_ADC( 320, 1), + MA_GAIN_TO_ADC( 460, 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) + MA_GAIN_TO_ADC( 150, 1), + MA_GAIN_TO_ADC( 300, 1), + MA_GAIN_TO_ADC( 500, 1), + MA_GAIN_TO_ADC( 700, 1), + MA_GAIN_TO_ADC(1500, 1), + MA_GAIN_TO_ADC(2500, 1), #endif }; +static uint16_t adc_vals[N_PWMLEDS*N_PWMLED_MODES]; + #define ST_DISABLED 0 #define ST_OFF 1 #define ST_PROBING 2 @@ -94,16 +106,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) @@ -121,6 +136,8 @@ void pwmled_set_mode(unsigned char n, unsigned char mode) led->mode = mode; if (mode > 0 && mode <= N_PWMLED_MODES) { + if (led->modes_not_yet_stable) // only mode 2 when !stable + mode = 2; led->target = adc_vals[n*N_PWMLED_MODES + mode - 1]; led->state = ST_ON; led->pwm = led->mode_pwm[mode - 1]; @@ -133,6 +150,47 @@ 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); + if (adc_vals[1] != adc_targets_0[i]) { + adc_vals[1] = adc_targets_0[i]; + pwmleds[0].modes_not_yet_stable = MODE_STABILIZATION_TIME; + } + adc_vals[2] = adc_vals[1]; + + CHECK_BRIGHTNESS(i, (brightness >> 6) & 0x7, adc_targets_1); + // we use only one mode, so no modes_not_yet_stable handling here + 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); + if (adc_vals[7] != adc_targets_2[i]) { + adc_vals[7] = adc_targets_2[i]; + pwmleds[2].modes_not_yet_stable = MODE_STABILIZATION_TIME; + } + 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) @@ -193,6 +251,12 @@ static inline void pwmled_err(unsigned char n) log_byte(n); log_word(jiffies); log_flush(); + + switch (n) { + case 0: err_flags.err_pwmled0 = 1; break; + case 1: err_flags.err_pwmled1 = 1; break; + case 2: err_flags.err_pwmled2 = 1; break; + } } @@ -214,7 +278,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; @@ -236,6 +301,16 @@ void pwmled_adc(unsigned char n, uint16_t adcval) if (pwmled_probed_ok(n, old_pwm)) return; + if (led->modes_not_yet_stable) { + if (!--led->modes_not_yet_stable) { + // reached stability, copy mode 2 to mode 3 (-1) + led->mode_pwm[0] = led->pwm; + led->mode_pwm[2] = led->pwm; + led->err_sums[0] = 0; + led->err_sums[2] = 0; + } + } + if (led->pwm == old_pwm) return;