X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=firmware%2Fpwmled.c;h=b76f219fb32b1c597358832f333be26c621d50f4;hb=28656ba8d230fc14bab6445439fb5c1b966dddbe;hp=06c6b1127a96a6ce4e42af3ed66f68206419e0d9;hpb=38a3c5783c24a17e6cf1fbf0af40ae1dec805419;p=bike-lights.git diff --git a/firmware/pwmled.c b/firmware/pwmled.c index 06c6b11..b76f219 100644 --- a/firmware/pwmled.c +++ b/firmware/pwmled.c @@ -3,15 +3,51 @@ #include "lights.h" static uint16_t pwm_vals[N_PWMLEDS*N_PWMLED_MODES]; -static uint16_t pwm_max[N_PWMLEDS] = { 0x70, 0x70, 0xF0 }; -static uint16_t adc_max[N_PWMLEDS] = { 0x70, 0x70, 0xF0 }; +static uint16_t pwm_max[N_PWMLEDS] = { + PWM_MAX/2, + PWM_MAX - (PWM_MAX >> 4), // step-up + PWM_MAX/2 +}; + +#define PWMLED2_TESTING_WITH_350MA_LED + +#define SENSE_MOHM 33 /* 0.033 Ohm */ +#define MA_MOHM_GAIN_TO_ADC(ma, mohm, gain) (\ + ((unsigned long)(ma))*(mohm) /* voltage at sensing resistor in uV */ \ + /(1100000UL/gain/1024UL) /* voltage of ADC reading == 1 */ \ +) +static uint16_t adc_max[N_PWMLEDS] = { + MA_MOHM_GAIN_TO_ADC( 400, SENSE_MOHM, 20), + MA_MOHM_GAIN_TO_ADC( 30, SENSE_MOHM, 20), +#ifdef PWMLED2_TESTING_WITH_350MA_LED + MA_MOHM_GAIN_TO_ADC( 400, SENSE_MOHM, 1) +#else + MA_MOHM_GAIN_TO_ADC(2500, SENSE_MOHM, 1) +#endif +}; static uint16_t adc_vals[N_PWMLEDS*N_PWMLED_MODES] = { /* pwmled0 */ - 0x04, 0x14, 0x24, 0x38, + MA_MOHM_GAIN_TO_ADC( 20, SENSE_MOHM, 20), + MA_MOHM_GAIN_TO_ADC( 50, SENSE_MOHM, 20), + MA_MOHM_GAIN_TO_ADC( 100, SENSE_MOHM, 20), + MA_MOHM_GAIN_TO_ADC( 350, SENSE_MOHM, 20), /* pwmled1 */ - 0x04, 0x14, 0x24, 0x38, + MA_MOHM_GAIN_TO_ADC( 5, SENSE_MOHM, 20), + MA_MOHM_GAIN_TO_ADC( 12, SENSE_MOHM, 20), + MA_MOHM_GAIN_TO_ADC( 16, SENSE_MOHM, 20), + MA_MOHM_GAIN_TO_ADC( 20, SENSE_MOHM, 20), /* pwmled2 */ - 0x0c, 0x24, 0x48, 0x90, +#ifdef PWMLED2_TESTING_WITH_350MA_LED + MA_MOHM_GAIN_TO_ADC( 100, SENSE_MOHM, 1), + MA_MOHM_GAIN_TO_ADC( 140, SENSE_MOHM, 1), + MA_MOHM_GAIN_TO_ADC( 250, SENSE_MOHM, 1), + MA_MOHM_GAIN_TO_ADC( 350, SENSE_MOHM, 1), +#else + MA_MOHM_GAIN_TO_ADC( 150, SENSE_MOHM, 1), + MA_MOHM_GAIN_TO_ADC( 350, SENSE_MOHM, 1), + MA_MOHM_GAIN_TO_ADC( 700, SENSE_MOHM, 1), + MA_MOHM_GAIN_TO_ADC(2400, SENSE_MOHM, 1), +#endif }; // TODO: maybe convert this to bitmask to simplify pwmled_needs_adc() ? @@ -25,6 +61,7 @@ static unsigned char pwmled_mode[N_PWMLEDS]; static unsigned char pwmled_mode_set[N_PWMLEDS]; static uint16_t pwm_probes[N_PWMLEDS]; +static int16_t differences[N_PWMLEDS]; static void start_probing(unsigned char n) { @@ -44,6 +81,7 @@ void pwmled_init() } for (i = 0; i < N_PWMLEDS; i++) { + differences[i] = 0; start_probing(i); } } @@ -76,14 +114,7 @@ void pwmled_set_mode(unsigned char n, unsigned char mode) log_byte(n); log_byte(mode); #endif - - if (mode == 0) { - pwm_off(n); - pwmled_state[n] = ST_OFF; - return; - } - - if (mode <= N_PWMLED_MODES) { + if (mode > 0 && mode <= N_PWMLED_MODES) { uint16_t pwmval; mode--; pwmval = pwm_vals[n*N_PWMLED_MODES+mode]; @@ -94,6 +125,10 @@ void pwmled_set_mode(unsigned char n, unsigned char mode) pwmled_state[n] = ST_ON; pwmled_mode[n] = mode; pwmled_mode_set[n] = 1; + differences[n] = 0; + } else { + pwm_off(n); + pwmled_state[n] = ST_OFF; } } @@ -167,10 +202,10 @@ static void inline probing_adc(unsigned char n, uint16_t adcval) static void inline on_adc(unsigned char n, uint16_t adcval) { unsigned char mode = pwmled_mode[n]; - uint16_t adc_exp = adc_vals[n*N_PWMLED_MODES+mode]; - uint16_t *pwm_p = &pwm_vals[n*N_PWMLED_MODES+mode]; - uint16_t old_pwm = *pwm_p; - uint16_t new_pwm = old_pwm; + uint16_t adc_exp = adc_vals[n*N_PWMLED_MODES+mode]; + uint16_t *pwm_p = &pwm_vals[n*N_PWMLED_MODES+mode]; + int16_t old_pwm = *pwm_p; + int16_t new_pwm = old_pwm; #if 0 log_byte(0xF5); @@ -178,45 +213,56 @@ static void inline on_adc(unsigned char n, uint16_t adcval) log_word(adcval); #endif + if (pwmled_mode_set[n]) { // ignore the first reading pwmled_mode_set[n] = 0; return; } - // FIXME: running average? - if (2*adcval > 5*adc_exp) { // >2.5x expected, lower significantly - new_pwm = 2*old_pwm/3; - } else if (3*adcval > 4*adc_exp) { // >1.33x expected, lower a bit - new_pwm = old_pwm - 1; - } else if (4*adcval < 3*adc_exp) { // 0.75x expected, raise a bit - new_pwm = old_pwm + 1; - } + differences[n] += adcval; + differences[n] -= adc_exp; + + if (differences[n] > 16) + new_pwm -= 2; + else if (differences[n] > 4) + new_pwm--; + else if (differences[n] < -16) + new_pwm += 2; + else if (differences[n] < -4) + new_pwm++; + // new_pwm -= differences[n] >> 3; + + if (new_pwm == old_pwm) + return; + + differences[n] = 0; - // FIXME: better disconnect detection - if (new_pwm > pwm_max[n]) { // FIXME: disconnected? + if (new_pwm > (int16_t)pwm_max[n]) { + // FIXME: disconnected? new_pwm = pwm_max[n]; } - if (new_pwm < 2) { // short-circuit? - new_pwm = 2; + + if (new_pwm < 1) { + // FIXME: short-circuit? + new_pwm = 1; } - if (new_pwm != old_pwm) { - *pwm_p = new_pwm; - pwm_set(n, new_pwm); -#if 0 - log_byte(0xF9); + *pwm_p = new_pwm; + pwm_set(n, new_pwm); + + if (jiffies > 500 && n == 1) { + log_byte(adcval & 0xFF); log_byte(new_pwm); -#endif } } void pwmled_adc(unsigned char n, uint16_t adcval) { unsigned char i, probing; + switch (pwmled_state[n]) { case ST_PROBING: probing_adc(n, adcval); - #if 1 probing = 0; for (i = 0; i < N_PWMLEDS; i++)